| 1 |
From a233e35ca650db2758de0fd31450b8ce2d86d5e3 Mon Sep 17 00:00:00 2001
|
| 2 |
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
| 3 |
Date: Tue, 7 Aug 2012 01:29:01 -0400
|
| 4 |
Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
|
| 5 |
|
| 6 |
If mesa had been built with shared glapi, glAccum is not available in
|
| 7 |
libOSMesa without explicitly linking to libGL. In addition, in
|
| 8 |
mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
|
| 9 |
libglapi if mesa was built with shared glapi, see
|
| 10 |
https://bugs.gentoo.org/show_bug.cgi?id=399813
|
| 11 |
---
|
| 12 |
configure.ac | 5 ++++-
|
| 13 |
1 files changed, 4 insertions(+), 1 deletions(-)
|
| 14 |
|
| 15 |
diff --git a/configure.ac b/configure.ac
|
| 16 |
index 4bd43d1..c7a718f 100644
|
| 17 |
--- a/configure.ac
|
| 18 |
+++ b/configure.ac
|
| 19 |
@@ -1132,7 +1132,10 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
|
| 20 |
|
| 21 |
if test "$ac_cv_header_GL_osmesa_h" = "yes"
|
| 22 |
then
|
| 23 |
- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
| 24 |
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
| 25 |
+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
|
| 26 |
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
| 27 |
+ fi
|
| 28 |
fi
|
| 29 |
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
|
| 30 |
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
|
| 31 |
--
|
| 32 |
1.7.8.6
|
| 33 |
|
Parent Directory
| 
Revision Log