Fix libGL.la borkage (wrong paths in dependency_libs).

(Portage version: 2.0.51-r15)

5 files changed, 271 insertions, 20 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index e10833f79a91..d7034e9f5a4a 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.79 2005/01/28 23:02:56 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.80 2005/02/09 10:27:45 azarah Exp $
+
+*nvidia-glx-1.0.6629-r5 (09 Feb 2005)
+
+  09 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/libGL.la-r2,
+  +nvidia-glx-1.0.6629-r5.ebuild:
+  Fix libGL.la borkage (wrong paths in dependency_libs).
 
 *nvidia-glx-1.0.6111-r1 (29 Jan 2005)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 888fcd88de8c..f291571a51fb 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 e64f17521d26f7fab9e89c440347760d nvidia-glx-1.0.6629-r5.ebuild 6667
 MD5 c8e5b109e5de1be208567eb686311e31 ChangeLog 16644
-MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
+MD5 602445f790dfcd667782292575f1db40 nvidia-glx-1.0.6111-r1.ebuild 5584
 MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
+MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
 MD5 a625e7292c0a796b9b79c92fb0d98501 nvidia-glx-1.0.6629-r4.ebuild 6630
-MD5 602445f790dfcd667782292575f1db40 nvidia-glx-1.0.6111-r1.ebuild 5584
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 9cad0acc5dd9be15512cb4e265b73e5f files/libGL.la-r2 741
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
-MD5 2bdf3e45c38594e81f47df4e5322725d files/libGL.la-r1 740
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r4 163
-MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 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
+MD5 2bdf3e45c38594e81f47df4e5322725d files/libGL.la-r1 740
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r5 163
+MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
 MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCAbp2ArHZZzCEUG0RAnMSAJ9psFMsI6WbbsLfg1E7ce+4xJkbGACgiksJ
-yYHuANStNKDNVf4pYV/Dn2U=
-=Rgaq
------END PGP SIGNATURE-----
+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.6629-r5 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r5
new file mode 100644
index 000000000000..9324510b4ef9
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r5
@@ -0,0 +1,2 @@
+MD5 f7737c1e95371f37a4fd30da2f11e72c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
+MD5 652e69f549c81a7a3f2806daa74b9c36 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
diff --git a/media-video/nvidia-glx/files/libGL.la-r2 b/media-video/nvidia-glx/files/libGL.la-r2
new file mode 100644
index 000000000000..21b6562f5335
--- /dev/null
+++ b/media-video/nvidia-glx/files/libGL.la-r2
@@ -0,0 +1,32 @@
+# libGL.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libGL.so.1'
+
+# Names of this library.
+library_names='libGL.so.${PV} libGL.so.1 libGL.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/usr/X11R6/${xlibdir} -lm -lX11 -lXext -ldl     '
+
+# Version information for libGL.
+current=${ver1}
+age=${ver2}
+revision=${ver3}
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='${libdir}'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
new file mode 100644
index 000000000000..27c51194b871
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
@@ -0,0 +1,218 @@
+# 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.6629-r5.ebuild,v 1.1 2005/02/09 10:27:45 azarah Exp $
+
+inherit eutils multilib versionator
+
+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)"
+
+LICENSE="NVIDIA"
+SLOT="0"
+
+# This revision just changes behavior on amd64 2005.0
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="nostrip multilib-pkg-force"
+IUSE=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-base/opengl-update-2.1_pre1
+	~media-video/nvidia-kernel-${PV}
+	!app-emulation/emul-linux-x86-nvidia"
+
+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() {
+	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
+
+	# 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
+
+	# Install tls_test
+	dodir /usr/libexec/misc
+	exeinto /usr/libexec/misc
+	doexe usr/bin/tls_test
+	doexe usr/bin/tls_test_dso.so
+
+	# 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} \
+	      usr/${pkglibdir}/libGLcore.so.${PV} \
+		  usr/${pkglibdir}/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/${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
+
+	# Old opengl-updates don't always make this
+	keepdir /usr/${inslibdir}/tls
+
+	# 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:\${xlibdir}:${inslibdir}:" \
+	    -e "s:\${libdir}:${NV_ROOT}/lib:" \
+	    ${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
+	[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
+
+	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."
+}