amd64 commit

5 files changed, 123 insertions, 3 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 8513b060ab52..b61cf249fbc7 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.25 2003/09/20 18:32:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.26 2003/10/16 04:41:15 drobbins Exp $
+
+*nvidia-glx-1.0.4499 (15 Oct 2003)
+
+  15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>:
+  nvidia-glx-1.0.4499.ebuild: New version of the ebuild for AMD64 systems.
+  Thanks to Kris Kersey, James Jones and others for working on this. See bug
+  #30799. This ebuild does need some testing; adding it so that it can be
+  tested.
 
   20 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
   nvidia-glx-1.0.4496.ebuild:
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 8129f07c9190..c0f400d88660 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,14 +1,14 @@
 MD5 5e8cf32909a5d843a48696919539e672 nvidia-glx-1.0.4349.ebuild 3009
 MD5 bea7288522e84af9596b604b6d078f12 nvidia-glx-1.0.4191-r1.ebuild 2669
 MD5 4577c819b0246a08224106b79de263fa nvidia-glx-1.0.3123.ebuild 2548
-MD5 5911e2f7d6375c2db3d306d55a344604 nvidia-glx-1.0.4499.ebuild 2679
+MD5 0ba4130a78e6b7f3a8380036f40048c7 nvidia-glx-1.0.4499.ebuild 2681
 MD5 f8c91aa90a04a78e7e6747252f3277f8 nvidia-glx-1.0.4496.ebuild 3008
 MD5 e0cb15977424ab70f030672f47dad4ec nvidia-glx-1.0.4180.ebuild 2669
 MD5 6a31e9bf5deb8d2a49dd05d17b38d71e nvidia-glx-1.0.2960-r1.ebuild 2612
 MD5 0f56c48fcced4b9f9936ea0704f6fde5 nvidia-glx-1.0.4363.ebuild 2946
 MD5 494deef78d93952563d6be83062421a4 nvidia-glx-1.0.4191.ebuild 2548
 MD5 ba5414f31df5938d0ffe0f523b257b41 nvidia-glx-1.0.2880.ebuild 2569
-MD5 e32960fd927c60f9fd08746c0b92fb84 ChangeLog 3611
+MD5 62bc9710042a5b27707a9430081d4685 ChangeLog 3939
 MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
 MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499
new file mode 100644
index 000000000000..a66deabb46d0
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499
@@ -0,0 +1 @@
+MD5 cdb026e476483a42bd533e0f1aebca4a NVIDIA_GLX-1.0-4499.tar.gz 2494878
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch
new file mode 100644
index 000000000000..2b3ec214ae20
--- /dev/null
+++ b/media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch
@@ -0,0 +1,11 @@
+diff -ur NVIDIA_GLX-1.0-4499/usr/include/GL/glx.h NVIDIA_GLX-1.0-4499.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4499/usr/include/GL/glx.h	2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4499.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.4499.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4499.ebuild
new file mode 100644
index 000000000000..08af82269fb2
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4499.ebuild
@@ -0,0 +1,100 @@
+# 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.4499.ebuild,v 1.1 2003/10/16 04:41:15 drobbins Exp $
+
+NV_V="${PV/1.0./1.0-}"
+NV_PACKAGE="NVIDIA_GLX-${NV_V}"
+S="${WORKDIR}/NVIDIA_GLX-${NV_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}.tar.gz"
+
+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() {
+	unpack ${A}
+
+	# correct defines to make gtkglext build work
+	epatch ${FILESDIR}/${P}-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}
+	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
+}
+