New version; remove dup patch

6 files changed, 124 insertions, 54 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 5b6908737b15..42e106c8ba36 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,15 @@
 # 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.33 2004/01/26 01:46:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.34 2004/02/01 02:47:51 azarah Exp $
+
+*nvidia-glx-1.0.5336 (01 Feb 2004)
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5336.ebuild:
+  Update version
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5332.ebuild,
+  files/nvidia-glx-1.0.5332-defines.patch:
+  Remove dup patch.
 
   25 Jan 2004; Caleb Tennis <caleb@gentoo.org> nvidia-glx-1.0.5332.ebuild:
   Add a warning for Qt users that GL linkage may be broken after emerging this.
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
deleted file mode 100644
index ea6e622cfaa7..000000000000
--- a/media-video/nvidia-glx/Manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-MD5 330362b0b2aaeb9bd9b072bbf9920d60 nvidia-glx-1.0.5332.ebuild 3314
-MD5 5e8cf32909a5d843a48696919539e672 nvidia-glx-1.0.4349.ebuild 3009
-MD5 d3248dfe11ba3ba5fa87ec6c1cd7a1fa nvidia-glx-1.0.5328.ebuild 3037
-MD5 bea7288522e84af9596b604b6d078f12 nvidia-glx-1.0.4191-r1.ebuild 2669
-MD5 4577c819b0246a08224106b79de263fa nvidia-glx-1.0.3123.ebuild 2548
-MD5 0ba4130a78e6b7f3a8380036f40048c7 nvidia-glx-1.0.4499.ebuild 2681
-MD5 f8c91aa90a04a78e7e6747252f3277f8 nvidia-glx-1.0.4496.ebuild 3008
-MD5 e0cb15977424ab70f030672f47dad4ec nvidia-glx-1.0.4180.ebuild 2669
-MD5 6a31e9bf5deb8d2a49dd05d17b38d71e nvidia-glx-1.0.2960-r1.ebuild 2612
-MD5 e35a90c41398cc46ebf43edc2097c9b3 nvidia-glx-1.0.4496-r1.ebuild 3037
-MD5 0f56c48fcced4b9f9936ea0704f6fde5 nvidia-glx-1.0.4363.ebuild 2946
-MD5 494deef78d93952563d6be83062421a4 nvidia-glx-1.0.4191.ebuild 2548
-MD5 2e6d2e02dbd2d4ccb1cc136c06941645 nvidia-glx-1.0.5328-r1.ebuild 3069
-MD5 ba5414f31df5938d0ffe0f523b257b41 nvidia-glx-1.0.2880.ebuild 2569
-MD5 1401bdc02da5da0a779646361955cd60 ChangeLog 5244
-MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
-MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 d95d0e66acb41538e6faace158d2ac21 files/digest-nvidia-glx-1.0.2960-r1 72
-MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
-MD5 fe071363bf9a87e17f14273a23a2192d files/digest-nvidia-glx-1.0.3123 72
-MD5 55f859a1c99a7fb8329f83ca27c02d27 files/digest-nvidia-glx-1.0.4180 72
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191 72
-MD5 8b34536317191f4059bebe95beabe1a4 files/digest-nvidia-glx-1.0.4349 72
-MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
-MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328 80
-MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332 83
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5332-defines.patch 437
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191-r1 72
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 a31ceab3377afe2286673e74ddf89468 files/digest-nvidia-glx-1.0.4496-r1 80
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
-MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740
-MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
-MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336
new file mode 100644
index 000000000000..56ddf0d273b7
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336
@@ -0,0 +1 @@
+MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-defines.patch
deleted file mode 100644
index da9933f6337c..000000000000
--- a/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-defines.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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/nvidia-glx-1.0.5332.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
index a20c15d10c01..a035295ddd63 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5332.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.5332.ebuild,v 1.2 2004/01/26 01:46:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild,v 1.3 2004/02/01 02:47:51 azarah Exp $
 
 PKG_V="pkg0"
 NV_V="${PV/1.0./1.0-}"
@@ -27,7 +27,7 @@ src_unpack() {
 	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
 
 	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
 }
 
 src_install() {
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild
new file mode 100644
index 000000000000..3fd7974ee922
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2003 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.5336.ebuild,v 1.1 2004/02/01 02:47:51 azarah Exp $
+
+PKG_V="pkg1"
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
+DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~x86"
+RESTRICT="nostrip"
+
+# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
+DEPEND="virtual/glibc
+	>=x11-base/xfree-4.2.0-r9
+	>=x11-base/opengl-update-1.3
+	~media-video/nvidia-kernel-${PV}"
+PROVIDE="virtual/opengl"
+
+src_unpack() {
+	cd ${WORKDIR}
+	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
+
+	# Use the correct defines to make gtkglext build work
+	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
+}
+
+src_install() {
+	local NV_ROOT="/usr/lib/opengl/nvidia"
+	local TLS=
+
+	# Check if we should install TLS versions of the libraries
+	${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
+	# Only trust this if we are merging to /
+	if [ "$?" = "0" -a "${ROOT}" = "/" ]
+	then
+		einfo "Using TLS..."
+		TLS="tls/"
+	fi
+
+	# The X module
+	exeinto /usr/X11R6/lib/modules/drivers
+	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
+
+	# The GLX extension
+	exeinto ${NV_ROOT}/extensions
+	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/lib/${TLS}libGL.so.${PV} \
+	      usr/lib/${TLS}libGLcore.so.${PV}
+	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
+	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
+	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
+	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
+
+	insinto /usr/X11R6/lib
+	doins usr/X11R6/lib/libXvMCNVIDIA.a
+	exeinto /usr/X11R6/lib
+	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins usr/include/GL/*.h
+
+	# Docs
+	dodoc usr/share/doc/*
+
+	# Not sure whether installing the .la file is neccessary;
+	# this is adopted from the `nvidia' ebuild
+	local ver1="`echo ${PV} |cut -d '.' -f 1`"
+	local ver2="`echo ${PV} |cut -d '.' -f 2`"
+	local ver3="`echo ${PV} |cut -d '.' -f 3`"
+	sed -e "s:\${PV}:${PV}:"     \
+		-e "s:\${ver1}:${ver1}:" \
+		-e "s:\${ver2}:${ver2}:" \
+		-e "s:\${ver3}:${ver3}:" \
+		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
+}
+
+pkg_preinst() {
+	#clean the dinamic libGL stuff's home to ensure
+	#we dont have stale libs floating around
+	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
+	fi
+	#make sure we nuke the old nvidia-glx's env.d file
+	if [ -e ${ROOT}/etc/env.d/09nvidia ]
+	then
+		rm -f ${ROOT}/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	#switch to the nvidia implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update nvidia
+	fi
+
+	einfo
+	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
+	einfo
+}