Adding new nvidia-glx version 6106. Please be aware of emul-linux-x86-nvidia for 32 bit compatibility.

7 files changed, 234 insertions, 19 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index b028fa665309..f1c15388db2e 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,16 @@
 # 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.50 2004/07/01 08:41:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.51 2004/07/02 06:17:00 cyfred Exp $
+
+*nvidia-glx-1.0.6106 (02 Jul 2004)
+
+  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml,
+  +files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
+  +files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
+  +nvidia-glx-1.0.6106.ebuild:
+  Version bumping to 6106. Thanks to everyone on bug #55714 for testing and
+  suggesting improvements. Please note the new
+  app-emulation/emul-linux-x86-nvidia package for 32 bit compatibility on amd64.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   nvidia-glx-1.0.4363.ebuild, nvidia-glx-1.0.4496-r1.ebuild,
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index ff27d5a8a97e..4ad22c1d98f0 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,27 +1,31 @@
-MD5 9f69cf8b522df15f224b41fce852979a ChangeLog 9227
-MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 7c4770480d4d510b6281b50b24c95699 nvidia-glx-1.0.4363.ebuild 2978
-MD5 2a3b83b964fb3d421b29c1e012bda846 nvidia-glx-1.0.4496-r1.ebuild 3369
-MD5 12ffc639104f63e55d0df27dfb49fbd1 nvidia-glx-1.0.4496.ebuild 3050
+MD5 0cc010afe3ba0f74886b447936de7d5b nvidia-glx-1.0.5336-r2.ebuild 3437
+MD5 4481b55f4c337ef5c32c40fbb53a63fd nvidia-glx-1.0.6106.ebuild 4736
+MD5 d74154b17f5ea3cceb93670c22487456 nvidia-glx-1.0.5332-r2.ebuild 3680
 MD5 4f8e3d25eb70050978aa53407b4e9956 nvidia-glx-1.0.4499.ebuild 2721
+MD5 12ffc639104f63e55d0df27dfb49fbd1 nvidia-glx-1.0.4496.ebuild 3050
+MD5 2a3b83b964fb3d421b29c1e012bda846 nvidia-glx-1.0.4496-r1.ebuild 3369
+MD5 7c4770480d4d510b6281b50b24c95699 nvidia-glx-1.0.4363.ebuild 2978
 MD5 b810956128633e73a885534dae96e835 nvidia-glx-1.0.5328-r1.ebuild 3226
-MD5 d74154b17f5ea3cceb93670c22487456 nvidia-glx-1.0.5332-r2.ebuild 3680
-MD5 0cc010afe3ba0f74886b447936de7d5b nvidia-glx-1.0.5336-r2.ebuild 3437
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 9f69cf8b522df15f224b41fce852979a ChangeLog 9227
+MD5 cf991042be5789d00fe389f31166412a metadata.xml 290
+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 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
 MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 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 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
+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 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
+MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
 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 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-r2 83
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch 437
+MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch 593
diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch
new file mode 100644
index 000000000000..da9933f6337c
--- /dev/null
+++ b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch
@@ -0,0 +1,11 @@
+diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h	2003-01-30 18:20:23.000000000 +0100
+@@ -39,6 +39,7 @@
+ typedef XID GLXPixmap;
+ typedef XID GLXDrawable;
+ typedef XID GLXPbuffer;
++typedef XID GLXPbufferSGIX;
+ typedef XID GLXWindow;
+ typedef XID GLXFBConfigID;
+ 
diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch
new file mode 100644
index 000000000000..4f9396abaa13
--- /dev/null
+++ b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.old	2004-07-01 15:01:21.414466112 +1000
++++ Makefile	2004-07-01 15:01:48.486350560 +1000
+@@ -1,11 +1,5 @@
+ default:
+-	@ echo
+-	@ echo "It is NOT recommended that you use this Makefile to install"
+-	@ echo "the NVIDIA driver.  Instead, please use the nvidia-installer"
+-	@ echo "utility.  However, should nvidia-installer not operate for you,"
+-	@ echo "you may use this Makefile as a last resort.  To install using"
+-	@ echo "this Makefile, please run 'make install'."
+-	@ echo
++	@echo "nvidia-installer not used by Gentoo"
+ 
+ kernel_module_install:
+ 	cd usr/src/nv; make install
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106
new file mode 100644
index 000000000000..a343b4b8810a
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106
@@ -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/metadata.xml b/media-video/nvidia-glx/metadata.xml
index d458318e80ba..6c6e83a5b33c 100644
--- a/media-video/nvidia-glx/metadata.xml
+++ b/media-video/nvidia-glx/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>xfree</herd>
+<maintainer>
+  <email>xfree@gentoo.org</email>
+</maintainer>
+<longdescription>NVIDIA X11 driver and GLX libraries</longdescription>
 </pkgmetadata>
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6106.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6106.ebuild
new file mode 100644
index 000000000000..c00fa3520d80
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6106.ebuild
@@ -0,0 +1,169 @@
+# 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.ebuild,v 1.1 2004/07/02 06:17:00 cyfred 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=""
+
+DEPEND="virtual/libc
+	virtual/x11
+	>=x11-base/opengl-update-1.3
+	~media-video/nvidia-kernel-${PV}"
+
+PDEPEND="amd64? ( multilib? ( app-emulation/emul-linux-x86-nvidia ) )"
+
+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
+}
+
+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
+
+	local TLS_ROOT="/usr/lib/tls"
+	dodir ${TLS_ROOT}
+	exeinto ${TLS_ROOT}
+	doexe usr/lib/tls/libnvidia-tls.so.${PV}
+	dosym ${TLS_ROOT}/libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
+	dosym ${TLS_ROOT}/libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.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, 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
+}
+
+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."
+}