New version.

5 files changed, 140 insertions, 4 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index f4e802738c93..bb01ebbdcc5d 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/nvidia-glx 
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.23 2003/07/18 21:43:25 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.24 2003/07/28 22:48:38 azarah Exp $
+
+*nvidia-glx-1.0.4496 (29 Jul 2003)
+
+  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+  nvidia-glx-1.0.4496.ebuild, files/nvidia-glx-1.0.4496-defines.patch:
+  New version.
 
 *nvidia-glx-1.0.4180 (18 Jul 2003)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 38f97e469248..f7cdcf76db10 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,4 +1,4 @@
-MD5 58a8e23b671b303f9eaf32aacfb53498 ChangeLog 3325
+MD5 cd76529df2b45b1b45c54655e76fa6e6 ChangeLog 3500
 MD5 df731a6e32dcbdc8ba416add3d11c15b nvidia-glx-1.0.2880.ebuild 2679
 MD5 e38d931344afe435a5c06b419d1a64c8 nvidia-glx-1.0.2960-r1.ebuild 2721
 MD5 234657b19a6d19a6981c4aab1ad09fcf nvidia-glx-1.0.3123.ebuild 2658
@@ -7,8 +7,7 @@ MD5 710891576fa1586432f79c9d960029d8 nvidia-glx-1.0.4191.ebuild 2662
 MD5 15b46a42f05c684c7c39bb18fcde2d45 nvidia-glx-1.0.4349.ebuild 3163
 MD5 85a8775d3e943c601606f6e9bafca957 nvidia-glx-1.0.4363.ebuild 3098
 MD5 eda7c795bd17b67c804cf6bb1ba65156 nvidia-glx-1.0.4180.ebuild 2804
-MD5 0386ce2800962313c0799d76a8a4b0bd nvidia-glx-1.0.4496.ebuild 3163
-MD5 0800ce38134ee5de429400dad38a1dfc .nvidia-glx-1.0.4496.ebuild.swp 12288
+MD5 27f23a86900efb79baca0342c3d04242 nvidia-glx-1.0.4496.ebuild 3162
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
 MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
@@ -24,3 +23,4 @@ MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
 MD5 55f859a1c99a7fb8329f83ca27c02d27 files/digest-nvidia-glx-1.0.4180 72
 MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496
new file mode 100644
index 000000000000..5fe85ccc3da6
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496
@@ -0,0 +1 @@
+MD5 cc8cc9b0fda676b074869e50844c969a NVIDIA-Linux-x86-1.0-4496-pkg0.run 5125585
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.4496-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4496-defines.patch
new file mode 100644
index 000000000000..da9933f6337c
--- /dev/null
+++ b/media-video/nvidia-glx/files/nvidia-glx-1.0.4496-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/nvidia-glx-1.0.4496.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496.ebuild
new file mode 100644
index 000000000000..ba8ddc3a8a3a
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4496.ebuild
@@ -0,0 +1,118 @@
+# 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.4496.ebuild,v 1.1 2003/07/28 22:48:38 azarah Exp $
+
+inherit eutils
+
+# Make sure Portage does _NOT_ strip symbols.  Need both lines for
+# Portage 1.8.9+
+DEBUGBUILD="yes"
+RESTRICT="nostrip"
+
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+S="${WORKDIR}/${NV_PACKAGE}-pkg0"
+DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
+SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-pkg0.run"
+HOMEPAGE="http://www.nvidia.com/"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm"
+
+# 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}-pkg0.run --extract-only
+
+	# Use the correct defines to make gtkglext build work
+	cd ${S}; epatch ${FILESDIR}/${P}-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 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
+}
+