[SM-Commit] GIT changes to master z-rejected grimoire by David Brown (4ca8e37da59efc1af8ac28e6a38c8d8699e0d5ae)

David Brown scm at mail.sourcemage.org
Thu Nov 9 01:22:19 EST 2006


GIT changes to master z-rejected grimoire by David Brown <dmlb2000 at dmlb2002.(none)>:

 .gitignore                                |    3 +++
 ChangeLog                                 |    3 +++
 z-kernels/nvidia_driver/HISTORY           |    5 +++++
 z-kernels/nvidia_driver/INSTALL           |    1 +
 z-kernels/nvidia_driver/glext-redef.patch |   10 ++++++++++
 5 files changed, 22 insertions(+)

New commits:
commit 4ca8e37da59efc1af8ac28e6a38c8d8699e0d5ae
Author: David Brown <dmlb2000 at dmlb2002.(none)>
Commit: David Brown <dmlb2000 at dmlb2002.(none)>

    added git ignore file so files won't show up

commit 662efc815ec8b6e1a298e07a458170453b777158
Author: David Brown <dmlb2000 at dmlb2002.(none)>
Commit: David Brown <dmlb2000 at dmlb2002.(none)>

    nvidia_driver added a patch against glext.h so glut can build

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9588a53
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+GRIMOIRE
+codex.index
+provides.index
diff --git a/ChangeLog b/ChangeLog
index 3669842..4a99c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-11-08 David Brown <dmlb2000 at gmail.com>
+	* .gitignore: added
+
 2006-11-01 David Kowis <dkowis at shlrm.org>
 	* z-kernels/ati_driver-new: New ati_driver spell to test
 
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 7b869b8..41680b0 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,8 @@
+2006-11-08 David Brown <dmlb2000 at gmail.com>
+	* INSTALL: added patch for glext.h
+	* glext-redef.patch: removes a redefinition of something so glut can 
+	  build
+
 2006-11-08 Flavien Bridault <vlaaad at sourcemage.org>
 	* DETAILS: 1.0-9629 
 
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index bf3aab3..c126df0 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -36,6 +36,7 @@ pushd  $SOURCE_DIRECTORY/usr/include/GL
 if  [  !  -d  $X_PRE/include/GL  ];  then
   mkdir  -p  $X_PRE/include/GL
 fi                                       &&
+patch -p1 < ${SPELL_DIRECTORY}/glext-redef.patch &&
 for file in glext.h gl.h glxext.h glx.h; do
   install  -m 0644  -o root  -g root  $file  $X_PRE/include/GL/
 done                                     &&
diff --git a/z-kernels/nvidia_driver/glext-redef.patch b/z-kernels/nvidia_driver/glext-redef.patch
new file mode 100644
index 0000000..3fb0be4
--- /dev/null
+++ b/z-kernels/nvidia_driver/glext-redef.patch
@@ -0,0 +1,10 @@
+--- glext.h~	2006-11-08 22:09:16.000000000 -0800
++++ glext.h	2006-11-08 22:09:16.000000000 -0800
+@@ -6938,7 +6938,6 @@
+ extern void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+ extern void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+ #endif /* GL_GLEXT_PROTOTYPES */
+-typedef void (APIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+ typedef void (APIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+ typedef GLint (APIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+ typedef void (APIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);



More information about the SM-Commit mailing list