upgpkg: vtunerc-dkms 1.4-6

* fix build with 4.19 kernel
* fix backtrace on module load
* add urls of relevant changes in upstream kernel in paches description

11 files changed, 135 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cbb508da03e..0280a0f13dc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vtunerc-dkms
 	pkgdesc = Kernel module to create virtual DVB devices
 	pkgver = 1.4
-	pkgrel = 5
+	pkgrel = 6
 	url = http://code.google.com/p/vtuner
 	arch = x86_64
 	arch = i686
@@ -20,18 +20,22 @@ pkgbase = vtunerc-dkms
 	source = kernel-4.6.patch
 	source = kernel-4.15.patch
 	source = kernel-4.16.patch
+	source = kernel-4.19.patch
+	source = replace-Z-with-z.patch
 	source = tweaks.patch
 	source = 93-vtunerc.rules
 	source = dkms.conf
 	sha256sums = c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1
-	sha256sums = f32fc67d748606633a20ee4b1b04c0282a37ed77e9692ea6e19bf2203fcc4bf3
-	sha256sums = 29f15d241848b355f4aefc803f34b6da60536da511b5a36535b946c3b7b1c232
-	sha256sums = 8bb5c7b9399f41ab52e0149c23fd8d6604a3998cf68d013967febae90912972c
-	sha256sums = 5bc7c82417b23d5cc321e4c99a30c18e75b291fa5dde25ba788554da791734f5
-	sha256sums = 78e2bec37fa91f7abd999b9d0871bc0c82d39da5e538f0a1b92db547313f5f1e
-	sha256sums = 9d7177aae059e343d772419ed904b287e018077221ade5d16f5b1d825005008a
+	sha256sums = 3da500773c6cc2f07a636d0a9f20cd1ac5106ddcd684f80ccd714ee26f7e7498
+	sha256sums = e66d690f3cddab61a8a3e6172caefb0877aa240225af4683bcc433718cece242
+	sha256sums = 1f1318695d96ab9a1b217b83654293c78ee8c86be957f09e8180359b73736a61
+	sha256sums = ae701414fee3c96fc8a2a5f705c534d4933485e6b28fab94d912f63395d184b7
+	sha256sums = 2e8a410409bba057d61ae8b1005a13cb1f359caa562b846e37b5db0448d62395
+	sha256sums = c7bc232a5743a0fc4e80f9f72c6e27c2d82444cc307b1835873f63ae10c7efae
+	sha256sums = 64cfd76c471ab3634711bc2e30dee90ae6498815b970014fe68adcbd50ad3741
+	sha256sums = 723631658d0a630538f5ab4f87afd69b551a636a31ddb05e6ab13c0a9e5244a1
 	sha256sums = 4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d
-	sha256sums = 47dfa9682b77b136bc72ecf45548ac93bf4dc50e2eaa94441d1401c1bef759a4
+	sha256sums = 28c89348064d7a2bea96dcdf44339a93b4d3f6fbf868e0b8dc163aca4ff8525c
 
 pkgname = vtunerc-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 4e1b38cc651a..2656aa3db731 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname='vtunerc-dkms'
 pkgdesc='Kernel module to create virtual DVB devices'
 pkgver=1.4
-pkgrel=5
+pkgrel=6
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='http://code.google.com/p/vtuner'
 license=('GPL2')
@@ -17,18 +17,22 @@ source=("vtuner.linux-driver-rel${pkgver}.tar.gz::https://github.com/lecotex/vtu
         'kernel-4.6.patch'
         'kernel-4.15.patch'
         'kernel-4.16.patch'
+        'kernel-4.19.patch'
+        'replace-Z-with-z.patch'
         'tweaks.patch'
         '93-vtunerc.rules'
         'dkms.conf')
 sha256sums=('c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1'
-            'f32fc67d748606633a20ee4b1b04c0282a37ed77e9692ea6e19bf2203fcc4bf3'
-            '29f15d241848b355f4aefc803f34b6da60536da511b5a36535b946c3b7b1c232'
-            '8bb5c7b9399f41ab52e0149c23fd8d6604a3998cf68d013967febae90912972c'
-            '5bc7c82417b23d5cc321e4c99a30c18e75b291fa5dde25ba788554da791734f5'
-            '78e2bec37fa91f7abd999b9d0871bc0c82d39da5e538f0a1b92db547313f5f1e'
-            '9d7177aae059e343d772419ed904b287e018077221ade5d16f5b1d825005008a'
+            '3da500773c6cc2f07a636d0a9f20cd1ac5106ddcd684f80ccd714ee26f7e7498'
+            'e66d690f3cddab61a8a3e6172caefb0877aa240225af4683bcc433718cece242'
+            '1f1318695d96ab9a1b217b83654293c78ee8c86be957f09e8180359b73736a61'
+            'ae701414fee3c96fc8a2a5f705c534d4933485e6b28fab94d912f63395d184b7'
+            '2e8a410409bba057d61ae8b1005a13cb1f359caa562b846e37b5db0448d62395'
+            'c7bc232a5743a0fc4e80f9f72c6e27c2d82444cc307b1835873f63ae10c7efae'
+            '64cfd76c471ab3634711bc2e30dee90ae6498815b970014fe68adcbd50ad3741'
+            '723631658d0a630538f5ab4f87afd69b551a636a31ddb05e6ab13c0a9e5244a1'
             '4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d'
-            '47dfa9682b77b136bc72ecf45548ac93bf4dc50e2eaa94441d1401c1bef759a4')
+            '28c89348064d7a2bea96dcdf44339a93b4d3f6fbf868e0b8dc163aca4ff8525c')
 
 package() {
 	install -dm755 ${pkgdir}/usr/src/vtunerc-${pkgver}/patches
diff --git a/dkms.conf b/dkms.conf
index 203ae6b09cd5..b6073df7f29a 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -3,22 +3,27 @@ PACKAGE_VERSION="1.4"
 AUTOINSTALL="yes"
 
 BUILT_MODULE_NAME[0]="vtunerc"
-MAKE[0]="make KDIR=/usr/lib/modules/$kernelver/build VTUNERC_MAX_ADAPTERS=8"
+MAKE[0]="make KDIR=/usr/lib/modules/$kernelver/build VTUNERC_MAX_ADAPTERS=16"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/media"
 
-PATCH[0]="tweaks.patch"
+PATCH[0]="replace-Z-with-z.patch"
 
-PATCH[1]="kernel-3.10.patch"
-PATCH_MATCH[1]="(3\.1[0-9]\.(.*)|4.*)"
+PATCH[1]="tweaks.patch"
 
-PATCH[2]="kernel-4.2.patch"
-PATCH_MATCH[2]="(4\.[2-9](.*)|4\.[0-9][0-9]\.(.*))"
+PATCH[2]="kernel-3.10.patch"
+PATCH_MATCH[2]="(3\.1[0-9]\.(.*)|4.*)"
 
-PATCH[3]="kernel-4.6.patch"
-PATCH_MATCH[3]="(4\.[6-9](.*)|4\.[0-9][0-9]\.(.*))"
+PATCH[3]="kernel-4.2.patch"
+PATCH_MATCH[3]="(4\.[2-9](.*)|4\.[0-9][0-9]\.(.*))"
 
-PATCH[4]="kernel-4.15.patch"
-PATCH_MATCH[4]="(4\.1[5-9](.*)|4\.[2-9][0-9]\.(.*))"
+PATCH[4]="kernel-4.6.patch"
+PATCH_MATCH[4]="(4\.[6-9](.*)|4\.[0-9][0-9]\.(.*))"
 
-PATCH[5]="kernel-4.16.patch"
-PATCH_MATCH[5]="(4\.1[6-9](.*)|4\.[2-9][0-9]\.(.*))"
+PATCH[5]="kernel-4.15.patch"
+PATCH_MATCH[5]="(4\.1[5-9](.*)|4\.[2-9][0-9]\.(.*))"
+
+PATCH[6]="kernel-4.16.patch"
+PATCH_MATCH[6]="(4\.1[6-9](.*)|4\.[2-9][0-9]\.(.*))"
+
+PATCH[7]="kernel-4.19.patch"
+PATCH_MATCH[7]="(4\.19(.*)|4\.[2-9][0-9]\.(.*))"
diff --git a/kernel-3.10.patch b/kernel-3.10.patch
index 5997a806aecb..cfbe3e52b135 100644
--- a/kernel-3.10.patch
+++ b/kernel-3.10.patch
@@ -1,3 +1,5 @@
+https://lore.kernel.org/patchwork/cover/372524
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3cb5bf1bf947d325fcf6e9458952b51cfd7e6677
 --- a/vtunerc_main.c
 +++ b/vtunerc_main.c
 @@ -22,6 +22,7 @@
diff --git a/kernel-4.15.patch b/kernel-4.15.patch
index 78286d59c5aa..d4e14d5f2d7d 100644
--- a/kernel-4.15.patch
+++ b/kernel-4.15.patch
@@ -1,3 +1,4 @@
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0463625ee9e7b7c786460b6c20073e8c8e283466
 --- a/vtunerc_main.c
 +++ b/vtunerc_main.c
 @@ -119,10 +119,6 @@ static int vtunerc_start_feed(struct dvb_demux_feed *feed)
@@ -32,4 +33,4 @@
 -	.get_property = dvb_proxyfe_get_property,
  	.get_frontend_algo = dvb_proxyfe_get_frontend_algo,
  	.set_frontend = dvb_proxyfe_set_frontend,
- 
+
diff --git a/kernel-4.16.patch b/kernel-4.16.patch
index 55b06c7b350b..61de52569d51 100644
--- a/kernel-4.16.patch
+++ b/kernel-4.16.patch
@@ -1,3 +1,4 @@
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fada1935590f66dc6784981e0d557ca09013c847
 --- a/vtunerc_main.c
 +++ b/vtunerc_main.c
 @@ -24,12 +24,12 @@
diff --git a/kernel-4.19.patch b/kernel-4.19.patch
new file mode 100644
index 000000000000..3524e6688e1b
--- /dev/null
+++ b/kernel-4.19.patch
@@ -0,0 +1,47 @@
+https://www.spinics.net/lists/linux-media/msg137367.html
+--- a/vtunerc_proxyfe.c
++++ b/vtunerc_proxyfe.c
+@@ -392,10 +392,9 @@ static struct dvb_frontend_ops dvb_proxyfe_ofdm_ops = {
+ 	.delsys = { SYS_DVBT },
+ 	.info = {
+ 		.name			= "vTuner proxyFE DVB-T",
+-		.type			= FE_OFDM,
+-		.frequency_min		= 51000000,
+-		.frequency_max		= 863250000,
+-		.frequency_stepsize	= 62500,
++		.frequency_min_hz	=     51 * MHz,
++		.frequency_max_hz	= 863250 * kHz,
++		.frequency_stepsize_hz	= 62500,
+ 		.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ 				FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+ 				FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+@@ -424,10 +423,9 @@ static struct dvb_frontend_ops dvb_proxyfe_qam_ops = {
+ 	.delsys = { SYS_DVBC_ANNEX_A },
+ 	.info = {
+ 		.name			= "vTuner proxyFE DVB-C",
+-		.type			= FE_QAM,
+-		.frequency_stepsize	= 62500,
+-		.frequency_min		= 51000000,
+-		.frequency_max		= 858000000,
++		.frequency_stepsize_hz	= 62500,
++		.frequency_min_hz	=  51 * MHz,
++		.frequency_max_hz	= 858 * MHz,
+ 		.symbol_rate_min	= (57840000/2)/64,     /* SACLK/64 == (XIN/2)/64 */
+ 		.symbol_rate_max	= (57840000/2)/4,      /* SACLK/4 */
+ 		.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |
+@@ -454,11 +452,10 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = {
+ 	.delsys = { SYS_DVBS },
+ 	.info = {
+ 		.name			= "vTuner proxyFE DVB-S",
+-		.type			= FE_QPSK,
+-		.frequency_min		= 950000,
+-		.frequency_max		= 2150000,
+-		.frequency_stepsize	= 250,           /* kHz for QPSK frontends */
+-		.frequency_tolerance	= 29500,
++		.frequency_min_hz	=  950 * MHz,
++		.frequency_max_hz	= 2150 * MHz,
++		.frequency_stepsize_hz	= 250 * kHz,           /* kHz for QPSK frontends */
++		.frequency_tolerance_hz	= 29500 * kHz,
+ 		.symbol_rate_min	= 1000000,
+ 		.symbol_rate_max	= 45000000,
+ 		.caps = FE_CAN_INVERSION_AUTO |
diff --git a/kernel-4.2.patch b/kernel-4.2.patch
index 8290b621873b..2ff590155dff 100644
--- a/kernel-4.2.patch
+++ b/kernel-4.2.patch
@@ -1,3 +1,4 @@
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0df289a209e02f0926042ab07d7d2595ea2d2e9b
 --- a/vtunerc_proxyfe.c
 +++ b/vtunerc_proxyfe.c
 @@ -36,7 +36,7 @@ struct dvb_proxyfe_state {
diff --git a/kernel-4.6.patch b/kernel-4.6.patch
index de347d087661..d4170834b1e2 100644
--- a/kernel-4.6.patch
+++ b/kernel-4.6.patch
@@ -1,3 +1,5 @@
+https://www.spinics.net/lists/linux-media/msg97066.html
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bb31d2381c730485be00a7da44c45416e9781709
 --- a/vtunerc_proxyfe.c
 +++ b/vtunerc_proxyfe.c
 @@ -107,9 +107,9 @@ static int dvb_proxyfe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
diff --git a/replace-Z-with-z.patch b/replace-Z-with-z.patch
new file mode 100644
index 000000000000..7c6d10f6237c
--- /dev/null
+++ b/replace-Z-with-z.patch
@@ -0,0 +1,29 @@
+According to kernel trace and printf.3, Z shouldn't be used and is
+synonym to z. So replace accordingly.
+--- a/vtunerc_ctrldev.c
++++ b/vtunerc_ctrldev.c
+@@ -59,11 +59,11 @@ static ssize_t vtunerc_ctrldev_write(struct file *filp, const char *buff,
+ 		// allocate a bigger buffer
+ 		ctx->kernel_buf = kmalloc(len, GFP_KERNEL);
+ 		if (!ctx->kernel_buf) {
+-			printk(KERN_ERR "vtunerc%d: unable to allocate buffer of %Zu bytes\n", ctx->idx, len);
++			printk(KERN_ERR "vtunerc%d: unable to allocate buffer of %zu bytes\n", ctx->idx, len);
+ 			return -ENOMEM;
+ 		}
+ 		ctx->kernel_buf_size = len;
+-		printk(KERN_INFO "vtunerc%d: allocated buffer of %Zu bytes\n", ctx->idx, len);
++		printk(KERN_INFO "vtunerc%d: allocated buffer of %zu bytes\n", ctx->idx, len);
+ 	}
+
+ 	if (down_interruptible(&ctx->tswrite_sem)) {
+--- a/vtunerc_main.c
++++ b/vtunerc_main.c
+@@ -406,7 +406,7 @@ static void __exit vtunerc_exit(void)
+ 		// free allocated buffer
+ 		if(ctx->kernel_buf != NULL) {
+ 			kfree(ctx->kernel_buf);
+-			printk(KERN_INFO "vtunerc%d: deallocated buffer of %Zu bytes\n", idx, ctx->kernel_buf_size);
++			printk(KERN_INFO "vtunerc%d: deallocated buffer of %zu bytes\n", idx, ctx->kernel_buf_size);
+ 			ctx->kernel_buf = NULL;
+ 			ctx->kernel_buf_size = 0;
+
diff --git a/tweaks.patch b/tweaks.patch
index 23ebd7e3a7f9..88b53fa35251 100644
--- a/tweaks.patch
+++ b/tweaks.patch
@@ -1,3 +1,4 @@
+Few tweaks from https://code.google.com/p/satip
 --- a/vtunerc_ctrldev.c
 +++ b/vtunerc_ctrldev.c
 @@ -404,7 +404,7 @@ void vtunerc_unregister_ctrldev(struct vtunerc_config *config)
@@ -56,8 +57,8 @@
 
 -	/* organize PID list table */
 +	if (feed->pid >= 0x2000 ) {
-+	  printk(KERN_ERR "vtunerc%d: full mux not supported\n",ctx->idx);
-+	  return -EINVAL;
++		printk(KERN_ERR "vtunerc%d: full mux not supported\n",ctx->idx);
++		return -EINVAL;
 +	}
 
 +	/* organize PID list table */
@@ -75,7 +76,7 @@
 
  			/* MODULATION */
  			if (c->modulation == PSK_8)
--				/* signal PSK_8 modulation used */
+ 				/* signal PSK_8 modulation used */
 -				msg.body.fe_params.u.qpsk.fec_inner += 9;
 -
 -			/* FEC */
@@ -117,23 +118,18 @@
 -				; /*FIXME: what now? */
 -				break;
 -			}
-+			  /* signal PSK_8 modulation used */
-+			  msg.body.fe_params.u.qpsk.fec_inner |= 64;
++				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 = {
- 		.frequency_tolerance	= 29500,
- 		.symbol_rate_min	= 1000000,
+@@ -508,8 +468,8 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = {
  		.symbol_rate_max	= 45000000,
--		.caps = FE_CAN_INVERSION_AUTO |
--			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ 		.caps = FE_CAN_INVERSION_AUTO |
+ 			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
 -			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
 -			FE_CAN_QPSK
-+		.caps = FE_CAN_INVERSION_AUTO | FE_CAN_FEC_1_2 |
-+				FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | FE_CAN_FEC_4_5 |
-+				FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 |
-+				FE_CAN_QPSK | FE_CAN_RECOVER
++			FE_CAN_FEC_4_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,