new version

7 files changed, 219 insertions, 1 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 67de41bab271..1cb26d0896eb 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 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.4 2002/03/14 16:53:53 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.5 2002/04/07 05:42:34 azarah Exp $
+
+*nvidia-glx-1.0.2880 (7 Apr 2002)
+
+  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild :
+
+  Moved back to /usr to fix various problems we had.  Update for dinamic
+  OpenGL switching.
 
 *nvidia-glx-1.0.2802-r2 (07 Mar 2002)
 
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
new file mode 100644
index 000000000000..d03c50ec7e54
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
@@ -0,0 +1 @@
+MD5 60cb303e5bb2ac424b865f6fa163b989 NVIDIA_GLX-1.0-2880.tar.gz 1527134
diff --git a/media-video/nvidia-glx/files/libGL.la.1 b/media-video/nvidia-glx/files/libGL.la.1
new file mode 100644
index 000000000000..2fec0306a3dc
--- /dev/null
+++ b/media-video/nvidia-glx/files/libGL.la.1
@@ -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/lib -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='/usr/lib/opengl/nvidia'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
new file mode 100644
index 000000000000..54e5945df8d5
--- /dev/null
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild,v 1.1 2002/04/07 05:42:34 azarah Exp $
+
+NV_V=${PV/1.0./1.0-}
+NV_PACKAGE=NVIDIA_GLX-${NV_V}
+S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
+DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
+SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
+	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
+HOMEPAGE="http://www.nvidia.com/"
+
+# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
+DEPEND="virtual/glibc
+	>=x11-base/xfree-4.2.0-r9
+	~media-video/nvidia-kernel-${PV}"
+
+PROVIDE="virtual/opengl"
+
+# Make sure Portage does _NOT_ strip symbols.  Need both lines for
+# Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+
+
+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
+
+	# 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
+}
+
+pkg_postinst() {
+	#switch to the nvidia implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		/usr/sbin/opengl-update nvidia
+	fi
+
+	einfo
+	einfo "Make sure to read documentation in /doc/share/${P}"
+	einfo "before you attempt to tweak your XF86Config file!"
+	einfo
+}
+
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
new file mode 100644
index 000000000000..1a322a05f617
--- /dev/null
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for media-video/nvidia-kernel
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.1 2002/04/07 05:43:58 azarah Exp $
+
+*nvidia-kernel-1.0.2880 (7 Apr 2002)
+
+  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.2880.ebuild
+
+  Fixed all the spaces.
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880
new file mode 100644
index 000000000000..6f0f9ed85425
--- /dev/null
+++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.2880
@@ -0,0 +1 @@
+MD5 20fdf77ca76a13987da691eb4d7fe7c9 NVIDIA_kernel-1.0-2880.tar.gz 406780
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.2880.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.2880.ebuild
new file mode 100644
index 000000000000..5fc8786c06d2
--- /dev/null
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.2880.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.2880.ebuild,v 1.1 2002/04/07 05:43:58 azarah Exp $
+
+NV_V=${PV/1.0./1.0-}
+NV_PACKAGE=NVIDIA_kernel-${NV_V}
+S="${WORKDIR}/${NV_PACKAGE}"
+DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
+SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
+	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
+HOMEPAGE="http://www.nvidia.com/"
+
+DEPEND="sys-kernel/linux-sources"
+
+# Make sure Portage does _NOT_ strip symbols.  Need both lines for
+# Portage 1.8.9+
+DEBUG="yes"
+RESTRICT="nostrip"
+
+
+nv_get_kernel_version () {
+	# Determine the version of the kernel sources
+	local NV_KV="`readlink /usr/src/linux`"
+	if [ $? -ne 0 ]
+	then
+		die "/usr/src/linux does not exist"
+	fi
+	NV_KV="${NV_KV/linux-/}"
+	echo -n "${NV_KV}"
+}
+
+src_compile() {
+	make KERNDIR="/usr/src/linux-`nv_get_kernel_version`" \
+		clean NVdriver || die
+}
+
+src_install () {
+	# The driver goes into the standard modules location
+	insinto "/lib/modules/`nv_get_kernel_version`/kernel/video"
+	doins NVdriver
+    
+	# Add the aliases
+	insinto /etc/modules.d
+	doins "${FILESDIR}"/nvidia
+
+	# Docs
+	dodoc ${S}/README
+
+	# The device creation script
+	into /
+	newsbin ${S}/makedevices.sh NVmakedevices.sh
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = "/" ]
+	then
+		# Get any stale module unloaded
+		[ -x /sbin/rmmod ]              && /sbin/rmmod NVdriver
+		# Update module dependency
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+		# Load the module again
+		[ -x /sbin/modprobe ]           && /sbin/modprobe NVdriver
+		if [ ! -e /dev/.devfsd ] && [ -x /sbin/NVmakedevices.sh ]
+		then
+			/sbin/NVmakedevices.sh >/dev/null 2>&1
+		fi
+	fi
+
+	einfo
+	einfo "If you are not using devfs, you might want to create nvidia"
+	einfo "device nodes by running /sbin/NVmakedevices.sh"
+	einfo
+	einfo "To load the module automatically at boot up, add"
+	einfo "\"NVdriver\" to your /etc/modules.autoload:"
+	einfo
+}
+