Update to 304.135-7

4 files changed, 62 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b788ca95fbd3..82f2820eb8d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 # Generated by mksrcinfo v8
-# Fri Apr 21 22:16:42 UTC 2017
+# Fri May 19 22:11:24 UTC 2017
 pkgbase = nvidia-304xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 304xx legacy branch.
 	pkgver = 304.135
-	pkgrel = 6
+	pkgrel = 7
 	url = http://www.nvidia.com/
 	install = readme.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-ck-headers>=4.10
-	makedepends = linux-ck-headers<4.11
+	makedepends = linux-ck-headers>=4.11
+	makedepends = linux-ck-headers<4.12
 	makedepends = nvidia-304xx-libgl
-	depends = linux-ck>=4.10
-	depends = linux-ck<4.11
+	depends = linux-ck>=4.11
+	depends = linux-ck<4.12
 	depends = libgl
 	depends = nvidia-304xx-utils=304.135
 	conflicts = nvidia-340xx-ck
@@ -21,8 +21,10 @@ pkgbase = nvidia-304xx-ck
 	options = !strip
 	source = drm-driver-legacy.patch
 	source = kernel_4.10.patch
+	source = unfuck-4.11_for_304xx.patch
 	sha256sums = f52406b17d2e0dc1c20a61b62bb734ee7f2a3b8f71d0608cbef35aa301654729
 	sha256sums = 7d35792528cade28232a2a0f582d36975c271de6fe99a6f3a4046b9637b9739a
+	sha256sums = 125995702eb2fd4ed43bc53e1f385ef4d47f14dc2da23a52061fb7b875ea9eaa
 	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/304.135/NVIDIA-Linux-x86-304.135.run
 	sha256sums_i686 = 5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93
 	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/304.135/NVIDIA-Linux-x86_64-304.135-no-compat32.run
diff --git a/PKGBUILD b/PKGBUILD
index e8912d37b3af..4e3db2bc91cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=nvidia-304xx-ck
 pkgver=304.135
-_extramodules=extramodules-4.10-ck
-pkgrel=6
+_extramodules=extramodules-4.11-ck
+pkgrel=7
 _pkgdesc="NVIDIA drivers for linux-ck, 304xx legacy branch."
 pkgdesc="$_pkgdesc"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-ck>=4.10' 'linux-ck<4.11' 'libgl' "nvidia-304xx-utils=${pkgver}")
-makedepends=('linux-ck-headers>=4.10' 'linux-ck-headers<4.11' 'nvidia-304xx-libgl')
+depends=('linux-ck>=4.11' 'linux-ck<4.12' 'libgl' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-ck-headers>=4.11' 'linux-ck-headers<4.12' 'nvidia-304xx-libgl')
 conflicts=('nvidia-340xx-ck' 'nvidia-ck')
 #groups=('ck-generic')
 #replaces=()
@@ -19,11 +19,13 @@ license=('custom')
 install=readme.install
 options=(!strip)
 source=('drm-driver-legacy.patch'
-'kernel_4.10.patch')
+'kernel_4.10.patch'
+'unfuck-4.11_for_304xx.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}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
 sha256sums=('f52406b17d2e0dc1c20a61b62bb734ee7f2a3b8f71d0608cbef35aa301654729'
-            '7d35792528cade28232a2a0f582d36975c271de6fe99a6f3a4046b9637b9739a')
+            '7d35792528cade28232a2a0f582d36975c271de6fe99a6f3a4046b9637b9739a'
+            '125995702eb2fd4ed43bc53e1f385ef4d47f14dc2da23a52061fb7b875ea9eaa')
 sha256sums_i686=('5cb0a191ddca7b4c72b3c26cd57b7d719878ce628d24b5b026a0e5c8d3a00d93')
 sha256sums_x86_64=('352f4a4d5ef692b26383e2cf9ec866f6973f905d53eb6bc9f2161b6ba2afae5a')
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
@@ -34,6 +36,7 @@ prepare() {
 	cd "${_pkg}"
   
   # patches here
+  patch -Np1 -i "$srcdir"/unfuck-4.11_for_304xx.patch
   patch -Np1 --no-backup-if-mismatch -i ../kernel_4.10.patch
   # FS#47092
   (cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/drm-driver-legacy.patch)
diff --git a/readme.install b/readme.install
index 11fb94c3b450..6ad726d30f0d 100644
--- a/readme.install
+++ b/readme.install
@@ -4,7 +4,7 @@ post_install() {
 }
 
 post_upgrade() {
-	EXTRAMODULES='extramodules-4.10-ck'
+	EXTRAMODULES='extramodules-4.11-ck'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/unfuck-4.11_for_304xx.patch b/unfuck-4.11_for_304xx.patch
new file mode 100644
index 000000000000..71e32628041e
--- /dev/null
+++ b/unfuck-4.11_for_304xx.patch
@@ -0,0 +1,44 @@
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -22,6 +22,8 @@
+ #include <drm/drm_gem.h>
+ #endif
+ 
++#include <linux/version.h>
++
+ extern nv_linux_state_t *nv_linux_devices;
+ 
+ static int nv_drm_load(
+@@ -42,7 +44,11 @@
+     return -ENODEV;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nv_drm_unload(
++#else
++static void nv_drm_unload(
++#endif
+     struct drm_device *dev
+ )
+ {
+@@ -52,11 +58,19 @@
+     {
+         if (nvl->dev == dev->pdev)
+         {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+             return 0;
++#else
++            return;
++#endif
+         }
+     }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+     return -ENODEV;
++#else
++    return;
++#endif
+ }
+ 
+ static const struct file_operations nv_drm_fops = {
+