The /usr/lib/tls dir changed to a symlink - handle it carefully. Personally I

think it would have been better to leave it a dir, and manage the specific
opengl libs as symlinks, as you never know what future may bring ...

4 files changed, 230 insertions, 22 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index d7dea3bc16a2..047bb1da5355 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.53 2004/07/17 03:28:57 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.54 2004/07/17 22:21:14 azarah Exp $
+
+*nvidia-glx-1.0.6106-r2 (18 Jul 2004)
+
+  18 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
+  +nvidia-glx-1.0.6106-r2.ebuild:
+  The /usr/lib/tls dir changed to a symlink - handle it carefully. Personally I
+  think it would have been better to leave it a dir, and manage the specific
+  opengl libs as symlinks, as you never know what future may bring ...
 
 *nvidia-glx-1.0.6106-r1 (17 Jul 2004)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 1ae424fa8c3a..4d11965cd07d 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,34 +1,37 @@
-MD5 30625d4053cb03c505077141edf94976 nvidia-glx-1.0.5336-r2.ebuild 3443
-MD5 37e94c0213dc16d73d122ac22df67b78 nvidia-glx-1.0.6106.ebuild 4855
 MD5 c79e7c8a94dd542020eec47fcc960e9b nvidia-glx-1.0.5332-r2.ebuild 3686
+MD5 5eb20c5294063f5553d246f3c97bf8cd nvidia-glx-1.0.4496-r1.ebuild 3376
 MD5 d40244500cd750887c4c2074678b91df nvidia-glx-1.0.4499.ebuild 2726
-MD5 94acbb107b57f0a9b51743c5e38b4167 nvidia-glx-1.0.6106-r1.ebuild 5351
+MD5 b7d2e31412eb74fb955ab12c394fdd3e ChangeLog 10118
+MD5 30625d4053cb03c505077141edf94976 nvidia-glx-1.0.5336-r2.ebuild 3443
 MD5 65ab1b807374ee2f065e75be6ce4c587 nvidia-glx-1.0.4496.ebuild 3056
-MD5 5eb20c5294063f5553d246f3c97bf8cd nvidia-glx-1.0.4496-r1.ebuild 3376
-MD5 01ed7d4ae6ca52293e63a39723d83eb6 nvidia-glx-1.0.4363.ebuild 2984
 MD5 ec76697170ba0841f10a3f4b2901a1bb nvidia-glx-1.0.5328-r1.ebuild 3231
-MD5 b7d2e31412eb74fb955ab12c394fdd3e ChangeLog 10118
+MD5 37e94c0213dc16d73d122ac22df67b78 nvidia-glx-1.0.6106.ebuild 4855
+MD5 01ed7d4ae6ca52293e63a39723d83eb6 nvidia-glx-1.0.4363.ebuild 2984
 MD5 cf991042be5789d00fe389f31166412a metadata.xml 290
+MD5 94acbb107b57f0a9b51743c5e38b4167 nvidia-glx-1.0.6106-r1.ebuild 5351
+MD5 7f777ec29c8361a240d22c65fbce9d35 nvidia-glx-1.0.6106-r2.ebuild 5791
+MD5 7bf830b1e92bdbf47a901581b5e268f0 .nvidia-glx-1.0.6106-r2.ebuild.swp 16384
+MD5 0d5c4f6eb9edce633b87a6ff09bd0c32 files/nvidia-glx-1.0.5336-glheader.patch 826
 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 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 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 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106 163
-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 0cedd89265dd9ffbcc19e2b72d05569d files/nvidia-glx-1.0.5332-glheader.patch 832
 MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
+MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106 163
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
+MD5 170bb6132a96be6319329909ea5ef37b files/nvidia-glx-1.0.4363-defines.patch 906
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
+MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
 MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106-r1 163
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
-MD5 f6c702c19de46ece719928dc99ef0ad6 files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch 419
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch 437
+MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106-r2 163
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch 593
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch 437
+MD5 f6c702c19de46ece719928dc99ef0ad6 files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch 419
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r2
new file mode 100644
index 000000000000..a343b4b8810a
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r2
@@ -0,0 +1,2 @@
+MD5 5432f919f0211ce36b854d87108d7db0 NVIDIA-Linux-x86-1.0-6106-pkg1.run 8160802
+MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6106-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r2.ebuild
new file mode 100644
index 000000000000..923293f1cc86
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r2.ebuild
@@ -0,0 +1,195 @@
+# 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.6106-r2.ebuild,v 1.1 2004/07/17 22:21:14 azarah Exp $
+
+inherit eutils
+
+X86_PKG_V="pkg1"
+AMD64_PKG_V="pkg2"
+NV_V="${PV/1.0./1.0-}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run)
+	amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)"
+
+if use x86; then
+	PKG_V="${X86_PKG_V}"
+	NV_PACKAGE="${X86_NV_PACKAGE}"
+elif use amd64; then
+	PKG_V="${AMD64_PKG_V}"
+	NV_PACKAGE="${AMD64_NV_PACKAGE}"
+fi
+
+S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="nostrip"
+IUSE="multilib"
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-base/opengl-update-1.8
+	~media-video/nvidia-kernel-${PV}"
+
+PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV}-r1 ) )"
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+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
+	# Provide some information to the users
+	if use amd64 ; then
+		einfo
+		einfo "This release of nvidia-glx contains 32 bit compatibility"
+		einfo "libraries. These can be installed by either"
+		einfo "  1) emerge app-emulation/emul-linux-x86-nvidia"
+		einfo "  2) USE=\"multilib\" emerge media-video/nvidia-glx"
+		einfo "     (or /etc/portage/package.use, see portage manual)"
+		einfo
+	fi
+}
+
+src_unpack() {
+	cd ${WORKDIR}
+	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
+}
+
+src_install() {
+	local NV_ROOT="/usr/lib/opengl/nvidia"
+
+	# 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/libglx.so.${PV} libglx.so
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/lib/libGL.so.${PV} \
+	      usr/lib/libGLcore.so.${PV} \
+		  usr/lib/libnvidia-tls.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
+	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so.1
+
+	local TLS_ROOT="/usr/lib/opengl/nvidia/tls"
+	dodir ${TLS_ROOT}
+	exeinto ${TLS_ROOT}
+	doexe usr/lib/tls/libnvidia-tls.so.${PV}
+	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
+
+	# Install tls_test
+	dodir /usr/lib/misc
+	exeinto /usr/lib/misc
+	doexe usr/bin/tls_test
+	doexe usr/bin/tls_test_dso.so
+
+	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
+	# 16 July 2004, opengl-update is now supplying glext.h for system wide
+	# compatibility, so we still need to remove this.
+	rm -f usr/include/GL/glext.h
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins usr/include/GL/*.h
+
+	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
+	rm -f usr/share/doc/nvidia-settings*
+	dodoc usr/share/doc/*
+
+	# nVidia want bug reports using this script
+	exeinto /usr/bin
+	doexe usr/bin/nvidia-bug-report.sh
+
+	# 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.2 > ${D}/${NV_ROOT}/lib/libGL.la
+
+	# Should we install the .la for the 32bit libs on amd64? I think not.
+}
+
+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
+	# Make sure the symlink change is done properly
+	if [ -d "${ROOT}/usr/lib/tls" ]
+	then
+		if [ -z "$(ls "${ROOT}/usr/lib/tls/" 2>/dev/null | grep -v 'nvidia')" ]
+		then
+			rm -rf ${ROOT}/usr/lib/tls/
+		else
+			eerror "Not only nvidia-glx occupies ${ROOT}/usr/lib/tls!"
+			eerror "Please open a bug and include the output of:"
+			echo
+			eerror "  $ ls -l /usr/lib/tls"
+			die "Not only nvidia-glx occupies ${ROOT}/usr/lib/tls!"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	#switch to the nvidia implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update nvidia
+	fi
+
+	echo
+	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
+	echo
+	einfo "You may also be interested in media-video/nvidia-settings"
+	echo
+	einfo "nVidia have requested that any bug reports submitted have the"
+	einfo "output of /usr/bin/nvidia-bug-report.sh included."
+}