nvidia: updated to version 331.20

4 files changed, 24 insertions, 42 deletions

diff --git a/nvidia/.footprint b/nvidia/.footprint
index 23d1c5b1c..c3f044589 100644
--- a/nvidia/.footprint
+++ b/nvidia/.footprint
@@ -13,34 +13,34 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nvidia-smi
 -rwxr-xr-x	root/root	usr/bin/nvidia-xconfig
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libGL.so.319.60
-lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.319.60
+-rwxr-xr-x	root/root	usr/lib/libGL.so.331.20
+lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.331.20
 -rwxr-xr-x	root/root	usr/lib/libOpenCL.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libcuda.so.319.60
-lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so -> libnvcuvid.so.319.60
-lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvcuvid.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-encode.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-ml.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-opencl.so.319.60
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.319.60
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.331.20
+lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so -> libnvcuvid.so.331.20
+lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvcuvid.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-encode.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-ml.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-opencl.so.331.20
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.331.20
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.319.60
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.331.20
 drwxr-xr-x	root/root	usr/lib/vdpau/
-lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.319.60
-lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.319.60
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.319.60
+lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.331.20
+lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.331.20
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.331.20
 drwxr-xr-x	root/root	usr/lib/xorg/
 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/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.319.60
-lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.319.60
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.319.60
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.331.20
+lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.331.20
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.331.20
 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 2dbde8dab..e93dc74d7 100644
--- a/nvidia/.md5sum
+++ b/nvidia/.md5sum
@@ -1,2 +1 @@
-864dca9ef36fe6c09c0a9dfaeb525189  NVIDIA-Linux-x86_64-319.60-no-compat32.run
-1eff45ce5cfd36cf7c5f8690d4c1a0e0  nvidia-kernel311.patch
+28295eed56c2ca996401c0093279620f  NVIDIA-Linux-x86_64-331.20-no-compat32.run
diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile
index 0a23445fd..f7b7379ad 100644
--- a/nvidia/Pkgfile
+++ b/nvidia/Pkgfile
@@ -1,12 +1,12 @@
 # Description: nVIDIA Linux Display Driver
 # URL: http://www.nvidia.com/
 # Maintainer: Matt Housh, jaeger at morpheus dot net
-# Depends on: gtk gl-select pangox-compat
+# Depends on: gtk gl-select
 
 name=nvidia
-version=319.60
+version=331.20
 release=1
-source=(ftp://download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run $name-kernel311.patch)
+source=(ftp://download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run)
 
 build() {
     sh NVIDIA-Linux-x86_64-$version-no-compat32.run --extract-only
@@ -59,9 +59,7 @@ build() {
     install -m 0644 -D nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd
 
     # kernel module
-    patch -p1 -i $SRC/$name-kernel311.patch
     cd kernel
-    ln -s Makefile.kbuild Makefile
     IGNORE_CC_MISMATCH=1 make module
     install -D -m 0644 nvidia.ko $PKG/lib/modules/`uname -r`/extra/nvidia.ko
 }
diff --git a/nvidia/nvidia-kernel311.patch b/nvidia/nvidia-kernel311.patch
deleted file mode 100644
index b272dee5d..000000000
--- a/nvidia/nvidia-kernel311.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN NVIDIA-Linux-x86_64-319.49-no-compat32.orig/kernel/nv-linux.h NVIDIA-Linux-x86_64-319.49-no-compat32/kernel/nv-linux.h
---- NVIDIA-Linux-x86_64-319.49-no-compat32.orig/kernel/nv-linux.h	2013-08-13 21:33:23.000000000 -0500
-+++ NVIDIA-Linux-x86_64-319.49-no-compat32/kernel/nv-linux.h	2013-09-17 11:13:44.959178433 -0500
-@@ -1037,7 +1037,11 @@
- #endif
- 
- #if !defined(NV_VMWARE)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0)
- #define NV_NUM_PHYSPAGES                num_physpages
-+#else
-+#define NV_NUM_PHYSPAGES                get_num_physpages()
-+#endif
- #define NV_GET_CURRENT_PROCESS()        current->tgid
- #define NV_IN_ATOMIC()                  in_atomic()
- #define NV_LOCAL_BH_DISABLE()           local_bh_disable()