Added the changes necessary to make 4496 work with xorg-x11

4 files changed, 147 insertions, 14 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 315a844b7eb3..20bd2164c9a2 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.42 2004/04/13 16:50:09 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.43 2004/04/15 15:45:41 spider Exp $
+
+*nvidia-glx-1.0.4496-r1 (15 Apr 2004)
+
+  15 Apr 2004; <spider@gentoo.org> +nvidia-glx-1.0.4496-r1.ebuild:
+  adding the changes necessary to make 4496 versions interact with xorg-x11
+  implementation.
 
   13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
   nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 83f04835685f..14adf12a6a77 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,26 +1,28 @@
-MD5 8310fa097968faf692877c642f95d9a5 nvidia-glx-1.0.5336-r2.ebuild 3395
-MD5 3615427fe6d7f5dd7f71496de5bce05f nvidia-glx-1.0.5332-r2.ebuild 3639
+MD5 a77dd71e7103b22d34032d49252a13d3 ChangeLog 7692
+MD5 2efd0f202897187bf4c2463f58efb56e nvidia-glx-1.0.4496-r1.ebuild 3327
 MD5 3df4c8fd0ec98502ade783f2d9567485 nvidia-glx-1.0.4499.ebuild 2679
-MD5 3ddaaf5939e64ff9eb5e5e00060767d9 nvidia-glx-1.0.4496.ebuild 3008
-MD5 cc7765cbbc24ec65578455f83e69b77c nvidia-glx-1.0.5332-r1.ebuild 3327
 MD5 2d52a6d652e7b3df9ba1b83fde9c443a nvidia-glx-1.0.4363.ebuild 2946
-MD5 67b72217ff6d2565f71b89dfaac0c344 nvidia-glx-1.0.5328-r1.ebuild 3184
-MD5 dd9ca577e9f6d60da2b4fc9e9053cdfe ChangeLog 7491
+MD5 3ddaaf5939e64ff9eb5e5e00060767d9 nvidia-glx-1.0.4496.ebuild 3008
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
+MD5 67b72217ff6d2565f71b89dfaac0c344 nvidia-glx-1.0.5328-r1.ebuild 3184
+MD5 cc7765cbbc24ec65578455f83e69b77c nvidia-glx-1.0.5332-r1.ebuild 3327
+MD5 8310fa097968faf692877c642f95d9a5 nvidia-glx-1.0.5336-r2.ebuild 3395
+MD5 3615427fe6d7f5dd7f71496de5bce05f nvidia-glx-1.0.5332-r2.ebuild 3639
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
 MD5 0cedd89265dd9ffbcc19e2b72d05569d files/nvidia-glx-1.0.5332-glheader.patch 832
 MD5 0d5c4f6eb9edce633b87a6ff09bd0c32 files/nvidia-glx-1.0.5336-glheader.patch 826
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
+MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
 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 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
+MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
+MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 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 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
+MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
new file mode 100644
index 000000000000..5fe85ccc3da6
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
@@ -0,0 +1 @@
+MD5 cc8cc9b0fda676b074869e50844c969a NVIDIA-Linux-x86-1.0-4496-pkg0.run 5125585
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild
new file mode 100644
index 000000000000..42643543c5d0
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild
@@ -0,0 +1,124 @@
+# 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.4496-r1.ebuild,v 1.5 2004/04/15 15:45:41 spider Exp $
+
+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"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-pkg0.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
+	virtual/x11
+	>=x11-base/opengl-update-1.3
+	~media-video/nvidia-kernel-${PV}"
+PROVIDE="virtual/opengl"
+
+pkg_setup() {
+	# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
+	if has_version "x11-base/xfree"
+	then
+		if has_version "<x11-base/xfree-4.2.0-r9"
+		then
+			die "Upgrade to xfree 4.2.0-r9 or greater."
+		fi
+	fi
+}
+
+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}
+
+	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
+	rm -f usr/include/GL/glext.h
+
+	# 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
+}