diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index daae63e06d..4f971bd565 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -5,58 +5,19 @@ # with 1.0.0 repeat delay is broken. test on upgrade PKG_NAME="v4l-utils" -PKG_VERSION="1.24.1" -PKG_SHA256="cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b" +PKG_VERSION="1.26.0" +PKG_SHA256="dab463dc0215e55b2ef1f7a7ab230c3ae8102ea029547eefb4478da0fa8af505" PKG_LICENSE="GPL" 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.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib elfutils ir-bpf-decoders libbpf systemd zlib" PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)." -PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \ - --enable-bpf \ - --enable-static \ - --disable-shared \ - --disable-doxygen-doc" - -pre_configure_target() { - # cec-ctl fails to build in subdirs - cd ${PKG_BUILD} - rm -rf .${TARGET_NAME} -} - -make_target() { - make -C utils/keytable CFLAGS="${TARGET_CFLAGS}" - make -C utils/ir-ctl CFLAGS="${TARGET_CFLAGS}" - if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then - make -C utils/libcecutil CFLAGS="${TARGET_CFLAGS}" - make -C utils/cec-ctl CFLAGS="${TARGET_CFLAGS}" - fi - make -C lib CFLAGS="${TARGET_CFLAGS}" - make -C utils/dvb CFLAGS="${TARGET_CFLAGS}" - make -C utils/v4l2-ctl CFLAGS="${TARGET_CFLAGS}" - - if [ "${LIBREELEC_VERSION}" == "devel" ]; then - make -C utils/v4l2-compliance CFLAGS="${TARGET_CFLAGS}" - fi -} - -makeinstall_target() { - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/keytable - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/ir-ctl - if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/cec-ctl - fi - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/dvb - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/v4l2-ctl - - if [ "${LIBREELEC_VERSION}" == "devel" ]; then - make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/v4l2-compliance - fi - - cp ${PKG_BUILD}/contrib/lircd2toml.py ${INSTALL}/usr/bin/ -} +PKG_MESON_OPTS_TARGET="-Ddefault_library=static \ + -Dprefer_static=true \ + -Dbpf=enabled \ + -Djpeg=disabled \ + -Ddoxygen-doc=disabled" create_multi_keymap() { local f name map @@ -73,6 +34,17 @@ create_multi_keymap() { post_makeinstall_target() { local f keymap + if [ ! "${LIBREELEC_VERSION}" == "devel" ]; then + rm ${INSTALL}/usr/bin/v4l2-compliance + fi + + cp ${PKG_BUILD}/contrib/lircd2toml.py ${INSTALL}/usr/bin/ + + rm -rf ${INSTALL}/usr/include + rm -rf ${INSTALL}/usr/lib/gconv + rm -rf ${INSTALL}/usr/lib/lib* + rm -rf ${INSTALL}/usr/lib/pkgconfig + rm -rf ${INSTALL}/etc/rc_keymaps ln -sf /storage/.config/rc_keymaps ${INSTALL}/etc/rc_keymaps diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-001-disable-doxygen-in-automake.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-001-disable-doxygen-in-automake.patch deleted file mode 100644 index 65cd971a02..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-001-disable-doxygen-in-automake.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 137dd2edea4d6c70b10caebebed4778716070ed2 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sun, 9 Feb 2020 00:16:29 +0100 -Subject: [PATCH] don't include doxygen autotools include - -Signed-off-by: Matthias Reichl ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d20dfe0f..05dc8c1a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -10,7 +10,7 @@ - - EXTRA_DIST = android-config.h sync-with-kernel.sh bootstrap.sh \ - doxygen_libdvbv5.cfg include COPYING.libv4l \ - COPYING.libdvbv5 README.libv4l README.lib-multi-threading \ - TODO.libdvbv5 doc/libdvbv5-index.doc - --include $(top_srcdir)/aminclude.am -+# include $(top_srcdir)/aminclude.am --- -2.20.1 - diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-003-enable-bpf-without-clang.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-003-enable-bpf-without-clang.patch index 5e2052773f..191082cca3 100644 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-003-enable-bpf-without-clang.patch +++ b/packages/sysutils/v4l-utils/patches/v4l-utils-003-enable-bpf-without-clang.patch @@ -5,36 +5,22 @@ Subject: [PATCH] disable bpf decoder build and drop bpf dependency on clang Signed-off-by: Matthias Reichl --- - configure.ac | 2 +- - utils/keytable/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + utils/keytable/meson.build | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/configure.ac b/configure.ac +diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build index 3bb1d2a5..7b633473 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -565,7 +565,7 @@ - AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_libv4l} != xno]) - AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_32], [test x$ac_cv_func_fork = xyes -a x${enable_v4l2_compliance_32} = xyes]) - PKG_CHECK_MODULES([LIBBPF], [libbpf >= 0.7], [bpf_pc=yes], [bpf_pc=no]) --AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$CLANG = xclang -a x$bpf_pc = xyes]) -+AM_CONDITIONAL([WITH_BPF], [test x$enable_bpf != xno -a x$libelf_pkgconfig = xyes -a x$bpf_pc = 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 4724897e..1c209fe2 100644 ---- a/utils/keytable/Makefile.am -+++ b/utils/keytable/Makefile.am -@@ -23,7 +23,7 @@ - if WITH_BPF - ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS) - ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) --SUBDIRS = bpf_protocols -+# SUBDIRS = bpf_protocols +--- a/utils/keytable/meson.build 2023-11-25 13:27:49.000000000 +0000 ++++ b/utils/keytable/meson.build 2023-11-26 08:10:06.173971103 +0000 +@@ -35,7 +35,7 @@ + ir_keytable_c_args += [ + '-DHAVE_BPF', + ] +- subdir('bpf_protocols') ++ #subdir('bpf_protocols') endif - EXTRA_DIST = 70-infrared.rules 50-rc_keymap.conf rc_keymaps rc_keymaps_userspace gen_input_events.pl gen_keytables.pl ir-keytable.1 rc_maps.cfg rc_keymap.5 + ir_keytable_incdir = [ -- 2.20.1