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

v4l-utils: fix 1.26.0 cross compiled builds

Browse Source
This commit is contained in:
Rudi Heitbaum 2023-11-27 06:33:36 +00:00
parent 6d16673702
commit 520f5d809d
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
PKG_MESON_OPTS_TARGET="-Ddefault_library=static \ PKG_MESON_OPTS_TARGET="-Ddefault_library=static \
-Dprefer_static=true \ -Dprefer_static=true \
-Dbpf=enabled \ -Dbpf=enabled \
-Dgconv=disabled \
-Djpeg=disabled \ -Djpeg=disabled \
-Ddoxygen-doc=disabled" -Ddoxygen-doc=disabled"

37
packages/sysutils/v4l-utils/patches/v4l-utils-003-enable-bpf-without-clang.patch
View File

@ -5,14 +5,37 @@ Subject: [PATCH] disable bpf decoder build and drop bpf dependency on clang
Signed-off-by: Matthias Reichl <hias@horus.com> Signed-off-by: Matthias Reichl <hias@horus.com>
--- ---
utils/keytable/meson.build | 2 +- meson.build | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) utils/keytable/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 233cbab0..be844f9c 100644
--- a/meson.build
+++ b/meson.build
@@ -70,7 +70,7 @@ endif
v4l2_utils_incdir = include_directories(v4l2_utils_incdir_arr)
prog_bash = find_program('bash')
-prog_clang = find_program('clang', required : get_option('bpf'))
+#prog_clang = find_program('clang', required : get_option('bpf'))
prog_doxygen = find_program('doxygen', required : get_option('doxygen-doc'))
prog_grep = find_program('grep')
prog_perl = find_program('perl')
diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
index 3bb1d2a5..7b633473 100644 index 0ca08a18..fa8fbede 100644
--- a/utils/keytable/meson.build 2023-11-25 13:27:49.000000000 +0000 --- a/utils/keytable/meson.build
+++ b/utils/keytable/meson.build 2023-11-26 08:10:06.173971103 +0000 +++ b/utils/keytable/meson.build
@@ -35,7 +35,7 @@ @@ -21,7 +21,7 @@ ir_keytable_c_args = [
'-DIR_KEYTABLE_USER_DIR="@0@"'.format(ir_keytable_user_dir),
]
-ir_bpf_enabled = prog_clang.found() and dep_libbpf.found() and dep_libelf.found()
+ir_bpf_enabled = dep_libbpf.found() and dep_libelf.found()
if ir_bpf_enabled
ir_keytable_sources += files(
@@ -35,7 +35,7 @@ if ir_bpf_enabled
ir_keytable_c_args += [ ir_keytable_c_args += [
'-DHAVE_BPF', '-DHAVE_BPF',
] ]
@ -22,5 +45,5 @@ index 3bb1d2a5..7b633473 100644
ir_keytable_incdir = [ ir_keytable_incdir = [
-- --
2.20.1 2.34.1