Mail archive
alpine-aports

[alpine-aports] [PATCH] community/mumudvb: fix build against linux-headers-4.18.3

From: alpine-mips-patches <info_at_mobile-stream.com>
Date: Tue, 20 Nov 2018 22:10:57 +0000

This pulls upstream commit 596f7dbebd2590f7e77cf755af46952f340ddb97
---
 ...0001-Fix-compiling-with-kernels-4.14.patch | 35 +++++++++++++++++++
 community/mumudvb/APKBUILD                    |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 community/mumudvb/0001-Fix-compiling-with-kernels-4.14.patch
diff --git a/community/mumudvb/0001-Fix-compiling-with-kernels-4.14.patch b/community/mumudvb/0001-Fix-compiling-with-kernels-4.14.patch
new file mode 100644
index 0000000000..6a200b64c7
--- /dev/null
+++ b/community/mumudvb/0001-Fix-compiling-with-kernels-4.14.patch
_at_@ -0,0 +1,35 @@
+From 596f7dbebd2590f7e77cf755af46952f340ddb97 Mon Sep 17 00:00:00 2001
+From: Brice Dubost <mumudvb_at_braice.net>
+Date: Sat, 25 Nov 2017 20:21:10 -0500
+Subject: [PATCH] Fix compiling with kernels > 4.14
+
+---
+ src/scam_common.h | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/scam_common.h b/src/scam_common.h
+index 05ee7e5..c3436de 100644
+--- a/src/scam_common.h
++++ b/src/scam_common.h
+_at_@ -61,6 +61,18 @@
+ 
+ #define MAX_STATIC_KEYS 24
+ 
++//Quick hack around the removal of ca_pid_t and CA_GET_PID in recent kernels
++//https://github.com/torvalds/linux/commit/833ff5e7feda1a042b83e82208cef3d212ca0ef1
++#ifndef CA_SET_PID
++typedef struct ca_pid {
++	unsigned int pid;
++	int index;      /* -1 == disable*/
++	} ca_pid_t;
++//We should not be able to get it so a number that is unlikely to happen
++#define CA_SET_PID 42424242
++#endif
++
++
+ /** _at_brief the parameters for the scam
+  * This structure contain the parameters needed for the SCAM
+  */
+-- 
+2.19.1
+
diff --git a/community/mumudvb/APKBUILD b/community/mumudvb/APKBUILD
index fd649301eb..a1ccead4aa 100644
--- a/community/mumudvb/APKBUILD
+++ b/community/mumudvb/APKBUILD
_at_@ -3,7 +3,7 @@
 pkgname=mumudvb
 _pkgname=MuMuDVB
 pkgver=2.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A DVB IPTV streaming software"
 url="http://mumudvb.braice.net/"
 arch="all"
_at_@ -14,6 +14,7 @@ install="$pkgname.pre-install"
 subpackages="$pkgname-doc"
 pkgusers="mumudvb"
 source="$pkgname-$pkgver.tar.gz::https://github.com/braice/MuMuDVB/archive/$pkgver.tar.gz
+0001-Fix-compiling-with-kernels-4.14.patch
 musl-error-h.patch
 $pkgname.initd
 $pkgname.confd"
_at_@ -54,6 +55,7 @@ doc() {
 }
 
 sha512sums="e300d0f9624a7a5d108ded303b11ef7f399968357540f681ae772efe2a36d32883c69f20e41f8372c0f9c39393c71f2eddb04c59bfadf71a0f575ea160a27cf2  mumudvb-2.1.0.tar.gz
+05ba4f04f1a6f605c78ac142e19a410840a963169ace7d5180d25eba5627c4bcc2380c870a9e41d292839924ebf179af948a519d0f83ba475238e664c78d852d  0001-Fix-compiling-with-kernels-4.14.patch
 83228d1ea51b892779d284e443477332f92bc27d5806294774ff6eb93c5b4896dbd04367559a03268aa9994f8555c748e82075e4b86b01866a65662bf5c00824  musl-error-h.patch
 a59a282e04e72bb75e365f36dd4af7560826e8803f0ffa0244c59b2c88bf3e822d846358ababc74aa04de4758880a5bd53e02e3537b8ced0a23aea5360832709  mumudvb.initd
 777096785f71f22e9b1462d8bd9a0dba39bda63fa9493d8431140cc09addfac6ce9f962c60aa50b6f331d8ecbaef8e1340cf401aa3caeb743d3a396326f28efa  mumudvb.confd"
-- 
2.19.1
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Tue Nov 20 2018 - 22:10:57 UTC