Reintroducing patch for 4363 that was removed because of bad version naming.

4 files changed, 45 insertions, 17 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 66031ddf831f..e0210217ea73 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/nvidia-glx 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.46 2004/04/27 21:01:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.47 2004/05/05 23:29:22 cyfred Exp $
+
+  06 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +files/nvidia-glx-1.0.4363-defines.patch, nvidia-glx-1.0.4363.ebuild:
+  Reintroducing patchset for 4363 which was removed a while ago because of
+  version name conflicts.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nvidia-glx-1.0.4363.ebuild,
   nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild,
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 22119455ed83..908681d0aaee 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,28 +1,29 @@
-MD5 af14cc22472d31c3c53b70aa88078ce8 ChangeLog 8582
-MD5 ff204a2608432c553c142771cfb84c13 nvidia-glx-1.0.4496-r1.ebuild 3377
-MD5 184796724189a1c7da66a4c90863b2b2 nvidia-glx-1.0.4363.ebuild 2996
-MD5 5a95074e5d2c7a59082d29c3b2af2fe5 nvidia-glx-1.0.4496.ebuild 3058
+MD5 5ea49883078c34df5fdcb90e20bebf1f nvidia-glx-1.0.5336-r2.ebuild 3445
+MD5 cbec6e6b7b13372f1c701691bb0904bc nvidia-glx-1.0.5332-r2.ebuild 3688
 MD5 143ecfafc3573af52cbb83bb85b78910 nvidia-glx-1.0.4499.ebuild 2729
-MD5 9bba61a16950ac9c0e64327db1341055 nvidia-glx-1.0.5328-r1.ebuild 3234
+MD5 5a95074e5d2c7a59082d29c3b2af2fe5 nvidia-glx-1.0.4496.ebuild 3058
 MD5 1d44ae06601943e8ac96355f61667317 nvidia-glx-1.0.5332-r1.ebuild 3377
-MD5 cbec6e6b7b13372f1c701691bb0904bc nvidia-glx-1.0.5332-r2.ebuild 3688
-MD5 5ea49883078c34df5fdcb90e20bebf1f nvidia-glx-1.0.5336-r2.ebuild 3445
+MD5 ff204a2608432c553c142771cfb84c13 nvidia-glx-1.0.4496-r1.ebuild 3377
+MD5 2dffe1e166b83783be836170db81c39d nvidia-glx-1.0.4363.ebuild 2987
+MD5 9bba61a16950ac9c0e64327db1341055 nvidia-glx-1.0.5328-r1.ebuild 3234
+MD5 af14cc22472d31c3c53b70aa88078ce8 ChangeLog 8582
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
+MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
+MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
 MD5 0cedd89265dd9ffbcc19e2b72d05569d files/nvidia-glx-1.0.5332-glheader.patch 832
 MD5 0d5c4f6eb9edce633b87a6ff09bd0c32 files/nvidia-glx-1.0.5336-glheader.patch 826
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
 MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
 MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
+MD5 170bb6132a96be6319329909ea5ef37b files/nvidia-glx-1.0.4363-defines.patch 906
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
+MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r1 83
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.4363-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4363-defines.patch
new file mode 100644
index 000000000000..27ede3942748
--- /dev/null
+++ b/media-video/nvidia-glx/files/nvidia-glx-1.0.4363-defines.patch
@@ -0,0 +1,22 @@
+diff -ur NVIDIA_GLX-1.0-4363/usr/include/GL/glx.h NVIDIA_GLX-1.0-4363.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4363/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4363.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 -ur NVIDIA_GLX-1.0-4363/usr/include/GL/glxtokens.h NVIDIA_GLX-1.0-4363.new/usr/include/GL/glxtokens.h
+--- NVIDIA_GLX-1.0-4363/usr/include/GL/glxtokens.h	2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4363.new/usr/include/GL/glxtokens.h	2003-01-30 18:20:44.000000000 +0100
+@@ -28,6 +28,7 @@
+ 
+ #define GLX_VERSION_1_1         1
+ #define GLX_VERSION_1_2         1
++#define GLX_VERSION_1_3         1
+ 
+ /* GLX Extensions */
+ #define GLX_EXT_import_context  1
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild
index 792588fd1519..5549c6c5286e 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild,v 1.6 2004/04/27 21:01:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild,v 1.7 2004/05/05 23:29:22 cyfred Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ src_unpack() {
 	unpack ${A}
 
 	# correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.4191-defines.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
 }
 
 src_install() {