| 1 |
tetromino 14/02/08 21:50:52 |
| 2 |
|
| 3 |
Added: wine-1.7.12-osmesa-check.patch |
| 4 |
Log: |
| 5 |
Version bump, see http://www.winehq.org/announce/1.7.12 for the announcement. Update osmesa patch (bug #500352). |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/wine/files/wine-1.7.12-osmesa-check.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.12-osmesa-check.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wine-1.7.12-osmesa-check.patch |
| 16 |
=================================================================== |
| 17 |
From 6932b9a17c4f64c13f7060895d46334bc7022430 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Tue, 7 Aug 2012 01:29:01 -0400 |
| 20 |
Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa |
| 21 |
|
| 22 |
If mesa had been built with shared glapi, glAccum is not available in |
| 23 |
libOSMesa without explicitly linking to libGL. In addition, in |
| 24 |
mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to |
| 25 |
libglapi if mesa was built with shared glapi, see |
| 26 |
https://bugs.gentoo.org/show_bug.cgi?id=399813 |
| 27 |
And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and |
| 28 |
libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832 |
| 29 |
--- |
| 30 |
configure.ac | 8 +++++++- |
| 31 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 32 |
|
| 33 |
diff --git a/configure.ac b/configure.ac |
| 34 |
index de807d2..a2e8684 100644 |
| 35 |
--- a/configure.ac |
| 36 |
+++ b/configure.ac |
| 37 |
@@ -1233,7 +1233,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c |
| 38 |
|
| 39 |
if test "x$with_osmesa" != "xno" |
| 40 |
then |
| 41 |
- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) |
| 42 |
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS -lm $X_EXTRA_LIBS]) |
| 43 |
+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then |
| 44 |
+ osmesa_save_CC=$CC |
| 45 |
+ CC=$CXX |
| 46 |
+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS -lm $X_EXTRA_LIBS]) |
| 47 |
+ CC=$osmesa_save_CC |
| 48 |
+ fi |
| 49 |
WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], |
| 50 |
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) |
| 51 |
fi |
| 52 |
-- |
| 53 |
1.8.5.3 |
Archives