upgpkg: vtunerc-dkms 1.4-4

fix build with 4.16 kernel
remove whitespaces from patches

9 files changed, 106 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e56c67ae15b0..bc058b82b882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Feb  7 17:02:50 UTC 2018
 pkgbase = vtunerc-dkms
 	pkgdesc = VTuner client kernel module for virtual DVB's
 	pkgver = 1.4
-	pkgrel = 3
+	pkgrel = 4
 	url = http://code.google.com/p/vtuner
 	arch = x86_64
 	arch = i686
@@ -21,17 +19,19 @@ pkgbase = vtunerc-dkms
 	source = kernel-4.2.patch
 	source = kernel-4.6.patch
 	source = kernel-4.15.patch
+	source = kernel-4.16.patch
 	source = tweaks.patch
 	source = 93-vtunerc.rules
 	source = dkms.conf
 	sha256sums = c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1
-	sha256sums = 5793c331fd8290a81ac15f7815447fcb880a0b38b562aac24ad171448787057a
-	sha256sums = 5be590ec7c98ef199bd7643712685ffa7474010cc6fc95fd8ca347e92e46d45f
-	sha256sums = fcbaa696db85c888808919b81907a84fc1607fc5b5663c009927d5af322a1085
-	sha256sums = 52c6700a8ccad5e6ee2b25f165dcd167d852ec9448700e00bc62c07303a86ebd
-	sha256sums = bbcebd1e8252d6961733b333731c1d2777d41de7edc0c04ffb2d7b381c046368
+	sha256sums = f32fc67d748606633a20ee4b1b04c0282a37ed77e9692ea6e19bf2203fcc4bf3
+	sha256sums = 29f15d241848b355f4aefc803f34b6da60536da511b5a36535b946c3b7b1c232
+	sha256sums = 8bb5c7b9399f41ab52e0149c23fd8d6604a3998cf68d013967febae90912972c
+	sha256sums = 5bc7c82417b23d5cc321e4c99a30c18e75b291fa5dde25ba788554da791734f5
+	sha256sums = 78e2bec37fa91f7abd999b9d0871bc0c82d39da5e538f0a1b92db547313f5f1e
+	sha256sums = 9d7177aae059e343d772419ed904b287e018077221ade5d16f5b1d825005008a
 	sha256sums = 4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d
-	sha256sums = 2c0087962b08d2f3865c00f5bff1837409d021072a7f81ff77fb7419e6c2c0d8
+	sha256sums = 7f9dfd3402af95f51ed83de0d44b22cd978ec8036db50283a2687ae1f7f2d05d
 
 pkgname = vtunerc-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 127ab2849c00..b59cf40596d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname='vtunerc-dkms'
 pkgdesc="VTuner client kernel module for virtual DVB's"
 pkgver=1.4
-pkgrel=3
+pkgrel=4
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="http://code.google.com/p/vtuner"
 license=('GPL2')
@@ -16,17 +16,19 @@ source=("vtuner.linux-driver-rel${pkgver}.tar.gz::https://github.com/lecotex/vtu
         'kernel-4.2.patch'
         'kernel-4.6.patch'
         'kernel-4.15.patch'
+        'kernel-4.16.patch'
         'tweaks.patch'
         '93-vtunerc.rules'
         'dkms.conf')
 sha256sums=('c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1'
-            '5793c331fd8290a81ac15f7815447fcb880a0b38b562aac24ad171448787057a'
-            '5be590ec7c98ef199bd7643712685ffa7474010cc6fc95fd8ca347e92e46d45f'
-            'fcbaa696db85c888808919b81907a84fc1607fc5b5663c009927d5af322a1085'
-            '52c6700a8ccad5e6ee2b25f165dcd167d852ec9448700e00bc62c07303a86ebd'
-            'bbcebd1e8252d6961733b333731c1d2777d41de7edc0c04ffb2d7b381c046368'
+            'f32fc67d748606633a20ee4b1b04c0282a37ed77e9692ea6e19bf2203fcc4bf3'
+            '29f15d241848b355f4aefc803f34b6da60536da511b5a36535b946c3b7b1c232'
+            '8bb5c7b9399f41ab52e0149c23fd8d6604a3998cf68d013967febae90912972c'
+            '5bc7c82417b23d5cc321e4c99a30c18e75b291fa5dde25ba788554da791734f5'
+            '78e2bec37fa91f7abd999b9d0871bc0c82d39da5e538f0a1b92db547313f5f1e'
+            '9d7177aae059e343d772419ed904b287e018077221ade5d16f5b1d825005008a'
             '4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d'
-            '2c0087962b08d2f3865c00f5bff1837409d021072a7f81ff77fb7419e6c2c0d8')
+            '7f9dfd3402af95f51ed83de0d44b22cd978ec8036db50283a2687ae1f7f2d05d')
 
 package() {
 	install -dm755 ${pkgdir}/usr/src/vtunerc-${pkgver}/patches
diff --git a/dkms.conf b/dkms.conf
index 87077d8e7cd9..86381f26560c 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -19,3 +19,6 @@ PATCH_MATCH[3]="(4\.[6-9](.*)|4\.[0-9][0-9]\.(.*))"
 
 PATCH[4]="kernel-4.15.patch"
 PATCH_MATCH[4]="(4\.1[5-9](.*)|4\.[0-9][0-9]\.(.*))"
+
+PATCH[5]="kernel-4.16.patch"
+PATCH_MATCH[5]="(4\.1[6-9](.*)|4\.[0-9][0-9]\.(.*))"
diff --git a/kernel-3.10.patch b/kernel-3.10.patch
index d9b602e88a3f..5997a806aecb 100644
--- a/kernel-3.10.patch
+++ b/kernel-3.10.patch
@@ -5,13 +5,13 @@
  #include <asm/uaccess.h>
  #include <linux/delay.h>
 +#include <linux/seq_file.h>
- 
+
  #include "demux.h"
  #include "dmxdev.h"
 @@ -176,64 +177,53 @@ static char *get_fe_name(struct dvb_frontend_info *feinfo)
  	return (feinfo && feinfo->name) ? feinfo->name : "(not set)";
  }
- 
+
 -/**
 - * @brief  procfs file handler
 - * @param  buffer:
@@ -78,7 +78,7 @@
 +		seq_printf(seq, "  msg xchg: %d/%d\n", ctx->ctrldev_request.type, ctx->ctrldev_response.type);
 +	return 0;
 +}
- 
+
 -	strcpy(buffer, outbuf);
 +static int vtunerc_proc_open(struct inode *inode, struct file *file)
 +{
@@ -92,7 +92,7 @@
 +		module_put(THIS_MODULE);
 +	return ret;
 +}
- 
+
 -	/* signal EOF */
 -	*eof = 1;
 +static int vtuner_proc_release(struct inode *inode, struct file *file)
@@ -101,7 +101,7 @@
 +	module_put(THIS_MODULE);
 +	return ret;
 +}
- 
+
 -	return blen;
 +static const struct file_operations vtunerc_read_proc_fops = {
 +	.open		= vtunerc_proc_open,
@@ -109,10 +109,10 @@
 +	.llseek		= seq_lseek,
 +	.release	= vtuner_proc_release,
 +	};
- 
+
 -}
  #endif
- 
+
  static char *my_strdup(const char *s)
 @@ -346,8 +336,8 @@ static int __init vtunerc_init(void)
  			sprintf(procfilename, VTUNERC_PROC_FILENAME,
@@ -132,13 +132,13 @@
  #include <linux/kernel.h>	/* We're doing kernel work */
  #include <linux/cdev.h>
 +#include <linux/version.h>
- 
+
  #include "demux.h"
  #include "dmxdev.h"
 @@ -108,4 +109,12 @@ if (ctx->config && (ctx->config->debug))				\
  	printk(KERN_DEBUG "vtunerc%d: " fmt, ctx->idx, ##arg);	\
  } while (0)
- 
+
 +/* backward compatibility stuff */
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
 +static inline void *PDE_DATA(const struct inode *inode)
diff --git a/kernel-4.15.patch b/kernel-4.15.patch
index 68eb788c9cf0..78286d59c5aa 100644
--- a/kernel-4.15.patch
+++ b/kernel-4.15.patch
@@ -16,7 +16,7 @@
 @@ -234,11 +234,6 @@ static int dvb_proxyfe_set_frontend(struct dvb_frontend *fe)
  	return 0;
  }
- 
+
 -static int dvb_proxyfe_get_property(struct dvb_frontend *fe, struct dtv_property* tvp)
 -{
 -	return 0;
@@ -27,7 +27,7 @@
  	return DVBFE_ALGO_SW;
 @@ -478,7 +473,6 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = {
  	.sleep = dvb_proxyfe_sleep,
- 
+
  	.get_frontend = dvb_proxyfe_get_frontend,
 -	.get_property = dvb_proxyfe_get_property,
  	.get_frontend_algo = dvb_proxyfe_get_frontend_algo,
diff --git a/kernel-4.16.patch b/kernel-4.16.patch
new file mode 100644
index 000000000000..55b06c7b350b
--- /dev/null
+++ b/kernel-4.16.patch
@@ -0,0 +1,53 @@
+--- a/vtunerc_main.c
++++ b/vtunerc_main.c
+@@ -24,12 +24,12 @@
+ #include <linux/delay.h>
+ #include <linux/seq_file.h>
+
+-#include "demux.h"
+-#include "dmxdev.h"
+-#include "dvb_demux.h"
+-#include "dvb_frontend.h"
+-#include "dvb_net.h"
+-#include "dvbdev.h"
++#include <media/demux.h>
++#include <media/dmxdev.h>
++#include <media/dvb_demux.h>
++#include <media/dvb_frontend.h>
++#include <media/dvb_net.h>
++#include <media/dvbdev.h>
+
+ #include "vtunerc_priv.h"
+
+--- a/vtunerc_priv.h
++++ b/vtunerc_priv.h
+@@ -22,12 +22,12 @@
+ #include <linux/cdev.h>
+ #include <linux/version.h>
+
+-#include "demux.h"
+-#include "dmxdev.h"
+-#include "dvb_demux.h"
+-#include "dvb_frontend.h"
+-#include "dvb_net.h"
+-#include "dvbdev.h"
++#include <media/demux.h>
++#include <media/dmxdev.h>
++#include <media/dvb_demux.h>
++#include <media/dvb_frontend.h>
++#include <media/dvb_net.h>
++#include <media/dvbdev.h>
+
+ #include "vtuner.h"
+
+--- a/vtunerc_proxyfe.c
++++ b/vtunerc_proxyfe.c
+@@ -19,7 +19,7 @@
+ #include <linux/string.h>
+ #include <linux/slab.h>
+
+-#include "dvb_frontend.h"
++#include <media/dvb_frontend.h>
+
+ #include "vtunerc_priv.h"
+
diff --git a/kernel-4.2.patch b/kernel-4.2.patch
index df398b6fe823..8290b621873b 100644
--- a/kernel-4.2.patch
+++ b/kernel-4.2.patch
@@ -2,8 +2,8 @@
 +++ b/vtunerc_proxyfe.c
 @@ -36,7 +36,7 @@ struct dvb_proxyfe_state {
  };
- 
- 
+
+
 -static int dvb_proxyfe_read_status(struct dvb_frontend *fe, fe_status_t *status)
 +static int dvb_proxyfe_read_status(struct dvb_frontend *fe, enum fe_status *status)
  {
@@ -12,7 +12,7 @@
 @@ -254,7 +254,7 @@ static int dvb_proxyfe_init(struct dvb_frontend *fe)
  	return 0;
  }
- 
+
 -static int dvb_proxyfe_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
 +static int dvb_proxyfe_set_tone(struct dvb_frontend *fe, enum fe_sec_tone_mode tone)
  {
@@ -21,7 +21,7 @@
 @@ -267,7 +267,7 @@ static int dvb_proxyfe_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone
  	return 0;
  }
- 
+
 -static int dvb_proxyfe_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 +static int dvb_proxyfe_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
  {
@@ -30,7 +30,7 @@
 @@ -293,7 +293,7 @@ static int dvb_proxyfe_send_diseqc_msg(struct dvb_frontend *fe, struct dvb_diseq
  	return 0;
  }
- 
+
 -static int dvb_proxyfe_send_diseqc_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t burst)
 +static int dvb_proxyfe_send_diseqc_burst(struct dvb_frontend *fe, enum fe_sec_mini_cmd burst)
  {
diff --git a/kernel-4.6.patch b/kernel-4.6.patch
index a1a63613ad44..de347d087661 100644
--- a/kernel-4.6.patch
+++ b/kernel-4.6.patch
@@ -3,7 +3,7 @@
 @@ -107,9 +107,9 @@ static int dvb_proxyfe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
  	return 0;
  }
- 
+
 -static int dvb_proxyfe_get_frontend(struct dvb_frontend *fe)
 +static int dvb_proxyfe_get_frontend(struct dvb_frontend *fe,
 +					struct dtv_frontend_properties *c)
diff --git a/tweaks.patch b/tweaks.patch
index 5530503563e8..23ebd7e3a7f9 100644
--- a/tweaks.patch
+++ b/tweaks.patch
@@ -8,18 +8,18 @@
 +	dprintk(ctx, "XCH_MSG: %d: entered\n", msg->type);
  	if (down_interruptible(&ctx->xchange_sem))
  		return -ERESTARTSYS;
- 
+
 @@ -413,7 +413,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx,
  		up(&ctx->xchange_sem);
  		return 0;
  	}
 -	//dprintk(ctx, "XCH_MSG: %d: continue\n", msg->type);
 +	dprintk(ctx, "XCH_MSG: %d: continue\n", msg->type);
- 
+
  #if 0
  	BUG_ON(ctx->ctrldev_request.type != -1);
 @@ -433,7 +433,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx,
- 
+
  	if (wait_event_interruptible(ctx->ctrldev_wait_response_wq,
  				ctx->ctrldev_response.type != -1)) {
 -		//dprintk(ctx, "XCH_MSG: %d: wait_event interrupted\n", msg->type);
@@ -28,51 +28,51 @@
  		up(&ctx->xchange_sem);
  		return -ERESTARTSYS;
 @@ -441,7 +441,7 @@ int vtunerc_ctrldev_xchange_message(struct vtunerc_ctx *ctx,
- 
+
  	BUG_ON(ctx->ctrldev_response.type == -1);
- 
+
 -	//dprintk(ctx, "XCH_MSG: %d -> %d (DONE)\n", msg->type, ctx->ctrldev_response.type);
 +	dprintk(ctx, "XCH_MSG: %d -> %d (DONE)\n", msg->type, ctx->ctrldev_response.type);
  	memcpy(msg, &ctx->ctrldev_response, sizeof(struct vtuner_message));
  	ctx->ctrldev_response.type = -1;
- 
+
 --- a/vtunerc_main.c
 +++ b/vtunerc_main.c
 @@ -102,9 +102,9 @@ static void pidtab_copy_to_msg(struct vtunerc_ctx *ctx,
  {
  	int i;
- 
+
 -	for (i = 0; i < (MAX_PIDTAB_LEN - 1); i++)
 +	for (i = 0; i < MAX_PIDTAB_LEN ; i++)
  		msg->body.pidlist[i] = ctx->pidtab[i]; /*TODO: optimize it*/
 -	msg->body.pidlist[MAX_PIDTAB_LEN - 1] = 0;
 +	/* msg->body.pidlist[MAX_PIDTAB_LEN - 1] = 0; */
  }
- 
+
  static int vtunerc_start_feed(struct dvb_demux_feed *feed)
 @@ -128,8 +128,12 @@ static int vtunerc_start_feed(struct dvb_demux_feed *feed)
  		return -EINVAL;
  	}
- 
+
 -	/* organize PID list table */
 +	if (feed->pid >= 0x2000 ) {
 +	  printk(KERN_ERR "vtunerc%d: full mux not supported\n",ctx->idx);
 +	  return -EINVAL;
 +	}
- 
+
 +	/* organize PID list table */
  	if (pidtab_find_index(ctx->pidtab, feed->pid) < 0) {
  		pidtab_add_pid(ctx->pidtab, feed->pid);
- 
+
 --- a/vtunerc_proxyfe.c
 +++ b/vtunerc_proxyfe.c
 @@ -174,52 +174,12 @@ static int dvb_proxyfe_set_frontend(struct dvb_frontend *fe)
- 
+
  		if (ctx->vtype == VT_S2 && c->delivery_system == SYS_DVBS2) {
  			/* DELIVERY SYSTEM: S2 delsys in use */
 -			msg.body.fe_params.u.qpsk.fec_inner = 9;
 +			msg.body.fe_params.u.qpsk.fec_inner |= 32;
- 
+
  			/* MODULATION */
  			if (c->modulation == PSK_8)
 -				/* signal PSK_8 modulation used */
@@ -119,7 +119,7 @@
 -			}
 +			  /* signal PSK_8 modulation used */
 +			  msg.body.fe_params.u.qpsk.fec_inner |= 64;
- 
+
  			/* ROLLOFF */
  			switch (c->rolloff) {
 @@ -506,10 +466,10 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = {
@@ -135,5 +135,5 @@
 +				FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 |
 +				FE_CAN_QPSK | FE_CAN_RECOVER
  	},
- 
+
  	.release = dvb_proxyfe_release,