Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.

(Portage version: 2.0.51.22-r1)

5 files changed, 288 insertions, 7 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 13d4d469ac29..bf79ce16ae32 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.96 2005/06/03 11:57:05 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.97 2005/07/07 14:34:53 augustus Exp $
+
+*nvidia-glx-1.0.7667 (07 Jul 2005)
+
+  07 Jul 2005; <augustus@gentoo.org> nvidia-glx-1.0.7664.ebuild,
+  +nvidia-glx-1.0.7667.ebuild:
+  Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.
+  The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the
+  driver.
 
 *nvidia-glx-1.0.7664 (03 Jun 2005)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index eb376e0fec3b..15b652832916 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -8,6 +8,7 @@ MD5 294631d1c63a58bdd8c136a3c2371a36 nvidia-glx-1.0.7174-r4.ebuild 7914
 MD5 1cfe4c0440ccbce3defb54442b6563a4 nvidia-glx-1.0.7664.ebuild 7911
 MD5 c0c3217fbd08a14b2fe8749efb6c02e5 nvidia-glx-1.0.6111-r2.ebuild 7460
 MD5 abcd6fdd3e8e08be12e93d819f05561f nvidia-glx-1.0.6629-r6.ebuild 7458
+MD5 1cfe4c0440ccbce3defb54442b6563a4 nvidia-glx-1.0.7667.ebuild 7911
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
@@ -19,6 +20,7 @@ MD5 fdcf2a4ed4588fce54171fa1f2eb0526 files/digest-nvidia-glx-1.0.7664 163
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r4 163
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r2 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163
+MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667 163
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
 MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7667 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7667
new file mode 100644
index 000000000000..c439fad54202
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7667
@@ -0,0 +1,2 @@
+MD5 1d062204da2902ae86154a03e1a40204 NVIDIA-Linux-x86-1.0-7667-pkg0.run 5629423
+MD5 f76f14a71e71fa7b8c349a038e42b119 NVIDIA-Linux-x86_64-1.0-7667-pkg2.run 8819702
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7664.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7664.ebuild
index 3d341af0b94c..9e8d14c15ccc 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7664.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7664.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7664.ebuild,v 1.1 2005/06/03 11:57:05 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7664.ebuild,v 1.2 2005/07/07 14:34:53 augustus Exp $
 
 inherit eutils multilib versionator
 
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
-IUSE=""
+IUSE="dlloader"
 
 RDEPEND="virtual/libc
 	virtual/x11
@@ -182,10 +182,14 @@ src_install-libs() {
 	fi
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
+	# The below section was changed to fix bug #96514 and bug #91101.
+	if use dlloader; then
+		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
+	else
+		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	fi
 
 	insinto ${X11_LIB_DIR}
 	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild
new file mode 100644
index 000000000000..de82ba1f755c
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7667.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2005 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.7667.ebuild,v 1.1 2005/07/07 14:34:53 augustus Exp $
+
+inherit eutils multilib versionator
+
+X86_PKG_V="pkg0"
+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 )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="nostrip multilib-pkg-force"
+IUSE="dlloader"
+
+RDEPEND="virtual/libc
+	virtual/x11
+	>=x11-base/opengl-update-2.2.0
+	~media-video/nvidia-kernel-${PV}
+	!app-emulation/emul-linux-x86-nvidia"
+
+#	!<sys-libs/glibc-2.3.4.20040619-r2"
+# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
+# support if we are atleast CHOST=i486.
+
+PROVIDE="virtual/opengl"
+export _POSIX2_VERSION="199209"
+
+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}"
+
+check_xfree() {
+	# This isn't necessary, true. But its about time people got the idea.
+	if has_version "x11-base/xfree"; then
+		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
+	fi
+}
+
+pkg_setup() {
+	check_xfree
+
+	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your defualt abi."
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+}
+
+src_unpack() {
+	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
+
+	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 ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
+	# Use the correct defines to make gtkglext build work
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
+	# Use some more sensible gl headers and make way for new glext.h
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
+
+	# 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.
+	# 7 November 2004, Keeping this around for 6629 to see what happens.
+	#rm -f usr/include/GL/glext.h
+}
+
+src_install() {
+	local MLTEST=$(type dyn_unpack)
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif use amd64 ; then
+		src_install-libs lib32 $(get_multilibdir)
+		src_install-libs lib $(get_libdir)
+
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
+		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || return 0
+
+	# 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
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [[ ${#} -eq 2 ]] ; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+		pkglibdir=lib32
+	fi
+
+	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+
+	# The GLX libraries
+	exeinto ${NV_ROOT}/lib
+	doexe usr/${pkglibdir}/libGL.so.${PV}
+	doexe usr/${pkglibdir}/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
+
+	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
+	dodir ${NO_TLS_ROOT}
+	exeinto ${NO_TLS_ROOT}
+	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
+	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
+	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
+
+	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
+	dodir ${TLS_ROOT}
+	exeinto ${TLS_ROOT}
+	doexe usr/${pkglibdir}/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
+
+	if want_tls ; then
+		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
+	else
+		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
+		dosym ../no-tls/libnvidia-tls.so.${PV} ${NV_ROOT}/lib
+	fi
+
+	# Not sure whether installing the .la file is neccessary;
+	# this is adopted from the `nvidia' ebuild
+	local ver1=$(get_version_component_range 1)
+	local ver2=$(get_version_component_range 2)
+	local ver3=$(get_version_component_range 3)
+	sed -e "s:\${PV}:${PV}:"     \
+	    -e "s:\${ver1}:${ver1}:" \
+	    -e "s:\${ver2}:${ver2}:" \
+	    -e "s:\${ver3}:${ver3}:" \
+	    -e "s:\${libdir}:${inslibdir}:" \
+	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
+		local X11_LIB_DIR="/usr/$(get_libdir)"
+	else
+		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# The below section was changed to fix bug #96514 and bug #91101.
+	if use dlloader; then
+		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
+			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
+	else
+		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
+			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+	fi
+
+	insinto ${X11_LIB_DIR}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
+		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
+	exeinto ${X11_LIB_DIR}
+	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
+		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
+
+	exeinto ${NV_ROOT}/extensions
+	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
+		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
+
+	# Includes
+	insinto ${NV_ROOT}/include
+	doins usr/include/GL/*.h
+}
+
+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
+
+	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."
+}
+
+want_tls() {
+	# For uclibc or anything non glibc, return false
+	has_version sys-libs/glibc || return 1
+
+	# Old versions of glibc were lt/no-tls only
+	has_version '<sys-libs/glibc-2.3.2' && return 1
+
+	local valid_chost="true"
+	if use x86 ; then
+		case ${CHOST/-*} in
+			i486|i586|i686) ;;
+			*) valid_chost="false"
+		esac
+	fi
+
+	[[ ${valid_chost} == "false" ]] && return 1
+
+	# If we've got nptl, we've got tls
+	built_with_use sys-libs/glibc nptl && return 0
+
+	# These versions built linuxthreads version to support tls, too
+	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
+
+	return 1
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}