Upgpkg: 358.09

3 files changed, 19 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1546844fe356..f8649f8453db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-beta-all
 	pkgdesc = NVIDIA drivers for all kernels on the system (beta)
-	pkgver = 355.11
+	pkgver = 358.09
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-beta-all.install
@@ -9,18 +9,17 @@ pkgbase = nvidia-beta-all
 	license = custom:NVIDIA
 	makedepends = linux-headers
 	makedepends = pacman>=4.2.0
-	depends = nvidia-utils-beta>=355.11
+	depends = nvidia-utils-beta>=358.09
 	depends = libgl
 	provides = nvidia
 	conflicts = nvidia-96xx
 	conflicts = nvidia-173xx
 	conflicts = nvidia
 	options = !strip
-	source = nvidia-linux-4.3.patch
-	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-beta-all
 
diff --git a/PKGBUILD b/PKGBUILD
index 54b01de9817a..72156bfd84a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Based on nvidia-beta: https://aur.archlinux.org/packages/nvidia-beta/
 
 pkgname=nvidia-beta-all
-pkgver=355.11
+pkgver=358.09
 pkgrel=1
 pkgdesc="NVIDIA drivers for all kernels on the system (beta)"
 arch=('i686' 'x86_64')
@@ -25,8 +25,8 @@ esac
 # Source
 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/NVIDIA-Linux-x86_64-$pkgver-no-compat32.run")
-md5sums_i686=('16d143ccafe99328a2ca8e5a396fd4bc')
-md5sums_x86_64=('30133d89690f4683c4e289ec6c0247dc')
+md5sums_i686=('644159cc26ec16943857c722dbe2a370')
+md5sums_x86_64=('321e1de2a7c4761ae6d59455bc93aca9')
 
 # Auto-detect patches (e.g. nvidia-linux-4.1.patch)
 for _patch in $(ls "$startdir"/*.patch 2>/dev/null); do
@@ -88,14 +88,22 @@ package() {
 
     # 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;
- }