New NVIDIA driver 5332 released to public and now Gentoo.

4 files changed, 132 insertions, 2 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index c622b7fbd7f2..f9a23dd2f366 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.31 2004/01/05 19:47:09 spyderous Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.32 2004/01/23 06:19:54 augustus Exp $
+
+*nvidia-glx-1.0.5332 (23 Jan 2004)
+
+  23 Jan 2004; <augustus@gentoo.org> nvidia-glx-1.0.5332.ebuild,
+  files/nvidia-glx-1.0.5332-defines.patch:
+  New NVIDIA driver 5332 released to public. See NVIDIA's page for full details:
+  http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html
 
 *nvidia-glx-1.0.5328-r1 (05 Jan 2004)
 
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332
new file mode 100644
index 000000000000..943071e25292
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332
@@ -0,0 +1 @@
+MD5 eede761ab428ff0d27e5f67e8c555972 NVIDIA-Linux-x86_64-1.0-5332-pkg0.run 5597826
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-defines.patch
new file mode 100644
index 000000000000..da9933f6337c
--- /dev/null
+++ b/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-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/nvidia-glx-1.0.5332.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
new file mode 100644
index 000000000000..202cbe3d66f0
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2004 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.5332.ebuild,v 1.1 2004/01/23 06:19:54 augustus Exp $
+
+PKG_V="pkg0"
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA-Linux-x86_64-${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_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+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
+}