diff options
author | Tomasz Maciej Nowak | 2022-05-13 17:13:22 +0200 |
---|---|---|
committer | Tomasz Maciej Nowak | 2022-05-13 17:13:22 +0200 |
commit | 308b50ac18f4a3a16b419235744d4f7c4396dae9 (patch) | |
tree | 9c17194d1427f788138dcfb89cee52f1f8720a75 | |
parent | 8f6a6668d31638a2d8b35ce66864d2166ec24e84 (diff) | |
download | aur-308b50ac18f4a3a16b419235744d4f7c4396dae9.tar.gz |
upgpkg: vtunerc-dkms 1.4-12
Add kernel 5.17 compat and use git to manage patches
-rw-r--r-- | .SRCINFO | 53 | ||||
-rw-r--r-- | 0001-Replace-make-old-syntax.patch | 26 | ||||
-rw-r--r-- | 0002-Replace-Z-with-z.patch (renamed from replace-Z-with-z.patch) | 19 | ||||
-rw-r--r-- | 0003-Tweaks.patch (renamed from tweaks.patch) | 52 | ||||
-rw-r--r-- | 0004-Fix-Waddress-warning.patch | 25 | ||||
-rw-r--r-- | 0005-Kernel-3.10.patch (renamed from kernel-3.10.patch) | 52 | ||||
-rw-r--r-- | 0006-Kernel-4.2.patch (renamed from kernel-4.2.patch) | 24 | ||||
-rw-r--r-- | 0007-Kernel-4.6.patch (renamed from kernel-4.6.patch) | 19 | ||||
-rw-r--r-- | 0008-Kernel-4.15.patch (renamed from kernel-4.15.patch) | 21 | ||||
-rw-r--r-- | 0009-Kernel-4.16.patch (renamed from kernel-4.16.patch) | 40 | ||||
-rw-r--r-- | 0010-Kernel-4.19.patch (renamed from kernel-4.19.patch) | 16 | ||||
-rw-r--r-- | 0011-Kernel-5.3.patch (renamed from kernel-5.3.patch) | 14 | ||||
-rw-r--r-- | 0012-Kernel-5.6.patch (renamed from kernel-5.6.patch) | 14 | ||||
-rw-r--r-- | 0013-Kernel-5.17.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 52 | ||||
-rw-r--r-- | dkms.conf | 44 | ||||
-rw-r--r-- | kernel-5.4.patch | 12 |
17 files changed, 359 insertions, 150 deletions
@@ -1,7 +1,7 @@ pkgbase = vtunerc-dkms pkgdesc = Kernel module to create virtual DVB devices pkgver = 1.4 - pkgrel = 11 + pkgrel = 12 url = http://code.google.com/p/vtuner arch = x86_64 arch = i686 @@ -15,33 +15,36 @@ pkgbase = vtunerc-dkms conflicts = vtuner-module conflicts = vtuner-module-lts source = vtuner.linux-driver-rel1.4.tar.gz::https://github.com/lecotex/vtuner.linux-driver/archive/rel1.4.tar.gz - source = kernel-3.10.patch - source = kernel-4.2.patch - source = kernel-4.6.patch - source = kernel-4.15.patch - source = kernel-4.16.patch - source = kernel-4.19.patch - source = kernel-5.3.patch - source = kernel-5.4.patch - source = kernel-5.6.patch - source = replace-Z-with-z.patch - source = tweaks.patch + source = 0001-Replace-make-old-syntax.patch + source = 0002-Replace-Z-with-z.patch + source = 0003-Tweaks.patch + source = 0004-Fix-Waddress-warning.patch + source = 0005-Kernel-3.10.patch + source = 0006-Kernel-4.2.patch + source = 0007-Kernel-4.6.patch + source = 0008-Kernel-4.15.patch + source = 0009-Kernel-4.16.patch + source = 0010-Kernel-4.19.patch + source = 0011-Kernel-5.3.patch + source = 0012-Kernel-5.6.patch + source = 0013-Kernel-5.17.patch source = 93-vtunerc.rules source = dkms.conf sha256sums = c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1 - sha256sums = 3da500773c6cc2f07a636d0a9f20cd1ac5106ddcd684f80ccd714ee26f7e7498 - sha256sums = e66d690f3cddab61a8a3e6172caefb0877aa240225af4683bcc433718cece242 - sha256sums = 1f1318695d96ab9a1b217b83654293c78ee8c86be957f09e8180359b73736a61 - sha256sums = ae701414fee3c96fc8a2a5f705c534d4933485e6b28fab94d912f63395d184b7 - sha256sums = 2e8a410409bba057d61ae8b1005a13cb1f359caa562b846e37b5db0448d62395 - sha256sums = c7bc232a5743a0fc4e80f9f72c6e27c2d82444cc307b1835873f63ae10c7efae - sha256sums = 7b0834bf8580aeb40ebedd4766368045d63e03af4d860cbbe4df8ebe2925123f - sha256sums = b93588eb487fae99c8a74fe1d84f6140d1d51450b2e69d8d9efe16af9a0d8a06 - sha256sums = 8b410a9aa7b34c0c3b14d7cff9d0e8376673c483eb65d449de6270680a385dab - sha256sums = 64cfd76c471ab3634711bc2e30dee90ae6498815b970014fe68adcbd50ad3741 - sha256sums = 723631658d0a630538f5ab4f87afd69b551a636a31ddb05e6ab13c0a9e5244a1 + sha256sums = 8c6b167f96649fab61a1ff93f8e2de0836b6b62c8e931e61cb4d7db0d1749891 + sha256sums = 0454962fdd469ee3b7e0f8bf6424815fae868bc690ad3d8678aa21074c8b0a67 + sha256sums = c6f9dffb930df9bec270d3b35e85162b05fc0d787706d8204e8256633676982e + sha256sums = ccb5504068826b4f75724c4d4a00ad7fac5ca86ee4adab9f1b96a641bc958d8d + sha256sums = 9da76c43712339fd3f65f34b624d47399f448684e843c3fe47e048ee4d51acc5 + sha256sums = 1252bc9ba0b15d0b4bf4f77aba934b48fe9ac9151db0ebc3a8f260f6de868b0d + sha256sums = 52e6e5041c935ec0d432b89818da0a4bf524451326acae84a85f3aa4c4d1f538 + sha256sums = 05a915611395964bbfd5c1e8de15e4c810756aac1de8e0d499e98993b27566db + sha256sums = 00e55ce1185099f0ad757f98d3ce0da238114987ea8639c3a6e1f0a649cbbb3f + sha256sums = f9226fb2b6ad805698090448b9c1e67716c58c6c8317f70ae3a073beebb88366 + sha256sums = 4d32789ead0ee2c2ec4aaf1014ddf0bc3e084c0f580f960e61210591995df785 + sha256sums = bfe467a73435391c0a24c58199fd440482d80dfa15f7648dcf72767a878c7f9e + sha256sums = 6a52ae33b2d2b93001b00a2c1d34cb02327d35a487ca09a85ad3ecde59acc9d2 sha256sums = 4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d - sha256sums = f203bd7fe6bb23ed808a4a3866ec08445f5dc3095f646425c640dc519df72118 + sha256sums = 073339a8a54640fbcf2cb976314a43049e47ea6fd6016d7fc2cd7a0075ad385a pkgname = vtunerc-dkms - diff --git a/0001-Replace-make-old-syntax.patch b/0001-Replace-make-old-syntax.patch new file mode 100644 index 000000000000..674643269f71 --- /dev/null +++ b/0001-Replace-make-old-syntax.patch @@ -0,0 +1,26 @@ +From 2a81f7e5611bbb4f4ce534e90a9ec00a5385fa9e Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:09:55 +0200 +Subject: [PATCH 01/13] Replace make old syntax + +M replaced SUBDIRS. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 18f30a3efada..c169f65628bc 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,7 @@ endif + PWD := $(shell pwd) + + default: +- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules ++ $(MAKE) -C $(KDIR) M=$(PWD) modules + + clean: + rm -f *.o +-- +2.36.1 + diff --git a/replace-Z-with-z.patch b/0002-Replace-Z-with-z.patch index 7c6d10f6237c..17624ed17e03 100644 --- a/replace-Z-with-z.patch +++ b/0002-Replace-Z-with-z.patch @@ -1,5 +1,17 @@ +From 033dcbf0936bd78f08526674f7e8bb219e3166bd Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:28:31 +0200 +Subject: [PATCH 02/13] Replace Z with z + According to kernel trace and printf.3, Z shouldn't be used and is synonym to z. So replace accordingly. +--- + vtunerc_ctrldev.c | 4 ++-- + vtunerc_main.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/vtunerc_ctrldev.c b/vtunerc_ctrldev.c +index 6d0f05c329d1..8aa1346b8f04 100644 --- a/vtunerc_ctrldev.c +++ b/vtunerc_ctrldev.c @@ -59,11 +59,11 @@ static ssize_t vtunerc_ctrldev_write(struct file *filp, const char *buff, @@ -14,8 +26,10 @@ synonym to z. So replace accordingly. - 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)) { +diff --git a/vtunerc_main.c b/vtunerc_main.c +index 1ba466a871d7..b2c8398ce735 100644 --- a/vtunerc_main.c +++ b/vtunerc_main.c @@ -406,7 +406,7 @@ static void __exit vtunerc_exit(void) @@ -26,4 +40,7 @@ synonym to z. So replace accordingly. + 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; + +-- +2.36.1 diff --git a/tweaks.patch b/0003-Tweaks.patch index 88b53fa35251..82d6cb6f71e2 100644 --- a/tweaks.patch +++ b/0003-Tweaks.patch @@ -1,4 +1,17 @@ -Few tweaks from https://code.google.com/p/satip +From a9b6a141074a6fc85b9de68e4301c0c88ea80839 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:29:58 +0200 +Subject: [PATCH 03/13] Tweaks + +Some tweaks from https://code.google.com/p/satip +--- + vtunerc_ctrldev.c | 8 ++++---- + vtunerc_main.c | 10 +++++++--- + vtunerc_proxyfe.c | 48 ++++------------------------------------------- + 3 files changed, 15 insertions(+), 51 deletions(-) + +diff --git a/vtunerc_ctrldev.c b/vtunerc_ctrldev.c +index 8aa1346b8f04..589e16cfb207 100644 --- a/vtunerc_ctrldev.c +++ b/vtunerc_ctrldev.c @@ -404,7 +404,7 @@ void vtunerc_unregister_ctrldev(struct vtunerc_config *config) @@ -9,18 +22,18 @@ Few tweaks from https://code.google.com/p/satip + 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); @@ -29,51 +42,55 @@ Few tweaks from https://code.google.com/p/satip 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; - + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index b2c8398ce735..a7683c84dc94 100644 --- 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); - + +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index f4e5044781e7..f90c4b723d90 100644 --- 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 +136,7 @@ Few tweaks from https://code.google.com/p/satip - break; - } + msg.body.fe_params.u.qpsk.fec_inner |= 64; - + /* ROLLOFF */ switch (c->rolloff) { @@ -508,8 +468,8 @@ static struct dvb_frontend_ops dvb_proxyfe_qpsk_ops = { @@ -131,5 +148,8 @@ Few tweaks from https://code.google.com/p/satip + 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, +-- +2.36.1 + diff --git a/0004-Fix-Waddress-warning.patch b/0004-Fix-Waddress-warning.patch new file mode 100644 index 000000000000..3b5df56173ca --- /dev/null +++ b/0004-Fix-Waddress-warning.patch @@ -0,0 +1,25 @@ +From 4c5e5591cc7da2f5175be1927c3cce5d3c975201 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:51:29 +0200 +Subject: [PATCH 04/13] Fix -Waddress warning + +--- + vtunerc_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index a7683c84dc94..38cb40290bc8 100644 +--- a/vtunerc_main.c ++++ b/vtunerc_main.c +@@ -173,7 +173,7 @@ static int vtunerc_stop_feed(struct dvb_demux_feed *feed) + + static char *get_fe_name(struct dvb_frontend_info *feinfo) + { +- return (feinfo && feinfo->name) ? feinfo->name : "(not set)"; ++ return feinfo ? feinfo->name : "(not set)"; + } + + /** +-- +2.36.1 + diff --git a/kernel-3.10.patch b/0005-Kernel-3.10.patch index cfbe3e52b135..6dfeb68024de 100644 --- a/kernel-3.10.patch +++ b/0005-Kernel-3.10.patch @@ -1,5 +1,15 @@ -https://lore.kernel.org/patchwork/cover/372524 +From cdd1fe09cbc7c02186f6fca173b11a64b2e4d277 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:39:09 +0200 +Subject: [PATCH 05/13] Kernel 3.10 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3cb5bf1bf947d325fcf6e9458952b51cfd7e6677 +--- + vtunerc_main.c | 98 +++++++++++++++++++++++--------------------------- + 1 file changed, 44 insertions(+), 54 deletions(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index 38cb40290bc8..7cc870b0d988 100644 --- a/vtunerc_main.c +++ b/vtunerc_main.c @@ -22,6 +22,7 @@ @@ -7,13 +17,13 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c #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)"; + return feinfo ? feinfo->name : "(not set)"; } - + -/** - * @brief procfs file handler - * @param buffer: @@ -80,7 +90,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c + 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) +{ @@ -94,7 +104,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c + module_put(THIS_MODULE); + return ret; +} - + - /* signal EOF */ - *eof = 1; +static int vtuner_proc_release(struct inode *inode, struct file *file) @@ -103,7 +113,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c + module_put(THIS_MODULE); + return ret; +} - + - return blen; +static const struct file_operations vtunerc_read_proc_fops = { + .open = vtunerc_proc_open, @@ -111,10 +121,10 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c + .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, @@ -127,26 +137,6 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3c ctx) == 0) printk(KERN_WARNING "vtunerc%d: Unable to register '%s' proc file\n", ---- a/vtunerc_priv.h -+++ b/vtunerc_priv.h -@@ -20,6 +20,7 @@ - #include <linux/module.h> /* Specifically, a module */ - #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) +-- +2.36.1 -+/* backward compatibility stuff */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) -+static inline void *PDE_DATA(const struct inode *inode) -+{ -+ return PROC_I(inode)->pde->data; -+} -+#endif -+ - #endif diff --git a/kernel-4.2.patch b/0006-Kernel-4.2.patch index 2ff590155dff..570d28bfa1cd 100644 --- a/kernel-4.2.patch +++ b/0006-Kernel-4.2.patch @@ -1,10 +1,21 @@ +From 43166c67563a7d0548b8eeea836375d778dd4c2e Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:41:16 +0200 +Subject: [PATCH 06/13] Kernel 4.2 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0df289a209e02f0926042ab07d7d2595ea2d2e9b +--- + vtunerc_proxyfe.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index f90c4b723d90..e2822865b8ed 100644 --- a/vtunerc_proxyfe.c +++ 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) { @@ -13,7 +24,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d @@ -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) { @@ -22,7 +33,7 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d @@ -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) { @@ -31,9 +42,12 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0d @@ -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) { struct dvb_proxyfe_state *state = fe->demodulator_priv; struct vtunerc_ctx *ctx = state->ctx; +-- +2.36.1 + diff --git a/kernel-4.6.patch b/0007-Kernel-4.6.patch index d4170834b1e2..56c079b181f9 100644 --- a/kernel-4.6.patch +++ b/0007-Kernel-4.6.patch @@ -1,11 +1,21 @@ -https://www.spinics.net/lists/linux-media/msg97066.html -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bb31d2381c730485be00a7da44c45416e9781709 +From db88a9d9b75480087309eea1ad4d6206a3bac991 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:43:50 +0200 +Subject: [PATCH 07/13] Kernel 4.6 + +https://lore.kernel.org/all/cover.1454600641.git.mchehab@osg.samsung.com +--- + vtunerc_proxyfe.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index e2822865b8ed..3ae04fa800a0 100644 --- a/vtunerc_proxyfe.c +++ b/vtunerc_proxyfe.c @@ -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) @@ -14,3 +24,6 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bb struct dvb_proxyfe_state *state = fe->demodulator_priv; struct vtunerc_ctx *ctx = state->ctx; struct vtuner_message msg; +-- +2.36.1 + diff --git a/kernel-4.15.patch b/0008-Kernel-4.15.patch index d4e14d5f2d7d..61229676ce2d 100644 --- a/kernel-4.15.patch +++ b/0008-Kernel-4.15.patch @@ -1,4 +1,16 @@ +From 7775d79a851c8550a23927ff2870b5ac512dd097 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:46:14 +0200 +Subject: [PATCH 08/13] Kernel 4.15 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0463625ee9e7b7c786460b6c20073e8c8e283466 +--- + vtunerc_main.c | 4 ---- + vtunerc_proxyfe.c | 6 ------ + 2 files changed, 10 deletions(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index 7cc870b0d988..2403022dbd0a 100644 --- a/vtunerc_main.c +++ b/vtunerc_main.c @@ -119,10 +119,6 @@ static int vtunerc_start_feed(struct dvb_demux_feed *feed) @@ -12,12 +24,14 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04 default: printk(KERN_ERR "vtunerc%d: feed type %d is not supported\n", ctx->idx, feed->type); +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index 3ae04fa800a0..048bc64d6228 100644 --- a/vtunerc_proxyfe.c +++ b/vtunerc_proxyfe.c @@ -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; @@ -28,9 +42,12 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04 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, .set_frontend = dvb_proxyfe_set_frontend, + +-- +2.36.1 diff --git a/kernel-4.16.patch b/0009-Kernel-4.16.patch index 61de52569d51..182394ac6c4c 100644 --- a/kernel-4.16.patch +++ b/0009-Kernel-4.16.patch @@ -1,10 +1,23 @@ +From f7cea73af6d04e4f632ada4a06bf41a646a266a3 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 15:47:30 +0200 +Subject: [PATCH 09/13] Kernel 4.16 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fada1935590f66dc6784981e0d557ca09013c847 +--- + vtunerc_main.c | 12 ++++++------ + vtunerc_priv.h | 12 ++++++------ + vtunerc_proxyfe.c | 2 +- + 3 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index 2403022dbd0a..4b153d9342fa 100644 --- 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" @@ -17,15 +30,17 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fa +#include <media/dvb_frontend.h> +#include <media/dvb_net.h> +#include <media/dvbdev.h> - + #include "vtunerc_priv.h" - + +diff --git a/vtunerc_priv.h b/vtunerc_priv.h +index bf8cc3c21005..97b2a6ad5e1e 100644 --- a/vtunerc_priv.h +++ b/vtunerc_priv.h -@@ -22,12 +22,12 @@ +@@ -21,12 +21,12 @@ + #include <linux/kernel.h> /* We're doing kernel work */ #include <linux/cdev.h> - #include <linux/version.h> - + -#include "demux.h" -#include "dmxdev.h" -#include "dvb_demux.h" @@ -38,17 +53,22 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fa +#include <media/dvb_frontend.h> +#include <media/dvb_net.h> +#include <media/dvbdev.h> - + #include "vtuner.h" - + +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index 048bc64d6228..8f1fbc01fff0 100644 --- 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" + +-- +2.36.1 diff --git a/kernel-4.19.patch b/0010-Kernel-4.19.patch index 3524e6688e1b..f362fb6120c2 100644 --- a/kernel-4.19.patch +++ b/0010-Kernel-4.19.patch @@ -1,4 +1,15 @@ -https://www.spinics.net/lists/linux-media/msg137367.html +From 119ad680800737d9b1328fcaad3c17e432ab0924 Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:03:55 +0200 +Subject: [PATCH 10/13] Kernel 4.19 + +https://lore.kernel.org/all/cover.1530830503.git.mchehab+samsung@kernel.org +--- + vtunerc_proxyfe.c | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +diff --git a/vtunerc_proxyfe.c b/vtunerc_proxyfe.c +index 8f1fbc01fff0..d6b19a48e6e3 100644 --- a/vtunerc_proxyfe.c +++ b/vtunerc_proxyfe.c @@ -392,10 +392,9 @@ static struct dvb_frontend_ops dvb_proxyfe_ofdm_ops = { @@ -45,3 +56,6 @@ https://www.spinics.net/lists/linux-media/msg137367.html .symbol_rate_min = 1000000, .symbol_rate_max = 45000000, .caps = FE_CAN_INVERSION_AUTO | +-- +2.36.1 + diff --git a/kernel-5.3.patch b/0011-Kernel-5.3.patch index cacbb6e5dc03..717500f3096d 100644 --- a/kernel-5.3.patch +++ b/0011-Kernel-5.3.patch @@ -1,4 +1,15 @@ +From 729304d7c8866e53ce2fa6da7bc2e9a90f3e76ed Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:05:15 +0200 +Subject: [PATCH 11/13] Kernel 5.3 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=a035d552a93bb9ef6048733bb9f2a0dc857ff869 +--- + vtunerc_ctrldev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vtunerc_ctrldev.c b/vtunerc_ctrldev.c +index 589e16cfb207..36c24b5bbfa3 100644 --- a/vtunerc_ctrldev.c +++ b/vtunerc_ctrldev.c @@ -205,6 +205,7 @@ static long vtunerc_ctrldev_ioctl(struct file *file, unsigned int cmd, @@ -9,3 +20,6 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=a03 case VTUNER_SET_TYPE: dprintk(ctx, "msg VTUNER_SET_TYPE\n"); if (strcasecmp((char *)arg, "DVB-S") == 0) { +-- +2.36.1 + diff --git a/kernel-5.6.patch b/0012-Kernel-5.6.patch index 1c789e39be2f..0fc50a1a3088 100644 --- a/kernel-5.6.patch +++ b/0012-Kernel-5.6.patch @@ -1,4 +1,15 @@ +From 329863379978c78e895dc4028bbc6e6019b4783a Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:11:15 +0200 +Subject: [PATCH 12/13] Kernel 5.6 + https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d56c0d45f0e27f814e87a1676b6bdccccbc252e9 +--- + vtunerc_main.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index 4b153d9342fa..d1c7d55f1168 100644 --- a/vtunerc_main.c +++ b/vtunerc_main.c @@ -213,11 +213,11 @@ static int vtuner_proc_release(struct inode *inode, struct file *file) @@ -27,3 +38,6 @@ https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d5 ctx) == 0) printk(KERN_WARNING "vtunerc%d: Unable to register '%s' proc file\n", +-- +2.36.1 + diff --git a/0013-Kernel-5.17.patch b/0013-Kernel-5.17.patch new file mode 100644 index 000000000000..9954a8631360 --- /dev/null +++ b/0013-Kernel-5.17.patch @@ -0,0 +1,26 @@ +From c5971dc50955de809d696928124611bdacb7731c Mon Sep 17 00:00:00 2001 +From: Tomasz Maciej Nowak <tmn505@gmail.com> +Date: Fri, 13 May 2022 16:46:57 +0200 +Subject: [PATCH 13/13] Kernel 5.17 + +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa +--- + vtunerc_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vtunerc_main.c b/vtunerc_main.c +index d1c7d55f1168..3e6b6233c2fc 100644 +--- a/vtunerc_main.c ++++ b/vtunerc_main.c +@@ -196,7 +196,7 @@ static int vtunerc_read_proc(struct seq_file *seq, void *v) + static int vtunerc_proc_open(struct inode *inode, struct file *file) + { + int ret; +- struct vtunerc_ctx *ctx = PDE_DATA(inode); ++ struct vtunerc_ctx *ctx = pde_data(inode); + + if (!try_module_get(THIS_MODULE)) + return -ENODEV; +-- +2.36.1 + @@ -5,40 +5,44 @@ pkgname='vtunerc-dkms' pkgdesc='Kernel module to create virtual DVB devices' pkgver=1.4 -pkgrel=11 +pkgrel=12 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url='http://code.google.com/p/vtuner' license=('GPL2') depends=('linux>=3.3' 'dkms') conflicts=('vtuner-module' 'vtuner-module-lts') source=("vtuner.linux-driver-rel${pkgver}.tar.gz::https://github.com/lecotex/vtuner.linux-driver/archive/rel${pkgver}.tar.gz" - 'kernel-3.10.patch' - 'kernel-4.2.patch' - 'kernel-4.6.patch' - 'kernel-4.15.patch' - 'kernel-4.16.patch' - 'kernel-4.19.patch' - 'kernel-5.3.patch' - 'kernel-5.4.patch' - 'kernel-5.6.patch' - 'replace-Z-with-z.patch' - 'tweaks.patch' + '0001-Replace-make-old-syntax.patch' + '0002-Replace-Z-with-z.patch' + '0003-Tweaks.patch' + '0004-Fix-Waddress-warning.patch' + '0005-Kernel-3.10.patch' + '0006-Kernel-4.2.patch' + '0007-Kernel-4.6.patch' + '0008-Kernel-4.15.patch' + '0009-Kernel-4.16.patch' + '0010-Kernel-4.19.patch' + '0011-Kernel-5.3.patch' + '0012-Kernel-5.6.patch' + '0013-Kernel-5.17.patch' '93-vtunerc.rules' 'dkms.conf') sha256sums=('c6ba0cfd808e3f8473a5ea25d4ac2871b826edc62de5f3624c0bd812aad63bc1' - '3da500773c6cc2f07a636d0a9f20cd1ac5106ddcd684f80ccd714ee26f7e7498' - 'e66d690f3cddab61a8a3e6172caefb0877aa240225af4683bcc433718cece242' - '1f1318695d96ab9a1b217b83654293c78ee8c86be957f09e8180359b73736a61' - 'ae701414fee3c96fc8a2a5f705c534d4933485e6b28fab94d912f63395d184b7' - '2e8a410409bba057d61ae8b1005a13cb1f359caa562b846e37b5db0448d62395' - 'c7bc232a5743a0fc4e80f9f72c6e27c2d82444cc307b1835873f63ae10c7efae' - '7b0834bf8580aeb40ebedd4766368045d63e03af4d860cbbe4df8ebe2925123f' - 'b93588eb487fae99c8a74fe1d84f6140d1d51450b2e69d8d9efe16af9a0d8a06' - '8b410a9aa7b34c0c3b14d7cff9d0e8376673c483eb65d449de6270680a385dab' - '64cfd76c471ab3634711bc2e30dee90ae6498815b970014fe68adcbd50ad3741' - '723631658d0a630538f5ab4f87afd69b551a636a31ddb05e6ab13c0a9e5244a1' + '8c6b167f96649fab61a1ff93f8e2de0836b6b62c8e931e61cb4d7db0d1749891' + '0454962fdd469ee3b7e0f8bf6424815fae868bc690ad3d8678aa21074c8b0a67' + 'c6f9dffb930df9bec270d3b35e85162b05fc0d787706d8204e8256633676982e' + 'ccb5504068826b4f75724c4d4a00ad7fac5ca86ee4adab9f1b96a641bc958d8d' + '9da76c43712339fd3f65f34b624d47399f448684e843c3fe47e048ee4d51acc5' + '1252bc9ba0b15d0b4bf4f77aba934b48fe9ac9151db0ebc3a8f260f6de868b0d' + '52e6e5041c935ec0d432b89818da0a4bf524451326acae84a85f3aa4c4d1f538' + '05a915611395964bbfd5c1e8de15e4c810756aac1de8e0d499e98993b27566db' + '00e55ce1185099f0ad757f98d3ce0da238114987ea8639c3a6e1f0a649cbbb3f' + 'f9226fb2b6ad805698090448b9c1e67716c58c6c8317f70ae3a073beebb88366' + '4d32789ead0ee2c2ec4aaf1014ddf0bc3e084c0f580f960e61210591995df785' + 'bfe467a73435391c0a24c58199fd440482d80dfa15f7648dcf72767a878c7f9e' + '6a52ae33b2d2b93001b00a2c1d34cb02327d35a487ca09a85ad3ecde59acc9d2' '4b2d860cac8c8bab2d8fa79760d4405bef6fd042f4e78b680d25d1a5ebcbf83d' - 'f203bd7fe6bb23ed808a4a3866ec08445f5dc3095f646425c640dc519df72118') + '073339a8a54640fbcf2cb976314a43049e47ea6fd6016d7fc2cd7a0075ad385a') package() { install -dm755 ${pkgdir}/usr/src/vtunerc-${pkgver}/patches diff --git a/dkms.conf b/dkms.conf index d0c3ca250884..f6a856064ea0 100644 --- a/dkms.conf +++ b/dkms.conf @@ -6,33 +6,37 @@ BUILT_MODULE_NAME[0]="vtunerc" MAKE[0]="make KDIR=/usr/lib/modules/$kernelver/build VTUNERC_MAX_ADAPTERS=16" DEST_MODULE_LOCATION[0]="/kernel/drivers/media" -PATCH[0]="replace-Z-with-z.patch" +PATCH[0]="0001-Replace-make-old-syntax.patch" -PATCH[1]="tweaks.patch" +PATCH[1]="0002-Replace-Z-with-z.patch" -PATCH[2]="kernel-3.10.patch" -PATCH_MATCH[2]="^3\.1[0-9](.*)|^[4-9].*" +PATCH[2]='0003-Tweaks.patch' -PATCH[3]="kernel-4.2.patch" -PATCH_MATCH[3]="^4\.[2-9](.*)|^4\.[0-9][0-9](.*)|^[5-9].*" +PATCH[3]='0004-Fix-Waddress-warning.patch' -PATCH[4]="kernel-4.6.patch" -PATCH_MATCH[4]="^4\.[6-9](.*)|^4\.[0-9][0-9](.*)|^[5-9].*" +PATCH[4]="0005-Kernel-3.10.patch" +PATCH_MATCH[4]="^3\.1[0-9](.*)|^[4-9].*" -PATCH[5]="kernel-4.15.patch" -PATCH_MATCH[5]="^4\.1[5-9](.*)|^4\.[2-9][0-9](.*)|^[5-9].*" +PATCH[5]="0006-Kernel-4.2.patch" +PATCH_MATCH[5]="^4\.[2-9](.*)|^4\.[0-9][0-9](.*)|^[5-9].*" -PATCH[6]="kernel-4.16.patch" -PATCH_MATCH[6]="^4\.1[6-9](.*)|^4\.[2-9][0-9](.*)|^[5-9].*" +PATCH[6]="0007-Kernel-4.6.patch" +PATCH_MATCH[6]="^4\.[6-9](.*)|^4\.[0-9][0-9](.*)|^[5-9].*" -PATCH[7]="kernel-4.19.patch" -PATCH_MATCH[7]="^4\.19(.*)|^[5-9].*" +PATCH[7]="0008-Kernel-4.15.patch" +PATCH_MATCH[7]="^4\.1[5-9](.*)|^4\.[2-9][0-9](.*)|^[5-9].*" -PATCH[8]="kernel-5.3.patch" -PATCH_MATCH[8]="^5\.[3-9](.*)|^5\.[0-9][0-9](.*)|^[6-9].*" +PATCH[8]="0009-Kernel-4.16.patch" +PATCH_MATCH[8]="^4\.1[6-9](.*)|^4\.[2-9][0-9](.*)|^[5-9].*" -PATCH[9]="kernel-5.4.patch" -PATCH_MATCH[9]="^5\.[4-9](.*)|^5\.[0-9][0-9](.*)|^[6-9].*" +PATCH[9]="0010-Kernel-4.19.patch" +PATCH_MATCH[9]="^4\.19(.*)|^[5-9].*" -PATCH[10]="kernel-5.6.patch" -PATCH_MATCH[10]="^5\.[6-9](.*)|^5\.[0-9][0-9](.*)|^[6-9].*" +PATCH[10]="0011-Kernel-5.3.patch" +PATCH_MATCH[10]="^5\.[3-9](.*)|^5\.[0-9][0-9](.*)|^[6-9].*" + +PATCH[11]="0012-Kernel-5.6.patch" +PATCH_MATCH[11]="^5\.[6-9](.*)|^5\.[0-9][0-9](.*)|^[6-9].*" + +PATCH[12]="0013-Kernel-5.17.patch" +PATCH_MATCH[12]="^5\.1[7-9](.*)|^5\.[2-9][0-9](.*)|^[6-9].*" diff --git a/kernel-5.4.patch b/kernel-5.4.patch deleted file mode 100644 index eb3cfa8ca151..000000000000 --- a/kernel-5.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7e35b42591c058b91282f95ce3b2cf0c05ffe93d ---- a/Makefile -+++ b/Makefile -@@ -35,7 +35,7 @@ endif - PWD := $(shell pwd) - - default: -- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules -+ $(MAKE) -C $(KDIR) M=$(PWD) modules - - clean: - rm -f *.o |