From 4214e1fd612873fc4323662b08252cfa83a63a72 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 19 Dec 2012 13:25:03 +0100 Subject: [PATCH] wine-unstable: remove incorrect patch. --- .../gentoo-wine-1.5.11-osmesa-check.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch diff --git a/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch b/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch deleted file mode 100644 index e255b4f601..0000000000 --- a/srcpkgs/wine-unstable/patches/gentoo-wine-1.5.11-osmesa-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 22fcf835dfe713ad93f649a901973208e0f7b62d Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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 configure.ac configure.ac -index 15ada86..6eab75e 100644 ---- configure.ac -+++ 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 -