[arch-commits] Commit in nvidia-304xx/trunk (3 files)

[Tobias Powalowski]

    Date: Monday, May 22, 2017 @ 13:01:50
  Author: tpowa
Revision: 296405

upgpkg: nvidia-304xx 304.135-5

bump to 4.11.2

Added:
  nvidia-304xx/trunk/kernel_4.11.patch
Modified:
  nvidia-304xx/trunk/PKGBUILD
  nvidia-304xx/trunk/nvidia-304xx.install

----------------------+
 PKGBUILD             |   15 +++++++++------
 kernel_4.11.patch    |   44 ++++++++++++++++++++++++++++++++++++++++++++
 nvidia-304xx.install |    2 +-
 3 files changed, 54 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-22 12:52:43 UTC (rev 296404)
+++ PKGBUILD	2017-05-22 13:01:50 UTC (rev 296405)
@@ -5,22 +5,24 @@
 pkgbase=nvidia-304xx
 pkgname=(nvidia-304xx nvidia-304xx-dkms)
 pkgver=304.135
-_extramodules=extramodules-4.10-ARCH
-pkgrel=4
+_extramodules=extramodules-4.11-ARCH
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=('linux' 'linux-headers>=4.10' 'linux-headers<4.11')
+makedepends=('linux' 'linux-headers>=4.11' 'linux-headers<4.12')
 conflicts=('nvidia')
 license=('custom')
 options=('!strip')
 source=('disable-mtrr.patch'
         'drm-driver-legacy.patch'
-        'kernel_4.10.patch')
+        'kernel_4.10.patch'
+	'kernel_4.11.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")
 sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774'
             'fa39dee5c9f1ea98286c87165f683ee194b2cb4056aa6b556e822b9ee760dcf3683ea001c3704e79b9ac9712314d7df5690dc7f68440cda7a96791f94425455d'
-            '68dabbf6ad889c46bd0c01ebb697b80f4aa526ef1cdc53de008343a243adefc6ce7f2778be7005f2d79f3d23c0a3ff69f67ecdb9f97c0feb0ec99405a0c1046a')
+            '68dabbf6ad889c46bd0c01ebb697b80f4aa526ef1cdc53de008343a243adefc6ce7f2778be7005f2d79f3d23c0a3ff69f67ecdb9f97c0feb0ec99405a0c1046a'
+            'da3d1698af8b97e8fc3b6d3c690925e0258f8b6ad26a24f8d32c04a5a82701655208021f9f5af0ce44cb397a7422e2776a05193204bc7e4ac2b98f6e173984ea')
 sha512sums_i686=('c2645cc9a6f23641d8b6da51e72e203980068c05e365fcc73b32322a6875ce95e81f4e0d893276e14e84e93464488539c16db6b3be04f5324cf7d7a12bb557f8')
 sha512sums_x86_64=('a5aa48baa75eb267bd193e59328aa5fbc15d41045bb7e97aa1b96b918b9e68a1c1bf95624d9d494336256e0af2c41e188d30fe91be4967084de3387f50d3805c')
 
@@ -33,6 +35,7 @@
     cd "${_pkg}"
     # patches here
     patch -Np1 --no-backup-if-mismatch -i ../kernel_4.10.patch
+    patch -Np1 --no-backup-if-mismatch -i ../kernel_4.11.patch
 
     # FS#47092
     #(cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch)
@@ -49,7 +52,7 @@
 
 package_nvidia-304xx() {
     pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
-    depends=('linux>=4.10' 'linux<4.11' 'libgl' "nvidia-304xx-utils=${pkgver}")
+    depends=('linux>=4.11' 'linux<4.12' 'libgl' "nvidia-304xx-utils=${pkgver}")
 	conflicts+=('nvidia-304xx-dkms')
     install=nvidia-304xx.install
 

Added: kernel_4.11.patch
===================================================================
--- kernel_4.11.patch	                        (rev 0)
+++ kernel_4.11.patch	2017-05-22 13:01:50 UTC (rev 296405)
@@ -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 = {
+

Modified: nvidia-304xx.install
===================================================================
--- nvidia-304xx.install	2017-05-22 12:52:43 UTC (rev 296404)
+++ nvidia-304xx.install	2017-05-22 13:01:50 UTC (rev 296405)
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.10-ARCH'
+    EXTRAMODULES='extramodules-4.11-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }