Fix compilation with kernel 4.6.x

4 files changed, 28 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c18b77a31df..8b4ae8c48666 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Wed Jun 22 12:32:58 UTC 2016
 pkgbase = dvb-usb-rtl2832u-openpli
 	pkgdesc = Linux module for the RTL2832U DVB-T USB2.0 device
 	pkgver = 20130918
@@ -14,10 +16,12 @@ pkgbase = dvb-usb-rtl2832u-openpli
 	source = Makefile
 	source = dvb-usb-rtl28xxu.conf
 	source = linux42.patch
+	source = rtl2832-get-parameters.patch
 	md5sums = 263f5060ff7ef969ecaad1494700230a
 	md5sums = b91ef30d49fc0e7d8e76b39c98cf3ff6
 	md5sums = 063be4e255e010899574fc3cdec67120
 	md5sums = bc75fc1f5a9030d6545c66642612ef3d
+	md5sums = 4e5b15eee3f6206a415fb441f799d566
 
 pkgname = dvb-usb-rtl2832u-openpli
 
diff --git a/PKGBUILD b/PKGBUILD
index 914cedd25151..15cb4a15766c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,11 +17,13 @@ provides=('dvb-usb-rtl2832u')
 source=('dvb-usb-rtl2832u.patch::https://github.com/Xtrend-Official/meta-xtrend/raw/master/recipes-bsp/linux/linux-etxx00/dvb-usb-rtl2832.patch'
         'Makefile'
         'dvb-usb-rtl28xxu.conf'
-        'linux42.patch')
+        'linux42.patch'
+        'rtl2832-get-parameters.patch')
 md5sums=('263f5060ff7ef969ecaad1494700230a'
          'b91ef30d49fc0e7d8e76b39c98cf3ff6'
          '063be4e255e010899574fc3cdec67120'
-         'bc75fc1f5a9030d6545c66642612ef3d')
+         'bc75fc1f5a9030d6545c66642612ef3d'
+         '4e5b15eee3f6206a415fb441f799d566')
 PKGEXT='.pkg.tar'
 
 _extramodules="extramodules-$(uname -r | cut -f-2 -d.)-$(uname -r | cut -f3- -d-)"
@@ -42,6 +44,7 @@ build() {
 
   ## Patches go here ##
   patch -p1 < "$srcdir/linux42.patch"
+  patch -p1 < "$srcdir/rtl2832-get-parameters.patch"
 
   # Build module
   export KBUILD_SRC="/usr/lib/modules/${_kernver}/build"
diff --git a/dvb-usb-rtl2832u-openpli.install b/dvb-usb-rtl2832u-openpli.install
index 1834b5e36145..2a2939b11895 100644
--- a/dvb-usb-rtl2832u-openpli.install
+++ b/dvb-usb-rtl2832u-openpli.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.0-ARCH'
+    EXTRAMODULES='extramodules-4.6-ARCH'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/rtl2832-get-parameters.patch b/rtl2832-get-parameters.patch
new file mode 100644
index 000000000000..f73310c489be
--- /dev/null
+++ b/rtl2832-get-parameters.patch
@@ -0,0 +1,18 @@
+diff -ur a/rtl2832u_fe.c b/rtl2832u_fe.c
+--- a/rtl2832u_fe.c	2016-06-22 12:58:24.918063020 +0100
++++ b/rtl2832u_fe.c	2016-06-22 13:10:09.319010799 +0100
+@@ -2117,8 +2117,14 @@
+ }
+ 
+ static int 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)
+ rtl2832_get_parameters(
+ 	struct dvb_frontend*	fe)
++#else
++rtl2832_get_parameters(
++    struct dvb_frontend*    fe,
++    struct dtv_frontend_properties *props)
++#endif
+ {
+ 	struct dtv_frontend_properties	*param = &fe->dtv_property_cache;
+ 	struct rtl2832_state* p_state = fe->demodulator_priv;