Update the opengl patch #75526.

2 files changed, 32 insertions, 56 deletions

diff --git a/games-fps/tenebrae/files/1.04-glhax.patch b/games-fps/tenebrae/files/1.04-glhax.patch
new file mode 100644
index 000000000000..b8615fa04a97
--- /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
index 7f1ec7f722c6..000000000000
--- 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 ;