Porting across GL patches for consistency, it was necessary in the end.

6 files changed, 59 insertions, 4 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 938995f27edd..a62f3fc7b14e 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.65 2004/11/10 01:02:36 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.66 2004/11/10 01:23:54 cyfred Exp $
+
+  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch,
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch,
+  +files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch,
+  nvidia-glx-1.0.6629.ebuild:
+  Porting across GL patches for consistency, it was necessary in the end.
 
   10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6629.ebuild:
   Changing to error on xfree install, as opposed to dieing
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 731324529cba..255d40b59f64 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,7 +1,7 @@
 MD5 5025856a53112a23b3e8cade84c55c57 nvidia-glx-1.0.5336-r2.ebuild 3442
 MD5 e31c13df7b44daed03369803d775e79d nvidia-glx-1.0.5332-r2.ebuild 3686
 MD5 cdadf248426f5017991d3b50167d6487 nvidia-glx-1.0.4496-r2.ebuild 3373
-MD5 05af77daf27b604ac0e80928d50694e9 nvidia-glx-1.0.6629.ebuild 5099
+MD5 df422bf52bdeecadfbdb9e9c7429a319 nvidia-glx-1.0.6629.ebuild 5433
 MD5 53fb35c058a5a1d4f52fde2b2cef1a65 nvidia-glx-1.0.5328-r2.ebuild 3229
 MD5 1a4026ee5f4a6fbe2acb0680668e1c4c nvidia-glx-1.0.6106-r3.ebuild 5356
 MD5 ed39be4005f57c4145735f26e5e20635 nvidia-glx-1.0.6111.ebuild 5348
@@ -34,3 +34,6 @@ MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6106/NVIDIA_glx-1.0.6106-makefile
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
+MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6629/NVIDIA_glx-1.0.6111-makefile.patch 593
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6111-defines.patch 437
+MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6111-glheader.patch 380
diff --git a/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch
new file mode 100644
index 000000000000..da9933f6337c
--- /dev/null
+++ b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch
@@ -0,0 +1,11 @@
+diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h	2003-01-30 18:20:23.000000000 +0100
+@@ -39,6 +39,7 @@
+ typedef XID GLXPixmap;
+ typedef XID GLXDrawable;
+ typedef XID GLXPbuffer;
++typedef XID GLXPbufferSGIX;
+ typedef XID GLXWindow;
+ typedef XID GLXFBConfigID;
+ 
diff --git a/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch
new file mode 100644
index 000000000000..e0393e1b9ab0
--- /dev/null
+++ b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch
@@ -0,0 +1,13 @@
+--- usr/include/GL/gl.g.orig	2004-07-17 19:56:59.789410584 +1000
++++ usr/include/GL/gl.h	2004-07-17 19:59:08.844791184 +1000
+@@ -66,6 +66,10 @@
+ typedef double GLclampd;
+ typedef void GLvoid;
+ 
++/* Patching for some better defines in the global system */
++#ifndef GL_GLEXT_LEGACY
++#include <GL/glext.h>
++#endif
+ 
+ /*************************************************************/
+ 
diff --git a/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch
new file mode 100644
index 000000000000..45e550bca1fe
--- /dev/null
+++ b/media-video/nvidia-glx/files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.old	2004-11-10 12:13:57.751853304 +1100
++++ Makefile	2004-11-10 12:14:22.439100272 +1100
+@@ -1,11 +1,5 @@
+ default:
+-	@ echo
+-	@ echo "It is NOT recommended that you use this Makefile to install"
+-	@ echo "the NVIDIA driver.  Instead, please use the nvidia-installer"
+-	@ echo "utility.  However, should nvidia-installer not operate for you,"
+-	@ echo "you may use this Makefile as a last resort.  To install using"
+-	@ echo "this Makefile, please run 'make install'."
+-	@ echo
++	@ echo "Gentoo Linux does not use nvidia-installer."
+ 
+ kernel_module_install:
+ 	cd usr/src/nv; make install
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild
index fc7c86567e51..067365696d72 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629.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/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild,v 1.2 2004/11/10 01:02:36 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild,v 1.3 2004/11/10 01:23:54 cyfred Exp $
 
 inherit eutils
 
@@ -69,8 +69,14 @@ src_unpack() {
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Patchs go below here, add breif description
+	cd ${S}
+	# nVidia wants us to use nvidia-installer, removing warning.
+	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
+	# Use the correct defines to make gtkglext build work
+	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
 
-	# None at the moment
 }
 
 src_install() {