39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
|
From 22fcf835dfe713ad93f649a901973208e0f7b62d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||
|
|
Date: Tue, 7 Aug 2012 01:29:01 -0400
|
||
|
|
Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
|
||
|
|
|
||
|
|
If mesa had been built with shared glapi, glAccum is not available in
|
||
|
|
libOSMesa without explicitly linking to libGL. In addition, in
|
||
|
|
mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
|
||
|
|
libglapi if mesa was built with shared glapi, see
|
||
|
|
https://bugs.gentoo.org/show_bug.cgi?id=399813
|
||
|
|
And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
|
||
|
|
libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
|
||
|
|
---
|
||
|
|
configure.ac | 8 +++++++-
|
||
|
|
1 files changed, 7 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 15ada86..6eab75e 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1133,7 +1133,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
|
||
|
|
|
||
|
|
if test "$ac_cv_header_GL_osmesa_h" = "yes"
|
||
|
|
then
|
||
|
|
- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||
|
|
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||
|
|
+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
|
||
|
|
+ osmesa_save_CC=$CC
|
||
|
|
+ CC=$CXX
|
||
|
|
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||
|
|
+ CC=$osmesa_save_CC
|
||
|
|
+ fi
|
||
|
|
fi
|
||
|
|
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
|
||
|
|
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
|
||
|
|
--
|
||
|
|
1.7.8.6
|
||
|
|
|