From 40fd5c4ff4157da449ce4180f48ad919fb449804 Mon Sep 17 00:00:00 2001 From: Zabrimus Date: Fri, 19 Jul 2024 20:32:22 +0200 Subject: [PATCH] fix vtuner_ng patch for kernel 4.9 --- .../patches/vtuner-ng-4.9.patch.optional | 63 ++++++------------- 1 file changed, 19 insertions(+), 44 deletions(-) diff --git a/packages/tools/_vtuner-ng/patches/vtuner-ng-4.9.patch.optional b/packages/tools/_vtuner-ng/patches/vtuner-ng-4.9.patch.optional index 4bf0268d..6fb0322a 100644 --- a/packages/tools/_vtuner-ng/patches/vtuner-ng-4.9.patch.optional +++ b/packages/tools/_vtuner-ng/patches/vtuner-ng-4.9.patch.optional @@ -1,6 +1,6 @@ -diff -ru8bBw a/kernel/Makefile b/kernel/Makefile ---- a/kernel/Makefile 2024-05-22 13:12:34.000000000 +0200 -+++ b/kernel/Makefile 2024-05-22 17:57:39.269687334 +0200 +diff -ru8bBwd a/kernel/Makefile b/kernel/Makefile +--- a/kernel/Makefile 2024-07-19 06:28:04.000000000 +0200 ++++ b/kernel/Makefile 2024-07-19 20:21:01.657494718 +0200 @@ -18,21 +18,20 @@ # for external compilation @@ -24,9 +24,9 @@ diff -ru8bBw a/kernel/Makefile b/kernel/Makefile rm -f *.mod.c rm -f *.mod rm -f .*.cmd -diff -ru8bBw a/kernel/vtunerc_ctrldev.c b/kernel/vtunerc_ctrldev.c ---- a/kernel/vtunerc_ctrldev.c 2024-05-22 13:12:34.000000000 +0200 -+++ b/kernel/vtunerc_ctrldev.c 2024-05-22 17:58:34.853369086 +0200 +diff -ru8bBwd a/kernel/vtunerc_ctrldev.c b/kernel/vtunerc_ctrldev.c +--- a/kernel/vtunerc_ctrldev.c 2024-07-19 06:28:04.000000000 +0200 ++++ b/kernel/vtunerc_ctrldev.c 2024-07-19 20:21:01.657494718 +0200 @@ -19,17 +19,29 @@ #include #include @@ -58,16 +58,16 @@ diff -ru8bBw a/kernel/vtunerc_ctrldev.c b/kernel/vtunerc_ctrldev.c #define KERNEL_DELSYS_LEN (sizeof(((struct dvb_frontend_ops *)0)->delsys)) static ssize_t vtunerc_ctrldev_write(struct file *filp, const char *buff, size_t len, loff_t *off) -diff -ru8bBw a/kernel/vtunerc_main.c b/kernel/vtunerc_main.c ---- a/kernel/vtunerc_main.c 2024-05-22 13:12:34.000000000 +0200 -+++ b/kernel/vtunerc_main.c 2024-05-22 17:57:39.269687334 +0200 -@@ -20,22 +20,22 @@ - #include +diff -ru8bBwd a/kernel/vtunerc_main.c b/kernel/vtunerc_main.c +--- a/kernel/vtunerc_main.c 2024-07-19 06:28:04.000000000 +0200 ++++ b/kernel/vtunerc_main.c 2024-07-19 20:28:19.388165031 +0200 +@@ -21,22 +21,22 @@ #include #include #include #include #include + #include #include "vtunerc_priv.h" -#include @@ -90,7 +90,7 @@ diff -ru8bBw a/kernel/vtunerc_main.c b/kernel/vtunerc_main.c #define DRIVER_NAME "vTuner proxy" #define VTUNERC_PROC_FILENAME "vtunerc%i" -@@ -106,17 +106,17 @@ +@@ -107,17 +107,17 @@ // stop running section feed entry->feed.sec.is_filtering = 0; entry->feed.sec.secbuf = entry->feed.sec.secbuf_base; @@ -109,9 +109,9 @@ diff -ru8bBw a/kernel/vtunerc_main.c b/kernel/vtunerc_main.c // add standard pids x=0; -diff -ru8bBw a/kernel/vtunerc_priv.h b/kernel/vtunerc_priv.h ---- a/kernel/vtunerc_priv.h 2024-05-22 13:12:34.000000000 +0200 -+++ b/kernel/vtunerc_priv.h 2024-05-22 17:57:39.269687334 +0200 +diff -ru8bBwd a/kernel/vtunerc_priv.h b/kernel/vtunerc_priv.h +--- a/kernel/vtunerc_priv.h 2024-07-19 06:28:04.000000000 +0200 ++++ b/kernel/vtunerc_priv.h 2024-07-19 20:21:01.657494718 +0200 @@ -18,28 +18,24 @@ #define _VTUNERC_PRIV_H @@ -147,9 +147,9 @@ diff -ru8bBw a/kernel/vtunerc_priv.h b/kernel/vtunerc_priv.h int debug; int timeout; int devices; -diff -ru8bBw a/kernel/vtunerc_proxyfe.c b/kernel/vtunerc_proxyfe.c ---- a/kernel/vtunerc_proxyfe.c 2024-05-22 13:12:34.000000000 +0200 -+++ b/kernel/vtunerc_proxyfe.c 2024-05-22 17:57:39.269687334 +0200 +diff -ru8bBwd a/kernel/vtunerc_proxyfe.c b/kernel/vtunerc_proxyfe.c +--- a/kernel/vtunerc_proxyfe.c 2024-07-19 06:28:04.000000000 +0200 ++++ b/kernel/vtunerc_proxyfe.c 2024-07-19 20:21:01.661494152 +0200 @@ -16,17 +16,25 @@ #include @@ -177,32 +177,7 @@ diff -ru8bBw a/kernel/vtunerc_proxyfe.c b/kernel/vtunerc_proxyfe.c #error ======================================================================== #endif -@@ -319,20 +327,20 @@ - - return fe; - } - - void dvb_proxyfe_clear_delsys_info(struct dvb_frontend *fe) - { - memset(&fe->ops.delsys,0,sizeof(u8)*MAX_DELSYS); - fe->ops.delsys[0] = SYS_TURBO; -- fe->ops.info.frequency_min_hz = 1 * MHz; -- fe->ops.info.frequency_max_hz = 2 * MHz; -- fe->ops.info.frequency_stepsize_hz = 0; -- fe->ops.info.frequency_tolerance_hz = 0; -+ fe->ops.info.frequency_min = 1 * MHz; -+ fe->ops.info.frequency_max = 2 * MHz; -+ fe->ops.info.frequency_stepsize = 0; -+ fe->ops.info.frequency_tolerance = 0; - fe->ops.info.symbol_rate_min = 0; - fe->ops.info.symbol_rate_max = 0; - - fe->ops.info.caps = 0; - } - - void dvb_proxyfe_set_delsys_info(struct dvb_frontend *fe) - { -@@ -340,44 +348,44 @@ +@@ -331,44 +339,44 @@ fe->ops.delsys[0] = SYS_DVBT; fe->ops.delsys[1] = SYS_DVBT2; fe->ops.delsys[2] = SYS_DVBC_ANNEX_A;