summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-04-29 19:32:26 +0200
committertnut <thierryn1 at hispeed dot ch>2010-04-29 19:32:26 +0200
commit12bde4a6c68b7f8cb1989056b83c42d83cded41d (patch)
tree8a99dbccce9946e1dd93e77a05de3d2a0ed590d9
parent5fa05342fe3cc8a9b378890c842abc504ab52c90 (diff)
downloadnutyx-pakxe-12bde4a6c68b7f8cb1989056b83c42d83cded41d.tar.gz
nutyx-pakxe-12bde4a6c68b7f8cb1989056b83c42d83cded41d.tar.bz2
nutyx-pakxe-12bde4a6c68b7f8cb1989056b83c42d83cded41d.tar.xz
nutyx-pakxe-12bde4a6c68b7f8cb1989056b83c42d83cded41d.zip
Maj nvidia#195.36.24-1
-rw-r--r--extra/nvidia/.footprint34
-rw-r--r--extra/nvidia/.md5sum3
-rwxr-xr-xextra/nvidia/Pkgfile14
3 files changed, 29 insertions, 22 deletions
diff --git a/extra/nvidia/.footprint b/extra/nvidia/.footprint
index eca29005e..b680ef6a2 100644
--- a/extra/nvidia/.footprint
+++ b/extra/nvidia/.footprint
@@ -1,3 +1,7 @@
+drwxr-xr-x root/root etc/
+drwxr-xr-x root/root etc/X11/
+drwxr-xr-x root/root etc/X11/xorg.conf.d/
+-rw-r--r-- root/root etc/X11/xorg.conf.d/30-nvidia.conf
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/modules/
drwxr-xr-x root/root lib/modules/<kernel-version>/
@@ -16,30 +20,30 @@ 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.195.36.15
-lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.195.36.15
--rwxr-xr-x root/root usr/lib/libGLcore.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libGL.so.195.36.24
+lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.195.36.24
+-rwxr-xr-x root/root usr/lib/libGLcore.so.195.36.24
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
--rwxr-xr-x root/root usr/lib/libcuda.so.195.36.15
--rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.195.36.15
--rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.195.36.15
--rwxr-xr-x root/root usr/lib/libnvidia-tls.so.195.36.15
--rwxr-xr-x root/root usr/lib/libvdpau.so.195.36.15
+-rwxr-xr-x root/root usr/lib/libcuda.so.195.36.24
+-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.195.36.24
+-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.195.36.24
+-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.195.36.24
+-rwxr-xr-x root/root usr/lib/libvdpau.so.195.36.24
drwxr-xr-x root/root usr/lib/tls/
--rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.195.36.15
+-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.195.36.24
drwxr-xr-x root/root usr/lib/vdpau/
--rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.195.36.15
--rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.195.36.15
+-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.195.36.24
+-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_trace.so.195.36.24
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.195.36.15
+-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.195.36.24
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
-lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.195.36.15
--rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.195.36.15
--rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.195.36.15
+lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx.so -> /usr/lib/xorg/modules/extensions/libglx.so.195.36.24
+-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.195.36.24
+-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.195.36.24
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
diff --git a/extra/nvidia/.md5sum b/extra/nvidia/.md5sum
index 77fe35ddf..4251e0dab 100644
--- a/extra/nvidia/.md5sum
+++ b/extra/nvidia/.md5sum
@@ -1,2 +1 @@
-b09b45113585524b08b3b2acfdf4a290 NVIDIA-Linux-x86-195.36.15-pkg0.run
-8921f37eaad3576532f0023d291b9e51 nvidia-makefile.patch
+97d3e5f69707092aa643fb901bb94003 NVIDIA-Linux-x86-195.36.24-pkg0.run
diff --git a/extra/nvidia/Pkgfile b/extra/nvidia/Pkgfile
index 051fa3921..f8cbdc7e9 100755
--- a/extra/nvidia/Pkgfile
+++ b/extra/nvidia/Pkgfile
@@ -5,13 +5,11 @@
# Depends on: xorg-server
name=nvidia
-#version=190.53
-version=195.36.15
+version=195.36.24
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-pkg0.run\
- $name-makefile.patch)
+source=(http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-$version-pkg0.run)
build() {
sh NVIDIA-Linux-${_ARCH}-$version-pkg0.run --extract-only
@@ -50,5 +48,11 @@ build() {
# install it
install -m 0644 -D nvidia.ko \
$PKG/lib/modules/`uname -r`/kernel/video/nvidia/nvidia.ko
-
+ mkdir -p $PKG/etc/X11/xorg.conf.d
+cat > $PKG/etc/X11/xorg.conf.d/30-nvidia.conf << "EOF"
+Section "Device"
+ Identifier "NVIDIA"
+ Driver "nvidia"
+EndSection
+EOF
}