Upgpkg: 358.09

3 files changed, 21 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d0112df84a9..19af8077e104 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = nvidia-full-beta-all
-	pkgver = 355.11
+	pkgver = 358.09
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
@@ -9,17 +9,16 @@ pkgbase = nvidia-full-beta-all
 	makedepends = pacman>=4.2.0
 	options = !strip
 	source = 20-nvidia.conf
-	source = nvidia-linux-4.3.patch
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/355.11/NVIDIA-Linux-x86-355.11.run
-	md5sums_i686 = 16d143ccafe99328a2ca8e5a396fd4bc
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/355.11/NVIDIA-Linux-x86_64-355.11-no-compat32.run
-	md5sums_x86_64 = 30133d89690f4683c4e289ec6c0247dc
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/358.09/NVIDIA-Linux-x86-358.09.run
+	md5sums_i686 = 644159cc26ec16943857c722dbe2a370
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/358.09/NVIDIA-Linux-x86_64-358.09-no-compat32.run
+	md5sums_x86_64 = 321e1de2a7c4761ae6d59455bc93aca9
 
 pkgname = nvidia-full-beta-all
 	pkgdesc = Full NVIDIA drivers' package for all kernels on the system (drivers and shared utilities and libraries) (beta version)
 	install = nvidia-full-beta-all.install
-	depends = nvidia-utils-full-beta-all>=355.11
+	depends = nvidia-utils-full-beta-all>=358.09
 	depends = libgl
 	provides = nvidia
 	conflicts = nvidia-96xx
@@ -34,7 +33,7 @@ pkgname = nvidia-utils-full-beta-all
 	optdepends = gtk3: nvidia-settings (GTK+ v3)
 	optdepends = opencl-nvidia-full-beta-all: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
-	provides = nvidia-utils=355.11
+	provides = nvidia-utils=358.09
 	conflicts = nvidia-utils
 	backup = etc/X11/xorg.conf.d/20-nvidia.conf
 
diff --git a/PKGBUILD b/PKGBUILD
index 139cdd26709e..df2bcc791a20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _lib32=0
 
 pkgname=('nvidia-full-beta-all' 'nvidia-utils-full-beta-all' 'nvidia-libgl-full-beta-all' 'opencl-nvidia-full-beta-all')
-pkgver=355.11
+pkgver=358.09
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -30,9 +30,9 @@ source=('20-nvidia.conf')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/$_pkg.run")
 md5sums=('2640eac092c220073f0668a7aaff61f7')
-md5sums_i686=('16d143ccafe99328a2ca8e5a396fd4bc')
-md5sums_x86_64=('30133d89690f4683c4e289ec6c0247dc')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('50b48e69dc8c3b4b9940f662e1c374be')
+md5sums_i686=('644159cc26ec16943857c722dbe2a370')
+md5sums_x86_64=('321e1de2a7c4761ae6d59455bc93aca9')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('d8559178cb4b2e0f923fc99fc56e47c4')
 
 # Auto-detect patches (e.g. nvidia-linux-4.1.patch)
 for _patch in $(ls "$startdir"/*.patch 2>/dev/null); do
@@ -293,14 +293,22 @@ package_nvidia-full-beta-all() {
 
     # Install
     install -Dm644 $_pkg/kernel-$_extramodules/nvidia.ko \
-            "$pkgdir"/$_path/nvidia.ko
+           "$pkgdir"/$_path/nvidia.ko
 
     # Install UVM Module: http://devblogs.nvidia.com/parallelforall/unified-memory-in-cuda-6/
     if [[ $CARCH = x86_64 ]]; then
         install -Dm644 $_pkg/kernel-$_extramodules/nvidia-uvm.ko \
-                "$pkgdir/$_path/nvidia-uvm.ko"
+               "$pkgdir"/$_path/nvidia-uvm.ko
     fi
 
+    # Install Nvidia Modeset module:
+    #
+    # "nvidia-modeset.ko does not provide any new user-visible functionality or interfaces to third party applications.
+    #  However, in a later release, nvidia-modeset.ko will be used as a basis for the modesetting interface provided by
+    #  the kernel's direct rendering manager (DRM)."
+    install -Dm644 $_pkg/kernel-$_extramodules/nvidia-modeset.ko \
+           "$pkgdir"/$_path/nvidia-modeset.ko
+
     # Compress
     gzip "$pkgdir"/$_path/nvidia*.ko
   done
diff --git a/nvidia-linux-4.3.patch b/nvidia-linux-4.3.patch
deleted file mode 100644
index 1d13fd8706f4..000000000000
--- a/nvidia-linux-4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/kernel/nvidia/nv-procfs.c
-+++ b/kernel/nvidia/nv-procfs.c
-@@ -360,7 +360,8 @@ nv_procfs_read_registry(
-     registry_keys = ((nvl != NULL) ?
-             nvl->registry_keys : nv_registry_keys);
- 
--    return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+    seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+    return 0;
- }
- 
- static ssize_t
-@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
-     void *v
- )
- {
--    return seq_puts(s, s->private);
-+    seq_puts(s, s->private);
-+    return 0;
- }