From 5ac122757880b58df41593e2ab6f38aa3e1d4b0f Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 12 Nov 2008 18:40:38 +0100
Subject: [PATCH] nvidia: update to 177.82

* added additional symlinks need by gl-select upon request of
  Jose V Beneyto.
* new directory /lib/modules/<kernel-version/extra for kernel
  module to prevent erasing on every "make modules_install".
  Suggested by Alan Mizrahi.
---
 nvidia/.footprint | 28 ++++++++++++++--------------
 nvidia/.md5sum    |  2 +-
 nvidia/Pkgfile    |  8 ++++++--
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/nvidia/.footprint b/nvidia/.footprint
index f10977bea..ca7515d39 100644
--- a/nvidia/.footprint
+++ b/nvidia/.footprint
@@ -1,10 +1,8 @@
 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-settings
@@ -18,24 +16,26 @@ 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.177.80
-lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.177.80
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.177.80
--rwxr-xr-x	root/root	usr/lib/libcuda.so.177.80
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.177.80
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.177.80
+-rwxr-xr-x	root/root	usr/lib/libGL.so.177.82
+lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.177.82
+lrwxrwxrwx	root/root	usr/lib/libGLcore.so -> libGLcore.so.177.82
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.177.82
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.177.82
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.177.82
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.177.82
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.177.80
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.177.82
 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.177.80
+-rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.177.82
 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.177.80
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.177.80
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.177.82
+lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.177.82
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.177.82
 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
diff --git a/nvidia/.md5sum b/nvidia/.md5sum
index c69efce14..9f252a30d 100644
--- a/nvidia/.md5sum
+++ b/nvidia/.md5sum
@@ -1,2 +1,2 @@
-950b9fbbb71a14d70e97cf77f796021c  NVIDIA-Linux-x86-177.80-pkg0.run
+882f34a662f0175682fdc4a9bec909ba  NVIDIA-Linux-x86-177.82-pkg0.run
 8921f37eaad3576532f0023d291b9e51  nvidia-makefile.patch
diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile
index 909c965df..a4512405a 100644
--- a/nvidia/Pkgfile
+++ b/nvidia/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gtk gl-select
 
 name=nvidia
-version=177.80
+version=177.82
 release=1
 source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
 	$name-makefile.patch)
@@ -29,6 +29,10 @@ build() {
 	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
 	mkdir -p $PKG/usr/include/nvidia
@@ -46,5 +50,5 @@ build() {
 
 	# install it
 	install -m 0644 -D nvidia.ko \
-		$PKG/lib/modules/`uname -r`/kernel/drivers/video/nvidia.ko
+		$PKG/lib/modules/`uname -r`/extra/nvidia.ko
 }