add linux48 patch

3 files changed, 52 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a410f9bbb047..df8e30eef044 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
+# Generated by mksrcinfo v8
+# Fri Dec  9 10:31:50 UTC 2016
 pkgbase = nvidiabl
 	pkgdesc = Backlight driver for NVidia graphics adapters
 	pkgver = 0.88
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/guillaumezin/nvidiabl
 	install = nvidiabl.install
 	arch = x86_64
 	arch = i686
 	license = GPL
 	makedepends = linux-headers
-	makedepends = unzip
 	conflicts = nvidia-bl
 	conflicts = nvidiablctl
 	source = https://github.com/guillaumezin/nvidiabl/archive/master.zip
 	source = nvidiabl-master.patch
-	md5sums = 5fdda33fedcb78320c1581e84b395d39
+	source = kernel-4.8.patch
+	md5sums = c1cec85b0a9f4469d433a2756bdb2497
 	md5sums = 79e5699da970908d6ec8dba114df87cb
+	md5sums = d94abebc5f40586fbed015d9fab29a37
 
 pkgname = nvidiabl
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a1b9d02c6b5..58bda433f9d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,42 @@
-# Maintainer: Padfoot <padfoot at exemail dot com dot au>
+# Maintainer: Bernhard Landauer <oberon@manjaro.org>
 # Contributor: Mr_Men <tetcheve at gmail dot com>
 # Contributor: Hasan Gormus aka hsngrms <hsngrms at yandex dot com>
 # Contributor: uwinkelvos <uwinkelvos at gmx dot de>
 
 pkgname=nvidiabl
 pkgver=0.88
-pkgrel=3
+pkgrel=4
 pkgdesc="Backlight driver for NVidia graphics adapters"
-
-arch=('x86_64' 
-      'i686')
+arch=('x86_64' 'i686')
 url="https://github.com/guillaumezin/nvidiabl"
 license=('GPL')
-
-makedepends=('linux-headers'
-             'unzip')
+makedepends=('linux-headers')
 conflicts=('nvidia-bl' 'nvidiablctl')
-
-install=nvidiabl.install
-source=(https://github.com/guillaumezin/nvidiabl/archive/master.zip 
-        nvidiabl-master.patch)
-md5sums=('5fdda33fedcb78320c1581e84b395d39'
-         '79e5699da970908d6ec8dba114df87cb')
+install=$pkgname.install
+source=("https://github.com/guillaumezin/$pkgname/archive/master.zip"
+        $pkgname-master.patch
+        kernel-4.8.patch)
+md5sums=('c1cec85b0a9f4469d433a2756bdb2497'
+         '79e5699da970908d6ec8dba114df87cb'
+         'd94abebc5f40586fbed015d9fab29a37')
 
 prepare() {
-  cd "${srcdir}/nvidiabl-master/"
-  patch -p1 -i "${srcdir}/nvidiabl-master.patch"
+  cd $pkgname-master
+  patch -p1 -i ../$pkgname-master.patch
+  patch -p1 -i ../kernel-4.8.patch
 }
 
 build() {
-  cd "${srcdir}/nvidiabl-master/"
+  cd $pkgnmame-master
   make
 }
 
 package() {
-  cd "${srcdir}/nvidiabl-master/"
+  cd pkgnmame-master
   _extramodules="extramodules-$(uname -r | cut -f-2 -d'.')-$(uname -r|sed -e 's/.*-//g')"
-  _MODPATH="${pkgdir}/usr/lib/modules/${_extramodules}/"
-  install -d "${_MODPATH}"
-  install -d "${pkgdir}/usr/bin/"
-
-  install -m 644 "${srcdir}/nvidiabl-master/nvidiabl.ko" "${_MODPATH}"
-  install -m 755 scripts/usr/local/sbin/nvidiablctl "${pkgdir}/usr/bin/"
+  _MODPATH="$pkgdir/usr/lib/modules/$_extramodules/"
+  install -d "$_MODPATH"
+  install -d "$pkgdi}/usr/bin/"
+  install -m 644 "$pkgnmame-master/$pkgnmame.ko" "$_MODPATH"
+  install -m 755 scripts/usr/local/sbin/${pkgnmame}ctl "$pkgdir/usr/bin/"
 }
diff --git a/kernel-4.8.patch b/kernel-4.8.patch
new file mode 100644
index 000000000000..4a2ac5ab571e
--- /dev/null
+++ b/kernel-4.8.patch
@@ -0,0 +1,25 @@
+diff -Npur nvidiabl-master/nvidiabl-models.c nvidiabl/nvidiabl-models.c
+--- nvidiabl-master/nvidiabl-models.c	2014-04-07 23:16:19.000000000 +0200
++++ nvidiabl/nvidiabl-models.c	2016-09-17 13:30:28.505868405 +0200
+@@ -334,7 +334,7 @@ void nvidiabl_force_model(struct driver_
+  * The list of supported devices was primarily taken from NvClock,
+  * but only contains the mobile chips.
+  */
+-DEFINE_PCI_DEVICE_TABLE(nvidiabl_device_table) = {
++const struct pci_device_id nvidiabl_device_table[] = {
+ 
+ #include "nvidiabl-gpu.h"
+   
+diff -Npur nvidiabl-master/nvidiabl-models.h nvidiabl/nvidiabl-models.h
+--- nvidiabl-master/nvidiabl-models.h	2014-04-07 23:16:19.000000000 +0200
++++ nvidiabl/nvidiabl-models.h	2016-09-17 13:25:35.857314666 +0200
+@@ -21,6 +21,6 @@
+ 
+ extern void nvidiabl_force_model(struct driver_data **driver_data);
+ 
+-extern DEFINE_PCI_DEVICE_TABLE(nvidiabl_device_table);
++extern const struct pci_device_id nvidiabl_device_table[];
+ 
+-#endif
+\ Kein Zeilenumbruch am Dateiende.
++#endif