[oe-commits] [meta-openembedded] 02/12: dvb-apps: Fix build with kernel > 4.14

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 9805371f3a08df109c4e46550ac0c59fb13771e0
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Thu Nov 22 10:42:56 2018 -0800

    dvb-apps: Fix build with kernel > 4.14
    
    Inherit perlnative for tests to build
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb  |  3 +++
 .../dvb-apps/files/0006-CA_SET_PID.patch           | 24 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb
index 60409ff..718757b 100644
--- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb
+++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb
@@ -12,10 +12,13 @@ SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \
           file://0003-handle-static-shared-only-build.patch \
           file://0004-Makefile-remove-test.patch \
           file://0005-libucsi-optimization-removal.patch \
+          file://0006-CA_SET_PID.patch \
           "
 
 S = "${WORKDIR}/${BPN}"
 
+inherit perlnative
+
 do_configure() {
     sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
 }
diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch
new file mode 100644
index 0000000..e100c65
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0006-CA_SET_PID.patch
@@ -0,0 +1,24 @@
+Index: dvb-apps/util/dst-utils/dst_test.c
+===================================================================
+--- dvb-apps.orig/util/dst-utils/dst_test.c
++++ dvb-apps/util/dst-utils/dst_test.c
+@@ -35,7 +35,18 @@
+ #include <libdvben50221/en50221_app_tags.h>
+ 
+ #define CA_NODE "/dev/dvb/adapter0/ca0"
+-
++/*
++ 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
+ static int dst_comms(int cafd, uint32_t tag, uint32_t function, struct ca_msg *msg)
+ {
+ 	if (tag) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.