jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

v4l-utils: enable bpf support in ir-keytable

Browse Source 
note: building bpf decoders is disabled as that would require clang
in the toolchain.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2020-02-09 01:38:09 +01:00
parent 17201f300b
commit 9b7ca96f7e
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/sysutils/v4l-utils/config/rc_keymaps/protocols/README Normal file
View File

@ -0,0 +1,3 @@
BPF protocol decoders user config dir
put your BPF protocol decoders for ir-keytable in this directory

4
packages/sysutils/v4l-utils/package.mk
View File

@ -10,12 +10,12 @@ PKG_SHA256="6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://linuxtv.org/" PKG_SITE="http://linuxtv.org/"
PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain alsa-lib systemd" PKG_DEPENDS_TARGET="toolchain alsa-lib systemd elfutils"
PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)." PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
PKG_TOOLCHAIN="autotools" PKG_TOOLCHAIN="autotools"
PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \ PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \
--disable-bpf \ --enable-bpf \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--disable-doxygen-doc" --disable-doxygen-doc"

40
packages/sysutils/v4l-utils/patches/v4l-utils-002-enable-bpf-without-clang.patch Normal file
View File

@ -0,0 +1,40 @@
From 6aafb490b7c352b04f036ea6f9cbc33be8383ddf Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 8 Feb 2020 21:42:06 +0100
Subject: [PATCH] disable bpf decoder build and drop bpf dependency on clang
Signed-off-by: Matthias Reichl <hias@horus.com>
---
configure.ac | 2 +-
utils/keytable/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6ff26093..1efa7879 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,7 +508,7 @@ AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno])
AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} != xno])
AM_CONDITIONAL([WITH_V4L2_COMPLIANCE], [test x$ac_cv_func_fork = xyes])
AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno])
-AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang])
+AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes])
# append -static to libtool compile and link command to enforce static libs
AS_IF([test x$enable_libdvbv5 = xno], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am
index d7b30e2c..a2c8df8d 100644
--- a/utils/keytable/Makefile.am
+++ b/utils/keytable/Makefile.am
@@ -15,7 +15,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS)
if WITH_BPF
ir_keytable_LDFLAGS += $(LIBELF_LIBS)
-SUBDIRS = bpf_protocols
+# SUBDIRS = bpf_protocols
endif
EXTRA_DIST = 70-infrared.rules rc_keymaps rc_keymaps_userspace gen_input_events.pl gen_keytables.pl ir-keytable.1 rc_maps.cfg rc_keymap.5
--
2.20.1