5 files changed, 137 insertions, 66 deletions

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
deleted file mode 100644
index 64c01e4977..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch
new file mode 100644
index 0000000000..6c946d8c48
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch
@@ -0,0 +1,78 @@
+From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001
+From: Neel Gandhi <neel.gandhi@amd.com>
+Date: Wed, 5 Jun 2024 13:51:36 +0530
+Subject: [PATCH] media-ctl: Install media-ctl header and library files
+
+Install mediactl and v4l2subdev header and library
+files, which may be required by 3rd party applications
+to populate and control v4l2subdev device node tree
+
+Install of these files was removed in upstream commit
+0911dce53b08b0df3066be2c75f67e8a314d8729.
+
+Upstream-Status: Denied
+
+v4l-utils maintainers do not promise a stable API for this library, and
+do not currently have the time to do so. So exporting the API in this
+way is fine, as long as we understand that it will change and users of
+the API will need to adapt over time.
+
+Signed-off-by: Neel Gandhi <neel.gandhi@amd.com>
+Signed-off-by: Mark Hatle <mark.hatle@amd.com>
+---
+ utils/media-ctl/meson.build | 28 +++++++++++++++++++++-------
+ 1 file changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 3a7b0c9a..40669b4c 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -3,14 +3,24 @@ libmediactl_sources = files(
+     'mediactl-priv.h',
+ )
+ 
++libmediactl_api = files(
++    'mediactl.h',
++    'v4l2subdev.h',
++)
++
++install_headers(libmediactl_api, subdir: 'mediactl')
++
+ libmediactl_deps = [
+     dep_libudev,
+ ]
+ 
+-libmediactl = static_library('mediactl',
+-                             libmediactl_sources,
+-                             dependencies : libmediactl_deps,
+-                             include_directories : v4l2_utils_incdir)
++libmediactl = library('mediactl',
++                      libmediactl_sources,
++                      soversion: '0',
++                      version: '0.0.0',
++                      install : true,
++                      dependencies : libmediactl_deps,
++                      include_directories : v4l2_utils_incdir)
+ 
+ dep_libmediactl = declare_dependency(link_with : libmediactl)
+ 
+@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c')
+ libv4l2subdev_sources += media_bus_format_names_h
+ libv4l2subdev_sources += media_bus_format_codes_h
+ 
+-libv4l2subdev = static_library('v4l2subdev',
+-                               libv4l2subdev_sources,
+-                               include_directories : v4l2_utils_incdir)
++libv4l2subdev = library('v4l2subdev',
++                        libv4l2subdev_sources,
++                        soversion: '0',
++                        version: '0.0.0',
++                        install : true,
++                        dependencies : dep_libmediactl,
++                        include_directories : v4l2_utils_incdir)
+ 
+ dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
+ 
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
new file mode 100644
index 0000000000..8a009ae806
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch
@@ -0,0 +1,49 @@
+From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001
+From: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+Date: Fri, 10 May 2024 11:56:17 +0200
+Subject: [PATCH] media-ctl: Install media-ctl pkg-config files
+
+libv4l2subdev/libmediactl can not be used in projects without the
+pkg-config files. This adds them as well.
+
+Upstream-Status: Denied
+
+This is an add-on to the previous patch:
+0001-media-ctl-Install-media-ctl-header-and-library-files.patch
+so same restrictions apply.
+
+Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com>
+---
+ utils/media-ctl/meson.build | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 40669b4c..6feba1af 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev',
+ 
+ dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev)
+ 
++pkg.generate(
++      libv4l2subdev,
++      name : 'libv4l2subdev',
++      version : meson.project_version(),
++      description : 'v4l2 subdev library')
++
+ media_ctl_sources = files(
+     'media-ctl.c',
+     'options.c',
+@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl',
+                        dependencies : media_ctl_deps,
+                        install : true,
+                        include_directories : v4l2_utils_incdir)
++
++pkg.generate(
++     libmediactl,
++     name : 'libmediactl',
++     version : meson.project_version(),
++     description : 'v4l2 mediactl library')
+-- 
+2.43.5
+
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
index 52759ef18e..0a3b5d28b6 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb
@@ -26,15 +26,15 @@ 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"
+SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548"
 
-PV .= "+git"
 
-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"
 
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
index 3069528301..87dc7a7be6 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
@@ -2,23 +2,13 @@ SUMMARY = "Yet Another V4L2 Test Application"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
 
-SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \
+SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \
           "
-SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a"
+SRCREV = "52c975e5542504ac10bed8b1d68df5c75951d202"
 
 PV = "0.0"
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "-e MAKEFLAGS="
-
-# The yavta sources include copies of the headers required to build in the
-# include directory.  The Makefile uses CFLAGS to include these, but since
-# we override the CFLAGS then we need to add this include path back in.
-CFLAGS += "-I${S}/include"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 yavta ${D}${bindir}
-}
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 
+inherit meson