Maj nvidia#185.18.36-1

3 files changed, 94 insertions, 72 deletions

diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index bdf90aaf5..78be9e3f9 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -1,13 +1,10 @@
 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	lib/modules/<kernel-version>/extra/
+-rw-r--r--	root/root	lib/modules/<kernel-version>/extra/nvidia.ko
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/nvidia-bug-report.sh
 -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/
@@ -19,38 +16,28 @@ drwxr-xr-x	root/root	usr/include/nvidia/GL/
 -r--r--r--	root/root	usr/include/nvidia/GL/glxext.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libGL.la
--rwxr-xr-x	root/root	usr/lib/libGL.so.185.18.31
-lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.185.18.31
-lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libcuda.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libvdpau.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libvdpau_nvidia.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/libvdpau_trace.so.185.18.31
+-rwxr-xr-x	root/root	usr/lib/libGL.so.185.18.36
+lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libvdpau.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libvdpau_nvidia.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/libvdpau_trace.so.185.18.36
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.185.18.31
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.185.18.36
 drwxr-xr-x	root/root	usr/lib/xorg/
 -r--r--r--	root/root	usr/lib/xorg/libXvMCNVIDIA.a
--rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.185.18.31
+-rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.185.18.36
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
 drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
 lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libGLcore.so -> /usr/lib/libGLcore.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.185.18.31
-lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.185.18.31
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.185.18.31
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/nvidia-settings.desktop
-drwxr-xr-x	root/root	usr/share/licenses/
-drwxr-xr-x	root/root	usr/share/licenses/nvidia/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/nvidia-settings.1.gz
--rw-r--r--	root/root	usr/share/man/man1/nvidia-smi.1.gz
--rw-r--r--	root/root	usr/share/man/man1/nvidia-xconfig.1.gz
-drwxr-xr-x	root/root	usr/share/pixmaps/
--rw-r--r--	root/root	usr/share/pixmaps/nvidia-settings.png
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.185.18.36
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.185.18.36
+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/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index 3e3f022dc..a1a991ee0 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -5,57 +5,53 @@
 # Depends on:
 
 name=nvidia
-version=185.18.31
-release=2
-_kernel=2.6.30.5
+version=185.18.36
+release=1
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
-source=(http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version-pkg1.run\
-	)
+source=(http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version-pkg0.run\
+	$name-makefile.patch)
 
 build() {
-	sh NVIDIA-Linux-${_ARCH}-$version-pkg1.run --extract-only
-	cd NVIDIA-Linux-${_ARCH}-$version-pkg1/usr/src/nv
-	ln -s Makefile.kbuild Makefile
-	make SYSSRC=/usr/src/kernel/linux-${_kernel} module
-
-	# install kernel module
-	mkdir -p $PKG/lib/modules/${_kernel}/kernel/drivers/video
-	install -m644 nvidia.ko $PKG/lib/modules/${_kernel}/kernel/drivers/video
-	
-	
-	# make utilities
-	cd ../../
-
-        mkdir -p $PKG/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1}
-        mkdir -p $PKG/usr/lib/xorg/modules/{extensions,drivers}
-        mkdir -p $PKG/usr/share/licenses/nvidia
-
-	# Install libraries
-	cp -a X11R6/lib/* $PKG/usr/lib/xorg/
-        cp -a lib/* $PKG/usr/lib/
+	sh NVIDIA-Linux-${_ARCH}-$version-pkg0.run --extract-only
+	cd NVIDIA-Linux-${_ARCH}-$version-pkg0
+
+	patch -p0 -i $SRC/$name-makefile.patch usr/src/nv/Makefile.kbuild
+
+
+	mkdir -p $PKG/usr/lib \
+		$PKG/usr/lib/xorg/modules/drivers \
+		$PKG/usr/lib/xorg/modules/extensions \
+		$PKG/usr/bin $PKG/usr/man/man1
+
+	cp -a usr/X11R6/lib/* $PKG/usr/lib/xorg/
+	cp -a usr/lib/* $PKG/usr/lib/
 	sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la
 	ln -sf libGLcore.so.$version $PKG/usr/lib/libGLcore.so
 	ln -sf /usr/lib/libGLcore.so $PKG/usr/lib/xorg/modules/extensions/libGLcore.so
 
-	# additional symlinks required by gl-select
-	ln -s libGL.so.$version $PKG/usr/lib/libGL_so_1_2_nvidia
-	ln -s libglx.so.$version $PKG/usr/lib/xorg/modules/extensions/libglx_so_nvidia
-	
-	# Copy includes
+	# copy includes
 	mkdir -p $PKG/usr/include/nvidia
-	cp -r include/GL $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/
 
-        install -m644 share/man/man1/* $PKG/usr/share/man/man1/
-        rm $PKG/usr/share/man/man1/nvidia-installer.1.gz
+	# 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/
 
-        cp -a X11R6/lib/* $PKG/usr/lib/xorg/
-        install -m644 share/applications/nvidia-settings.desktop $PKG/usr/share/applications/
+	# build the module
+	cd usr/src/nv
+	ln -s Makefile{.kbuild,}
+	IGNORE_CC_MISMATCH=1 make module
 
-        # fix nvidia .desktop file
-        sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i \
-        $PKG/usr/share/applications/nvidia-settings.desktop
+	# install it
+	install -m 0644 -D nvidia.ko \
+		$PKG/lib/modules/`uname -r`/extra/nvidia.ko
 
-        install -m644 share/pixmaps/nvidia-settings.png $PKG/usr/share/pixmaps/
-        install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $PKG/usr/bin/
 }
diff --git a/extra/nvidia/nvidia-makefile.patch b/extra/nvidia/nvidia-makefile.patch
new file mode 100644
index 000000000..cb6c2bdd2
--- /dev/null
+++ b/extra/nvidia/nvidia-makefile.patch
@@ -0,0 +1,39 @@
+--- Makefile.kbuild.orig	2008-07-18 03:42:51.000000000 +0200
++++ Makefile.kbuild	2008-08-02 10:14:22.000000000 +0200
+@@ -239,10 +239,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
+ 
+ cc-version-check:
+ 	@if ! $(CONFTEST) cc_version_check full_output; then exit 1; fi
+@@ -284,9 +284,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
+@@ -294,8 +294,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