deleted file mode 100644
@@ -1,46 +0,0 @@
-From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@denx.de>
-Date: Fri, 12 Jan 2024 00:17:14 -0300
-Subject: [PATCH] keytable: meson: Restrict the installation of
- 50-rc_keymap.conf
-
-Currently, meson tries to install 50-rc_keymap.conf even if systemd
-is not used.
-
-Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"),
-only allowed 50-rc_keymap.conf to be installed when both BPF and systemd
-were used.
-
-Apply the same logic in meson to fix the problem.
-
-Signed-off-by: Fabio Estevam <festevam@denx.de>
-Signed-off-by: Sean Young <sean@mess.org>
-Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168]
----
- utils/keytable/meson.build | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build
-index 4130a4bea514..76ce329eae8e 100644
---- a/utils/keytable/meson.build
-+++ b/utils/keytable/meson.build
-@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files(
- install_data(ir_keytable_udev_rules,
- install_dir : ir_keytable_system_dir / 'rules.d')
-
-+if ir_bpf_enabled
-+if dep_systemd.found()
- if have_udevdsyscallfilter
- ir_keytable_systemd_files = files(
- '50-rc_keymap.conf',
-@@ -76,6 +78,8 @@ if have_udevdsyscallfilter
- install_data(ir_keytable_systemd_files,
- install_dir : systemd_systemdir / 'systemd-udevd.service.d')
- endif
-+endif
-+endif
-
- # Install non-existing directory to create empty directory structure
- # See: https://github.com/mesonbuild/meson/issues/2904
---
-2.34.1
similarity index 95%
rename from meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
rename to meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
@@ -26,18 +26,17 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled"
PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c"
SRC_URI = "\
- git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \
- file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \
+ git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \
file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \
file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \
"
-SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
-
-PV .= "+git"
+SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548"
S = "${WORKDIR}/git"
+UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)"
+
EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false"
# Disable the erroneous installation of gconv-modules that would break glib
ChangeLog: https://git.linuxtv.org/v4l-utils.git/tree/ChangeLog?h=v4l-utils-1.28.1 * Drop backport patch * Add UPSTREAM_CHECK_GITTAGREGEX Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...estrict-the-installation-of-50-rc_ke.patch | 46 ------------------- ...4l-utils_1.26.1.bb => v4l-utils_1.28.1.bb} | 9 ++-- 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch rename meta-oe/recipes-multimedia/v4l2apps/{v4l-utils_1.26.1.bb => v4l-utils_1.28.1.bb} (95%)