Update the opengl patch #75526.

diff --git a/games-fps/tenebrae/ChangeLog b/games-fps/tenebrae/ChangeLog
index 83c4a63368dc0b70b727d3c7dd485521e78120e0..5d417dd41e820186624da4ad3cb635a649667026 100644 (file)
--- a/games-fps/tenebrae/ChangeLog
+++ b/games-fps/tenebrae/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/tenebrae
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.4 2004/06/24 22:47:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/ChangeLog,v 1.5 2004/12/25 05:39:35 vapier Exp $
+
+  25 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/1.04-glhax.patch,
+  -files/1.04-nvidia-opengl.patch, tenebrae-1.04.ebuild:
+  Update the opengl patch #75526.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> tenebrae-1.04.ebuild:
   Fix use invocation

diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
index 2eeb37c56ad69fa0d625881ef804aa3e959385de..b936c51a9edd9d9b8454912b7e903d1ad2f20821 100644 (file)
--- a/games-fps/tenebrae/Manifest
+++ b/games-fps/tenebrae/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fa4dbf1a205bda179c04495734731ddf ChangeLog 543
+MD5 b6243bdacea4e8dd6424c05111fc815a ChangeLog 708
 MD5 b251632170bb367c509d598998524a4b metadata.xml 625
-MD5 963e7e37e0094d258800e468c449d342 tenebrae-1.04.ebuild 1514
-MD5 af27eea7293c16e6182d5d0099bf0ba6 files/1.04-nvidia-opengl.patch 2587
+MD5 82b40ad78486a53244e8cafb5597886e tenebrae-1.04.ebuild 1493
 MD5 101db2b4d5a51dc6f63c6c5433dee3c0 files/digest-tenebrae-1.04 125
+MD5 9a02c13ded49f8e230aa3f96e01052c7 files/1.04-glhax.patch 1091
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBiCZKHTu7gpaalycRAnQsAJ4pvjEAxUFhQfXV8NVaEOkKYEQB/gCgkVsw
-3yrYYp+AJrdYnmsrVfNJyVA=
-=zJ6G
+iD8DBQFBzP0proRuSHgZdywRAnuTAKCADuU4vqfa/P/TIFRwb1/EkOZo/wCfUTG4
+231/IuOr7IxsxOF8Md0sQCw=
+=TM+w
 -----END PGP SIGNATURE-----

diff --git a/games-fps/tenebrae/files/1.04-glhax.patch b/games-fps/tenebrae/files/1.04-glhax.patch
new file mode 100644 (file)
index 0000000..b8615fa
--- /dev/null
+++ b/games-fps/tenebrae/files/1.04-glhax.patch
@@ -0,0 +1,32 @@
+--- tenebrae_0/glquake.h.orig  2004-12-25 00:28:28.707288592 -0500
++++ tenebrae_0/glquake.h       2004-12-25 00:27:35.000000000 -0500
+@@ -34,6 +34,7 @@
+ #else
+ #include <GL/gl.h>
+ #include <GL/glu.h>
++#include <GL/glext.h>
+ #endif /* __APPLE__ ||ÊMACOSX */
+ 
+ /* use the correct dynamic function address binder */  
+@@ -420,8 +421,10 @@
+ void GL_Bind (int texnum);
+ 
+ #ifndef _WIN32
++#ifndef APIENTRY
+ #define APIENTRY /* */
+ #endif
++#endif
+ 
+ #if !defined (__APPLE__) && !defined (MACOSX)
+ 
+@@ -1134,8 +1137,10 @@
+ // <AWE> There are some diffs with the function parameters. wgl stuff not present with MacOS X. -DC- and SDL 
+ #if defined (__APPLE__) || defined (MACOSX) || defined(SDL) || defined (__glx__)
+ 
++#ifndef GL_APPLE_vertex_array_range
+ typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, const GLvoid *pointer);
+ typedef void (APIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei size, const GLvoid *pointer);
++#endif
+ 
+ extern PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC qglFlushVertexArrayRangeAPPLE;
+ extern PFNGLVERTEXARRAYRANGEAPPLEPROC qglVertexArrayRangeAPPLE;

diff --git a/games-fps/tenebrae/files/1.04-nvidia-opengl.patch b/games-fps/tenebrae/files/1.04-nvidia-opengl.patch
deleted file mode 100644 (file)
index 7f1ec7f..0000000
--- a/games-fps/tenebrae/files/1.04-nvidia-opengl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- glquake.h  2003-07-14 17:06:01.000000000 -0400
-+++ ../../glquake.h    2003-07-15 02:24:09.000000000 -0400
-@@ -483,7 +483,7 @@
- 
- #endif /* !__APPLE__ && !MACOSX */
- 
--#ifndef GL_VERSION_1_3 
-+//#ifndef GL_VERSION_1_3 
- typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
- typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
- typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-@@ -518,7 +518,7 @@
- typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
- typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
- typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
--#endif
-+//#endif
- 
- extern PFNGLACTIVETEXTUREARBPROC qglActiveTextureARB;
- extern PFNGLCLIENTACTIVETEXTUREARBPROC qglClientActiveTextureARB;
-@@ -657,7 +657,7 @@
- #endif /* !__APPLE__ && !MACOSX */
- 
- // - DC - 
--#if !defined(SDL) && !defined (__glx__)
-+//#if !defined(SDL) && !defined (__glx__)
- typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
- typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
- typedef void (APIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-@@ -671,7 +671,7 @@
- typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
- typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
- typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
--#endif
-+//#endif
- 
- extern PFNGLCOMBINERPARAMETERFVNVPROC qglCombinerParameterfvNV;
- extern PFNGLCOMBINERPARAMETERIVNVPROC qglCombinerParameterivNV;
-@@ -892,7 +892,7 @@
- 
- //PENTA: VERTEX_PROGRAM
- 
--#ifndef GL_NV_vertex_program
-+//#ifndef GL_NV_vertex_program
- /* NV_vertex_program */
- #define GL_VERTEX_PROGRAM_NV              0x8620
- #define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-@@ -1042,7 +1042,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
-+//#endif
- 
- extern PFNGLAREPROGRAMSRESIDENTNVPROC qglAreProgramsResidentNV ;
- extern PFNGLBINDPROGRAMNVPROC qglBindProgramNV ;

diff --git a/games-fps/tenebrae/tenebrae-1.04.ebuild b/games-fps/tenebrae/tenebrae-1.04.ebuild
index 4e776361e1538a3ef8ee44f38ba82681ebfda999..8a806fa0a312e9b77fb8d4d88699c7934d709d15 100644 (file)
--- a/games-fps/tenebrae/tenebrae-1.04.ebuild
+++ b/games-fps/tenebrae/tenebrae-1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.6 2004/11/03 00:28:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/tenebrae/tenebrae-1.04.ebuild,v 1.7 2004/12/25 05:39:35 vapier Exp $
 
 #ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
 #ECVS_MODULE="tenebrae_0"
@@ -28,13 +28,15 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}
 
 src_unpack() {
-       unpack ${A}
-       #cvs_src_unpack
+       if [[ -z ${ECVS_MODULE} ]] ; then
+               unpack ${A}
+       else
+               cvs_src_unpack
+       fi
        cd tenebrae_0
-       local gl="`ls -al /usr/include/GL/gl.h  | awk '{print $NF}' | cut -d/ -f5`"
-       [ "${gl}" == "nvidia" ] && epatch ${FILESDIR}/${PV}-nvidia-opengl.patch
+       epatch ${FILESDIR}/${PV}-glhax.patch
        cd linux
-       sed "s:-mpentiumpro:${CFLAGS}:" Makefile.i386linux > Makefile
+       sed "s:-mpentiumpro -O6:${CFLAGS}:" Makefile.i386linux > Makefile
        #if use sdl ; then
        #       cd ../sdl
        #       ./autogen.sh
@@ -52,9 +54,9 @@ src_compile() {
 }
 
 src_install() {
-       newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae
+       newgamesbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae || die "newgamesbin"
        insinto ${GAMES_DATADIR}/quake-data/tenebrae
-       doins ${WORKDIR}/tenebrae/*
+       doins ${WORKDIR}/tenebrae/* || die "doins data"
        dodoc tenebrae_0/linux/README ${WORKDIR}/Tenebrae_Readme.txt
        prepgamesdirs
 }