Upgpkg: 375.10

3 files changed, 16 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3355cd94a4a2..c36cf2f012c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
 # Wed Feb 10 11:39:03 UTC 2016
 pkgbase = nvidia-full-beta
-	pkgver = 370.28
+	pkgver = 375.10
 	pkgrel = 1
 	url = http://www.nvidia.com/
 	arch = i686
@@ -10,19 +10,17 @@ pkgbase = nvidia-full-beta
 	makedepends = linux-headers
 	options = !strip
 	source = 20-nvidia.conf
-	source = linux-4.8.patch
 	md5sums = 2640eac092c220073f0668a7aaff61f7
-	md5sums = 96a37004a3394b01385d3ea9d8e8fa86
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/370.28/NVIDIA-Linux-x86-370.28.run
-	md5sums_i686 = 7d3e1c691cd53852f422a93169268178
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/370.28/NVIDIA-Linux-x86_64-370.28-no-compat32.run
-	md5sums_x86_64 = 3bcd9a132e50a17b846869f1c57b9c75
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/375.10/NVIDIA-Linux-x86-375.10.run
+	md5sums_i686 = 8414d40bd101272ce082e204a7d032b2
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/375.10/NVIDIA-Linux-x86_64-375.10-no-compat32.run
+	md5sums_x86_64 = 6a68c1550de9adc5e8f32241344f3dda
 
 pkgname = nvidia-full-beta
 	pkgdesc = Full NVIDIA driver package for Arch's official 'linux' package (driver, utilities, and libraries) (beta version)
 	install = nvidia-full-beta.install
 	depends = linux
-	depends = nvidia-utils-full-beta>=370.28
+	depends = nvidia-utils-full-beta>=375.10
 	depends = libgl
 	provides = nvidia
 	conflicts = nvidia-96xx
@@ -37,7 +35,7 @@ pkgname = nvidia-utils-full-beta
 	optdepends = gtk3: nvidia-settings (GTK+ v3)
 	optdepends = opencl-nvidia-full-beta: OpenCL support
 	optdepends = xorg-server-devel: nvidia-xconfig
-	provides = nvidia-utils=370.28
+	provides = nvidia-utils=375.10
 	provides = nvidia-settings
 	provides = libglvnd
 	conflicts = nvidia-utils
@@ -67,7 +65,7 @@ pkgname = lib32-nvidia-utils-full-beta
 	depends = lib32-zlib
 	depends = lib32-gcc-libs
 	optdepends = lib32-opencl-nvidia-full-beta: OpenCL support
-	provides = lib32-nvidia-utils=370.28
+	provides = lib32-nvidia-utils=375.10
 	provides = lib32-libglvnd
 	conflicts = lib32-nvidia-utils
 	conflicts = lib32-libglvnd
diff --git a/PKGBUILD b/PKGBUILD
index dc16c45a6fae..f55a30b249fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 _lib32=0
 
 pkgname=('nvidia-full-beta' 'nvidia-utils-full-beta' 'nvidia-libgl-full-beta' 'opencl-nvidia-full-beta')
-pkgver=370.28
+pkgver=375.10
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -26,15 +26,15 @@ elif [[ $_lib32 = 1 ]] || pacman -Q lib32-nvidia-utils-full-beta &>/dev/null; th
 fi
 
 # Source
-source=('20-nvidia.conf'
-        'linux-4.8.patch')
+source=('20-nvidia.conf')
+#        'linux-4.8.patch')
 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'
-         '96a37004a3394b01385d3ea9d8e8fa86')
-md5sums_i686=('7d3e1c691cd53852f422a93169268178')
-md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75')
-[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('95a6401db6576eaeea6ba4bc06fb61d2')
+md5sums=('2640eac092c220073f0668a7aaff61f7')
+#         '96a37004a3394b01385d3ea9d8e8fa86')
+md5sums_i686=('8414d40bd101272ce082e204a7d032b2')
+md5sums_x86_64=('6a68c1550de9adc5e8f32241344f3dda')
+[[ $_pkg = NVIDIA-Linux-x86_64-$pkgver ]] && md5sums_x86_64=('f3d5b040f3698181f25c484c5b7d0b31')
 
 # Auto-detect patches (e.g. linux-4.1.patch)
 for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
diff --git a/linux-4.8.patch b/linux-4.8.patch
deleted file mode 100644
index 471d1b0bc97f..000000000000
--- a/linux-4.8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur kernel/nvidia-drm/nvidia-drm-drv.c kernel-patched/nvidia-drm/nvidia-drm-drv.c
---- kernel/nvidia-drm/nvidia-drm-drv.c	2016-08-09 02:43:19.000000000 +0300
-+++ kernel-patched/nvidia-drm/nvidia-drm-drv.c	2016-08-26 20:14:29.109937200 +0300
-@@ -37,6 +37,7 @@
- #include "nvidia-drm-ioctl.h"
- 
- #include <drm/drmP.h>
-+#include <drm/drm_auth.h>
- 
- #include <drm/drm_crtc_helper.h>
- 
-@@ -424,7 +425,7 @@
- 
- static
- void nvidia_drm_master_drop(struct drm_device *dev,
--                            struct drm_file *file_priv, bool from_release)
-+                            struct drm_file *file_priv)
- {
-     struct nvidia_drm_device *nv_dev = dev->dev_private;
-     int ret;
-@@ -457,7 +458,7 @@
-     mutex_lock(&dev->master_mutex);
- 
-     if (!file_priv->is_master ||
--        !file_priv->minor->master)
-+        !file_priv->master)
-     {
-         goto done;
-     }
-@@ -478,7 +479,7 @@
-      * NVKMS modeset ownership, because nvidia_drm_master_set()'s call to
-      * grabOwnership() will fail.
-      */
--    drm_master_put(&file_priv->minor->master);
-+    drm_master_put(&file_priv->master);
-     file_priv->is_master = 0;
- 
-     ret = 0;
-diff -ur kernel/nvidia-drm/nvidia-drm-modeset.c kernel-patched/nvidia-drm/nvidia-drm-modeset.c
---- kernel/nvidia-drm/nvidia-drm-modeset.c	2016-08-09 02:43:19.000000000 +0300
-+++ kernel-patched/nvidia-drm/nvidia-drm-modeset.c	2016-08-26 20:14:29.113947800 +0300
-@@ -675,7 +675,7 @@
-         goto failed;
-     }
- 
--    drm_atomic_helper_swap_state(dev, state);
-+    drm_atomic_helper_swap_state(state, true);
- 
-     nvidia_drm_update_head_mode_config(state, requested_config);
-