| 1 |
mr_bones_ 13/10/28 23:31:47 |
| 2 |
|
| 3 |
Added: clanlib-2.3.6-mesa.patch |
| 4 |
clanlib-2.3.7-autotools.patch |
| 5 |
Log: |
| 6 |
version bump and apply upstream patch to stable to fix building with newer mesa (bug #447258) |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-games/clanlib/files/clanlib-2.3.6-mesa.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/clanlib/files/clanlib-2.3.6-mesa.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/clanlib/files/clanlib-2.3.6-mesa.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: clanlib-2.3.6-mesa.patch |
| 17 |
=================================================================== |
| 18 |
--- ClanLib-2.3.6.orig/Sources/API/GL1/opengl1_defines.h |
| 19 |
+++ ClanLib-2.3.6/Sources/API/GL1/opengl1_defines.h |
| 20 |
@@ -44,6 +44,11 @@ |
| 21 |
#ifndef CL_DISPLAYDEFINES_DEFINES |
| 22 |
#define CL_DISPLAYDEFINES_DEFINES |
| 23 |
|
| 24 |
+/* newer Mesa defines this and creates a conflict */ |
| 25 |
+#ifdef GL_TYPE |
| 26 |
+#undef GL_TYPE |
| 27 |
+#endif |
| 28 |
+ |
| 29 |
#include <cstddef> |
| 30 |
|
| 31 |
#ifndef __APPLE__ |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 dev-games/clanlib/files/clanlib-2.3.7-autotools.patch |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch?rev=1.1&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/clanlib/files/clanlib-2.3.7-autotools.patch?rev=1.1&content-type=text/plain |
| 39 |
|
| 40 |
Index: clanlib-2.3.7-autotools.patch |
| 41 |
=================================================================== |
| 42 |
--- Documentation/Reference/Makefile.am.old 2012-09-25 10:39:25.973544935 +0200 |
| 43 |
+++ Documentation/Reference/Makefile.am 2012-09-25 10:39:42.560554053 +0200 |
| 44 |
@@ -10,7 +10,7 @@ |
| 45 |
mkdir doxyoutput; |
| 46 |
mkdir reftest |
| 47 |
doxygen ./clanlib.doxygen |
| 48 |
- make -C ../Utilities/ReferenceDocs |
| 49 |
+ $(MAKE) -C ../Utilities/ReferenceDocs |
| 50 |
../Utilities/ReferenceDocs/ReferenceDocs |
| 51 |
|
| 52 |
install-html: |
| 53 |
--- configure.ac.old 2012-09-25 11:07:38.412537590 +0200 |
| 54 |
+++ configure.ac 2012-09-25 11:09:41.133939131 +0200 |
| 55 |
@@ -337,11 +337,9 @@ |
| 56 |
|
| 57 |
dnl Optional linux/joystick.h |
| 58 |
AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes) |
| 59 |
- AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes) |
| 60 |
|
| 61 |
dnl Optional linux/input.h |
| 62 |
AC_CHECK_HEADERS(linux/input.h, linux_input=yes) |
| 63 |
- AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes) |
| 64 |
|
| 65 |
if test "$WIN32" = "no" && test "$enable_clanDisplay" != "no"; then |
| 66 |
CLANLIB_CHECK_LIB(fontconfig, [`cat $srcdir/Setup/Tests/fontconfig.cpp`], clanDisplay, [ *** Cannot find fontconfig (See http://fontconfig.org/ ) (Try libfontconfig1-dev or better) ], [-lfontconfig]) |
| 67 |
@@ -358,6 +356,8 @@ |
| 68 |
clanDisplay, [ *** Cannot find version 8 of DirectInput], [-ldxguid -lole32 -ldinput8]) |
| 69 |
fi |
| 70 |
fi |
| 71 |
+AM_CONDITIONAL(LINUX_JOYSTICK, test x$linux_joystick = xyes) |
| 72 |
+AM_CONDITIONAL(LINUX_INPUT, test x$linux_input = xyes) |
| 73 |
|
| 74 |
have_xrender=no |
| 75 |
|
| 76 |
@@ -515,9 +515,9 @@ |
| 77 |
fi |
| 78 |
|
| 79 |
if test "$enable_clanSound" = "auto"; then enable_clanSound=yes; fi |
| 80 |
- AM_CONDITIONAL(ALSA, test x$have_alsa = xyes) |
| 81 |
|
| 82 |
fi |
| 83 |
+AM_CONDITIONAL(ALSA, test x$have_alsa = xyes) |
| 84 |
|
| 85 |
if test "$enable_clanSound" != "no"; then |
| 86 |
enable_clanSound=yes |
Archives