Fixing TLS test for bug #36551. Thanks to Ronald Hummelink <gentoo-bugzilla@hummelink.xs4all.nl> for the patch.

4 files changed, 123 insertions, 2 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index b25323ed0542..c622b7fbd7f2 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2003/12/26 07:48:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.31 2004/01/05 19:47:09 spyderous Exp $
+
+*nvidia-glx-1.0.5328-r1 (05 Jan 2004)
+
+  05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  nvidia-glx-1.0.5328-r1.ebuild:
+  Fixing TLS test for bug #36551. Thanks to Ronald Hummelink
+  <gentoo-bugzilla@hummelink.xs4all.nl> for the patch.
 
   26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
   Adding metadata.xml.
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index caedb9c036b2..0f91f93037e6 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,4 +1,4 @@
-MD5 4636f6bba470d3da2da1c1fe5b4774a0 ChangeLog 4557
+MD5 c814135c05a31eeda81e79c3f169ef8a ChangeLog 4801
 MD5 ba5414f31df5938d0ffe0f523b257b41 nvidia-glx-1.0.2880.ebuild 2569
 MD5 6a31e9bf5deb8d2a49dd05d17b38d71e nvidia-glx-1.0.2960-r1.ebuild 2612
 MD5 4577c819b0246a08224106b79de263fa nvidia-glx-1.0.3123.ebuild 2548
@@ -12,6 +12,7 @@ MD5 f8c91aa90a04a78e7e6747252f3277f8 nvidia-glx-1.0.4496.ebuild 3008
 MD5 0ba4130a78e6b7f3a8380036f40048c7 nvidia-glx-1.0.4499.ebuild 2681
 MD5 d3248dfe11ba3ba5fa87ec6c1cd7a1fa nvidia-glx-1.0.5328.ebuild 3037
 MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
+MD5 2e6d2e02dbd2d4ccb1cc136c06941645 nvidia-glx-1.0.5328-r1.ebuild 3069
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
 MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
@@ -33,3 +34,4 @@ MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
 MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328 80
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
+MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r1
new file mode 100644
index 000000000000..32ab3b45d935
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r1
@@ -0,0 +1 @@
+MD5 b2ae3a449837430d5f10a2ebf3d9f7d4 NVIDIA-Linux-x86-1.0-5328-pkg1.run 6855080
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5328-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5328-r1.ebuild
new file mode 100644
index 000000000000..7cec8c71e593
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5328-r1.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.5328-r1.ebuild,v 1.1 2004/01/05 19:47:11 spyderous 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}/${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 ${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
+}