create branch for 2.2

6 files changed, 221 insertions, 0 deletions

diff --git a/nvidia/.footprint b/nvidia/.footprint
new file mode 100644
index 000000000..59ea472ac
--- /dev/null
+++ b/nvidia/.footprint
@@ -0,0 +1,41 @@
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/modules/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/video/
+-rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/video/nvidia.ko
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/X11R6/
+drwxr-xr-x	root/root	usr/X11R6/lib/
+-rwxr-xr-x	root/root	usr/X11R6/lib/libXvMCNVIDIA.a
+-rwxr-xr-x	root/root	usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8178
+drwxr-xr-x	root/root	usr/X11R6/lib/modules/
+drwxr-xr-x	root/root	usr/X11R6/lib/modules/drivers/
+-rwxr-xr-x	root/root	usr/X11R6/lib/modules/drivers/nvidia_drv.o
+drwxr-xr-x	root/root	usr/X11R6/lib/modules/extensions/
+lrwxrwxrwx	root/root	usr/X11R6/lib/modules/extensions/libglx.so -> libglx.so.1.0.8178
+-rwxr-xr-x	root/root	usr/X11R6/lib/modules/extensions/libglx.so.1.0.8178
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/nvidia-settings
+-rwxr-xr-x	root/root	usr/bin/nvidia-xconfig
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/nvidia/
+drwxr-xr-x	root/root	usr/include/nvidia/GL/
+-r--r--r--	root/root	usr/include/nvidia/GL/gl.h
+-r--r--r--	root/root	usr/include/nvidia/GL/glext.h
+-r--r--r--	root/root	usr/include/nvidia/GL/glx.h
+-r--r--r--	root/root	usr/include/nvidia/GL/glxext.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libGL.la
+lrwxrwxrwx	root/root	usr/lib/libGL.so -> libGL.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/libGL.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.1.0.8178
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.1.0.8178
+drwxr-xr-x	root/root	usr/lib/tls/
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.1.0.8178
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/nvidia-settings.1.gz
+-rw-r--r--	root/root	usr/man/man1/nvidia-xconfig.1.gz
diff --git a/nvidia/.md5sum b/nvidia/.md5sum
new file mode 100644
index 000000000..c16a67cd6
--- /dev/null
+++ b/nvidia/.md5sum
@@ -0,0 +1,2 @@
+6c8081bfde4a806a487efc2a9a1ff016  NVIDIA-Linux-x86-1.0-8178-pkg0.run
+30639de943a63b41fb363c665e3e094f  nvidia-1.0-7676-makefiles.patch
diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile
new file mode 100644
index 000000000..d706881e8
--- /dev/null
+++ b/nvidia/Pkgfile
@@ -0,0 +1,49 @@
+# Description: nVIDIA Linux Display Driver
+# URL: http://www.nvidia.com/
+# Maintainer: Matt Housh, jaeger at morpheus dot net
+# Depends on: x11
+
+name=nvidia
+version=1.0-8178
+release=1
+source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
+	$name-1.0-7676-makefiles.patch)
+
+build() {
+	sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
+	cd NVIDIA-Linux-x86-$version-pkg0
+
+	# patch Makefiles for normal users and no load during build
+	patch -p1 < $SRC/$name-1.0-7676-makefiles.patch
+
+	# create directories the Makefile expects
+	mkdir -p $PKG/usr/lib \
+		$PKG/usr/X11R6/lib/modules/drivers \
+		$PKG/usr/X11R6/lib/modules/extensions \
+		$PKG/usr/bin $PKG/usr/man/man1
+
+	# build/install libraries
+	make ROOT=$PKG install
+	install -m 0644 usr/lib/libGL.la $PKG/usr/lib/
+	sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la
+
+	# remove the documentation
+	rm -rf $PKG/usr/share
+
+	# copy includes
+	mkdir -p $PKG/usr/include/nvidia
+	cp -r usr/include/GL $PKG/usr/include/nvidia/
+
+	# install xconfig/settings programs and manpages
+	install -m 0755 usr/bin/nvidia-{xconfig,settings} $PKG/usr/bin/
+	install -m 0644 usr/share/man/man1/nvidia-{xconfig,settings}.1.gz \
+		$PKG/usr/man/man1/
+
+	# build the module
+	cd usr/src/nv
+	IGNORE_CC_MISMATCH=1 make -f Makefile.kbuild module
+
+	# install it
+	install -m 0644 -D nvidia.ko \
+		$PKG/lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko
+}
diff --git a/nvidia/README b/nvidia/README
new file mode 100644
index 000000000..52fef2e6d
--- /dev/null
+++ b/nvidia/README
@@ -0,0 +1,36 @@
+
+README for nvidia 1.0-6629+
+
+
+**** IMPORTANT ****
+The POST-INSTALL only needs to be run *ONCE* after installing
+the nvidia port. It is *NOT REQUIRED* when upgrading the port
+if it has been run once when the port was originally installed.
+**** IMPORTANT ****
+
+
+*** NOTE for nvidia with udev ***
+
+If using udev, add your user to the "video" group to be able to
+use the nvidia devices required for 3d to function properly.
+
+
+POST-INSTALL
+
+Rename /usr/X11R6/lib/libGL.so.1.2 to something else, such
+as libGL_so_1_2 and run /sbin/ldconfig. GL applications
+should then use the nvidia-installed /usr/lib/libGL.so
+instead. Rename /usr/X11R6/lib/modules/extensions/libGLcore.a
+and libglx.a to something else, such as libGLcore.a.orig and
+libglx.a.orig.
+
+nvhelper.sh will do this for you (./nvhelper.sh --install)
+
+POST-REMOVE
+
+Rename /usr/X11R6/lib/libGL_so_1_2 (or whatever you called
+it) to libGL.so.1.2 and run /sbin/ldconfig. Also restore
+libglx.a and libGLcore.a in /usr/X11R6/lib/modules/extensions.
+
+nvhelper.sh will do this for you (./nvhelper.sh --restore)
+
diff --git a/nvidia/nvhelper.sh b/nvidia/nvhelper.sh
new file mode 100644
index 000000000..14476cd21
--- /dev/null
+++ b/nvidia/nvhelper.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# $Id: nvhelper.sh,v 1.1.1.1 2004/08/17 20:01:42 crux Exp $
+
+echo ""
+echo "nvhelper.sh - facilitate renaming/restoring of libGL.so.1.2"
+echo ""
+
+case "$1" in
+	--install)
+		if [ ! -f /usr/X11R6/lib/libGL.so.1.2 ]
+		then
+			echo "/usr/X11R6/lib/libGL.so.1.2 doesn't exist! Exiting..."
+			exit 1
+		fi
+		(cd /usr/X11R6/lib
+		 mv libGL.so.1.2 libGL_so_1_2
+		 mv libGL.a libGL_a
+		 cd modules/extensions
+		 mv libGLcore.a libGLcore.a.orig
+		 mv libglx.a libglx.a.orig
+		 /sbin/ldconfig)
+		;;
+	--restore)
+		if [ ! -f /usr/X11R6/lib/libGL_so_1_2 ]
+		then
+			echo "/usr/X11R6/lib/libGL_so_1_2 doesn't exist! Exiting..."
+			exit 1
+		fi
+		(cd /usr/X11R6/lib
+		 mv libGL_so_1_2 libGL.so.1.2
+		 mv libGL_a libGL.a
+		 cd modules/extensions
+		 mv libGLcore.a.orig libGLcore.a
+		 mv libglx.a.orig libglx.a
+		 /sbin/ldconfig)
+		;;
+	*)
+		echo "Unrecognized option, please use --install or --restore."
+		exit 0
+		;;
+esac
+
+echo "done."
diff --git a/nvidia/nvidia-1.0-7676-makefiles.patch b/nvidia/nvidia-1.0-7676-makefiles.patch
new file mode 100644
index 000000000..eae416f40
--- /dev/null
+++ b/nvidia/nvidia-1.0-7676-makefiles.patch
@@ -0,0 +1,49 @@
+diff -urN NVIDIA-Linux-x86-1.0-7676-pkg0.orig/Makefile NVIDIA-Linux-x86-1.0-7676-pkg0/Makefile
+--- NVIDIA-Linux-x86-1.0-7676-pkg0.orig/Makefile	2005-07-29 15:30:44.000000000 -0500
++++ NVIDIA-Linux-x86-1.0-7676-pkg0/Makefile	2005-08-26 08:36:42.736205664 -0500
+@@ -95,4 +95,4 @@
+ 	@echo -n "      "
+ 	cp -r usr/share/doc/* ${DOCDIR}
+ 	@echo -n "      "
+-	/sbin/ldconfig
++	#/sbin/ldconfig
+diff -urN NVIDIA-Linux-x86-1.0-7676-pkg0.orig/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86-1.0-7676-pkg0/usr/src/nv/Makefile.kbuild
+--- NVIDIA-Linux-x86-1.0-7676-pkg0.orig/usr/src/nv/Makefile.kbuild	2005-07-29 15:30:43.000000000 -0500
++++ NVIDIA-Linux-x86-1.0-7676-pkg0/usr/src/nv/Makefile.kbuild	2005-08-26 08:36:42.736205664 -0500
+@@ -255,10 +255,10 @@
+ #
+ 
+ suser-sanity-check:
+-	@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
++	#@if ! $(CONFTEST) suser_sanity_check; then exit 1; fi
+ 
+ rmmod-sanity-check:
+-	@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
++	#@if ! $(CONFTEST) rmmod_sanity_check; then exit 1; fi
+ 
+ gcc-sanity-check:
+ 	@if ! $(CONFTEST) cc_sanity_check full_output; then exit 1; fi
+@@ -293,9 +293,9 @@
+ #
+ 
+ module-install: suser-sanity-check module
+-	@mkdir -p $(MODULE_ROOT)/video; \
+-	install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
+-	PATH="$(PATH):/bin:/sbin" depmod -ae;
++	#@mkdir -p $(MODULE_ROOT)/video; \
++	#install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \
++	#PATH="$(PATH):/bin:/sbin" depmod -ae;
+ 
+ #
+ # This target builds, then installs, then creates device nodes and inserts
+@@ -303,8 +303,8 @@
+ #
+ 
+ package-install: module-install rmmod-sanity-check
+-	PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
+-	echo "$(MODULE_OBJECT) installed successfully.";
++	#PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \
++	#echo "$(MODULE_OBJECT) installed successfully.";
+ 
+ #
+ # Build an object file suitable for further processing by the installer and