summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-08-23 22:22:59 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-08-23 22:22:59 +0200
commita01af246a04f90941c833c016bb2775a4521aa34 (patch)
treec933558bc69cb4ea8742179cb43d62d6351f09c0
parent0367fa726c51ade4eb5770094599145cad4f2634 (diff)
downloadnutyx-extra-a01af246a04f90941c833c016bb2775a4521aa34.tar.gz
nutyx-extra-a01af246a04f90941c833c016bb2775a4521aa34.tar.bz2
nutyx-extra-a01af246a04f90941c833c016bb2775a4521aa34.tar.xz
nutyx-extra-a01af246a04f90941c833c016bb2775a4521aa34.zip
Maj de nvidia#185.18.31-1
-rw-r--r--extra/nvidia/.footprint36
-rw-r--r--extra/nvidia/.md5sum2
-rwxr-xr-xextra/nvidia/Pkgfile12
3 files changed, 26 insertions, 24 deletions
diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index 181d61f7a..e72c1d796 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -1,10 +1,10 @@
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/modules/
-drwxr-xr-x root/root lib/modules/2.6.30.4/
-drwxr-xr-x root/root lib/modules/2.6.30.4/kernel/
-drwxr-xr-x root/root lib/modules/2.6.30.4/kernel/drivers/
-drwxr-xr-x root/root lib/modules/2.6.30.4/kernel/drivers/video/
--rw-r--r-- root/root lib/modules/2.6.30.4/kernel/drivers/video/nvidia.ko
+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/bin/
-rwxr-xr-x root/root usr/bin/nvidia-bug-report.sh
@@ -16,20 +16,20 @@ drwxr-xr-x root/root usr/lib/X11/modules/
drwxr-xr-x root/root usr/lib/X11/modules/drivers/
-rwxr-xr-x root/root usr/lib/X11/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/X11/modules/extensions/
-lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> /usr/lib/X11/modules/extensions/libglx.so.185.18.29
--rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.185.18.29
--rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.185.18.29
-lrwxrwxrwx root/root usr/lib/libGL.so -> /usr/lib/libGL.so.185.18.29
-lrwxrwxrwx root/root usr/lib/libGL.so.1 -> /usr/lib/libGL.so.185.18.29
--rwxr-xr-x root/root usr/lib/libGL.so.185.18.29
-lrwxrwxrwx root/root usr/lib/libGLcore.so.1 -> /usr/lib/libGLcore.so.185.18.29
--rwxr-xr-x root/root usr/lib/libGLcore.so.185.18.29
+lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> /usr/lib/X11/modules/extensions/libglx.so.185.18.31
+-rwxr-xr-x root/root usr/lib/X11/modules/extensions/libglx.so.185.18.31
+-rwxr-xr-x root/root usr/lib/X11/modules/libnvidia-wfb.so.185.18.31
+lrwxrwxrwx root/root usr/lib/libGL.so -> /usr/lib/libGL.so.185.18.31
+lrwxrwxrwx root/root usr/lib/libGL.so.1 -> /usr/lib/libGL.so.185.18.31
+-rwxr-xr-x root/root usr/lib/libGL.so.185.18.31
+lrwxrwxrwx root/root usr/lib/libGLcore.so.1 -> /usr/lib/libGLcore.so.185.18.31
+-rwxr-xr-x root/root usr/lib/libGLcore.so.185.18.31
-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.a
--rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.185.18.29
-lrwxrwxrwx root/root usr/lib/libnvidia-cfg.so.1 -> /usr/lib/libnvidia-cfg.so.185.18.29
--rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.185.18.29
-lrwxrwxrwx root/root usr/lib/libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.185.18.29
--rwxr-xr-x root/root usr/lib/libnvidia-tls.so.185.18.29
+-rwxr-xr-x root/root usr/lib/libXvMCNVIDIA.so.185.18.31
+lrwxrwxrwx root/root usr/lib/libnvidia-cfg.so.1 -> /usr/lib/libnvidia-cfg.so.185.18.31
+-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.185.18.31
+lrwxrwxrwx root/root usr/lib/libnvidia-tls.so.1 -> /usr/lib/libnvidia-tls.so.185.18.31
+-rwxr-xr-x root/root usr/lib/libnvidia-tls.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
diff --git a/extra/nvidia/.md5sum b/extra/nvidia/.md5sum
index 05efb3b69..3de512146 100644
--- a/extra/nvidia/.md5sum
+++ b/extra/nvidia/.md5sum
@@ -1 +1 @@
-ecafd5b6a8e4b9f8795618b2c4a7205f NVIDIA-Linux-x86-185.18.29-pkg1.run
+e5e111cb77a210f337c45112b3b46a7e NVIDIA-Linux-x86_64-185.18.31-pkg1.run
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index 42d16643a..9cb4cf541 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -5,15 +5,17 @@
# Depends on:
name=nvidia
-version=185.18.29
+version=185.18.31
release=1
-_kernel=2.6.30.4
-source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg1.run\
+_kernel=2.6.30.5
+[ "`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\
)
build() {
- sh NVIDIA-Linux-x86-$version-pkg1.run --extract-only
- cd NVIDIA-Linux-x86-$version-pkg1/usr/src/nv
+ 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