Fix build with new (?) glext.h Bug #365013

Package-Manager: portage-2.1.9.46/cvs/Linux i686

4 files changed, 41 insertions, 7 deletions

diff --git a/games-fps/industri/ChangeLog b/games-fps/industri/ChangeLog
index 718478768f23..a72e0ca2f040 100644
--- a/games-fps/industri/ChangeLog
+++ b/games-fps/industri/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/industri
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.12 2010/10/13 09:53:58 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/ChangeLog,v 1.13 2011/04/29 10:50:33 tupone Exp $
+
+  29 Apr 2011; Tupone Alfredo <tupone@gentoo.org> industri-1.01.ebuild,
+  +files/industri-1.01-glext.patch:
+  Fix build with new (?) glext.h Bug #365013 by Diego Elio Pettenò
 
   13 Oct 2010; Tupone Alfredo <tupone@gentoo.org> industri-1.01.ebuild,
   +files/industri-1.01-ldflags.patch:
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
index 746733f49a55..e204603b1971 100644
--- a/games-fps/industri/Manifest
+++ b/games-fps/industri/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX industri-1.01-exec-stack.patch 642 RMD160 ddb22f84e2daf1f2eee27ad13e30b7175aab2e4f SHA1 3df0fd513eb05e63ac83e897aef0cff51b7dcbb5 SHA256 d04cbf31f16929b27040ea9f4e599db2ea4e14b696708034ae523ff406de011c
+AUX industri-1.01-glext.patch 983 RMD160 729a4bebd28dd5da66d8fa5244ebc65e41cfe34c SHA1 f3de677d0083b40aa917347e3067b42ee53769d0 SHA256 d7d877c58d4a77db421e21a12447ae38b208cfa201663a91355515e48f9843d9
 AUX industri-1.01-ldflags.patch 840 RMD160 73640f13612497748fd4b4a976ceec8a00e113df SHA1 6f37906bc383c547fa1d0efcc3523d8585b930ce SHA256 a637626ff4d60619d9dc4751af0ce35dcecbc64c68779efc7e826b76f2a2988c
 AUX industri.pretty 42 RMD160 45b349d4a44a8cdeb4fd2215af11be46b2ce33e3 SHA1 9d44b2cdfe7862993cba4581bad1b4d87b87960c SHA256 127a00f5ce37b1502a09d049d9ad32e468c398ba0a98fbf66142d1408c382ba3
 DIST industri-1.00.zip 30339989 RMD160 a8c3086f0105c4c9f6ad8405fb58297c3a2fba26 SHA1 ba383c48ab043849b5a6908f550ad99356f4d2d2 SHA256 6c0761c6eacb501fffe37f9be4b9e2ae62074f8714c4ef36251241aba6b90652
 DIST industri_BIN-1.01-src.tar.gz 1086838 RMD160 288c35c9864d127ec1ea0c7f4bf90f65480c8ebf SHA1 34b3dfa47c8d838ad9d79432906f8be3ddf1e479 SHA256 b702b819c0b99cc9a7f8e9ec89c9a58812212826f592e3594904b4cd3cdd09f8
-EBUILD industri-1.01.ebuild 2072 RMD160 76fab2f6b7c3c0b3353a9c1103825b278ca1a51c SHA1 af57c7dfec861ffea6a7e43cc183a72540adcad0 SHA256 262d6ea2744a7dfbc5a147a2f25c0cc215a59166afcab7b4a85306e5ac813d4b
-MISC ChangeLog 1587 RMD160 f30e82300d55b4aa7c5287da4b753aafdc11b3d0 SHA1 1b2bab31fa1dcad5a9fa00b5a4e897dccb3213b4 SHA256 e5dc566b7e3ab3733fcc7f4af7582a0b914876a0175bb9c76f5e38e4e794e63e
+EBUILD industri-1.01.ebuild 2104 RMD160 5b16e4686925d0ec282b2bb7693fb3756d7c52de SHA1 828bdbc5ea11baec61396331af0253ed015b36ad SHA256 92411e22ef9a783d158820ad1c87c5650210254c4f2095e3cb338c21699389e7
+MISC ChangeLog 1764 RMD160 229a6a30299f91eba661aea740d28b84691d9205 SHA1 945b7efb0a7b2884b08f161362aef9680c126004 SHA256 91b8a3e9e94bfa43053ff687686e0fe7f3256d7b025728e89ee6362df7fa0d7f
 MISC metadata.xml 579 RMD160 f45d7504b9b1e9ab4a41fdf5aa396b6d7f71576d SHA1 3d060ebb0e9cd696cdcc8962363e3298c9b3b452 SHA256 2a18b6d76e1fe87370d6113bca5c558e0073866f5fa2ef316d76874b79aafb2a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk26mAQACgkQIY77eQFFFC1xkwCfZzOCiHolglDGoZovvt2mXpMN
+ABYAn1HOH9uE4W8vgWExjT4MZUdafj8R
+=M2xm
+-----END PGP SIGNATURE-----
diff --git a/games-fps/industri/files/industri-1.01-glext.patch b/games-fps/industri/files/industri-1.01-glext.patch
new file mode 100644
index 000000000000..8a5042e431f2
--- /dev/null
+++ b/games-fps/industri/files/industri-1.01-glext.patch
@@ -0,0 +1,18 @@
+--- glquake.h.old	2011-04-29 12:36:53.000000000 +0200
++++ glquake.h	2011-04-29 12:44:39.000000000 +0200
+@@ -977,6 +977,7 @@
+ #define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+ 
+ /* NV_vertex_program */
++#ifndef GL_NV_vertex_program
+ typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+ typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+ typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+@@ -1040,6 +1041,7 @@
+ typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+ typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+ typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
++#endif
+ 
+ extern PFNGLAREPROGRAMSRESIDENTNVPROC qglAreProgramsResidentNV ;
+ extern PFNGLBINDPROGRAMNVPROC qglBindProgramNV ;
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
index 67ffd25a7d27..066c1ebb83a6 100644
--- a/games-fps/industri/industri-1.01.ebuild
+++ b/games-fps/industri/industri-1.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.18 2010/10/13 21:25:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/industri/industri-1.01.ebuild,v 1.19 2011/04/29 10:50:33 tupone Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -50,7 +50,8 @@ src_prepare() {
 		gl_warp.c || die
 
 	epatch "${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-glext.patch
 }
 
 src_compile() {