subtree updates

meta-arm: 5712422011..1cad3c3813:
  Jon Mason (3):
        arm/pyhsslms: update to 2.0.0
        arm/trusted-firmware-m: update to 2.0.0
        arm/opencsd: update to 1.4.2

  Ross Burton (2):
        arm-bsp/documentation: upgrade Sphinx slightly
        arm/fvp-base-a-aem: upgrade to 11.24.11

  Vikas Katariya (2):
        arm-bsp/n1sdp: Downgrade to 6.1 linux yocto kernel
        arm-bsp/linux-yocto: Remove EOL Linux yocto kernel 6.5

meta-openembedded: 098dc606f9..4dbbef7a39:
  Alex Kiernan (1):
        thin-provisioning-tools: Drop musl fixes (fixed upstream)

  Derek Straka (9):
        python3-web3: update to version 6.14.0
        python3-engineio: update to version 4.8.2
        python3-marshmallow: update to version 3.20.2
        python3-apispec: update to version 6.4.0
        python3-protobuf: update to version 4.25.1
        python3-eth-hash: update to version 0.6.0
        python3-google-auth: update to version 2.26.2
        python3-socketio: update to version 5.11.0
        python3-google-api-python-client: update to version 2.113.0

  Fabio Estevam (1):
        v4l-utils: Update to 1.26.1

  Jörg Sommer (1):
        i2cdev: Fix MUSL build

  Khem Raj (7):
        thunar: inherit gtk-doc
        libxklavier: inherit gtk-doc
        libwnck: inherit gtk-doc
        schroedinger: inherit gtk-doc
        gst-shark: inherit gtk-doc
        evolution-data-server: Use inherit_defer for native class
        opencl-icd: Rename rdepends to virtual-opencl-icd

  Markus Volk (2):
        flatpak: fix gtk-doc build
        gvfs: drop gnome-keyring rdepend

  Peter Marko (1):
        grpc: correct dependencies

  Randy MacLeod (1):
        rng-tools: move from oe-core to meta-oe

  Ross Burton (9):
        libuser: fix gtk-doc configure call
        libuser: remove obsolete GTKDOC_DOCDIR assignment
        gtksourceview4: remove check for target gtk-doc
        gtksourceview4: remove obsolete workaround for build failures
        telepathy-glib: inherit gtk-doc
        glade: inherit gtk-doc, fix FILES
        libgxim: inherit gtk-doc
        gmime: inherit gtk-doc
        raptor2: inherit gtk-doc

  Wang Mingyu (3):
        frr: use update-alternatives for ietf-interfaces.yang
        libsmi: use update-alternatives for ietf-interfaces.yang
        frr: Fix install conflict when enable multilib.

  alperak (1):
        adcli: use https protocol for fetching

poky: 61182659c2..7af374c90c:
  Alexander Kanavin (3):
        glib-2.0: ensure GI_DATA_ENABLED is set
        gobject-introspection-data.bbclass: move do_compile() tweak to g-i class
        python: update 3.11.5 -> 3.12.1

  Alexander Sverdlin (2):
        linux-firmware: upgrade 20231030 -> 20231211
        linux-firmware: package PowerVR firmware

  André Draszik (1):
        linux-firmware: split out rockchip/dptx firmware

  Changhyeok Bae (1):
        iw: upgrade 5.19 -> 6.7

  Etienne Cordonnier (3):
        package.py: fix Darwin support
        chrpath.bbclass: fix Darwin support
        siteinfo.bbclass: add support for darwin19 and darwin21

  Fabio Estevam (2):
        mesa: Upgrade 23.3.2 -> 23.3.3
        libdrm: Upgrade to 2.4.120

  Joe Slater (1):
        init-ifupdown: add predictable interface names

  Kai Kang (1):
        xserver-xorg: 21.1.9 -> 21.1.11

  Khem Raj (3):
        webkitgtk: Workaround for clang compiler segfault
        mdadm: Disable 10ddf-fail-spare and 10ddf-fail-stop-readd testcases
        openssl: Fix build on riscv

  Ola x Nilsson (2):
        insane.bbclass: Check for adjtime in check_32_bit_symbols
        insane.bbclass: Python code cleanup in check_32bit_symbols

  Petr Vorel (1):
        iputils: update to 20240117

  Randy MacLeod (2):
        rng-tools: move to meta-oe
        rng-tools: Revert "rng-tools: move to meta-oe"

  Richard Purdie (13):
        bitbake: ast/BBHandler: Add inherit_defer support
        allarch: Fix allarch corner case
        rootfs: Fix MULTILIB_RE_ALLOW to be inherit order independent
        rootfs-postcommands: Try and improve ordering constraints
        classes/recipes: Switch to use inherit_defer
        libtool: Update patches to mark as backports
        libtool: Update nios2 patch to match upstream merged version
        libtool: Update prefixmap and clang patches to match upstream submission
        libtool: Update cleanup sysroot handling patch
        libtool: Update patch offsets
        libtool: Update further patch status to backport
        reproducible: Fix race with externalsrc/devtool over lockfile
        build-appliance-image: Update to master head revision

  Ross Burton (4):
        musl: doesn't support riscv32
        libunwind: merge .inc and .bb
        libunwind: refresh patches
        libunwind: clean up configuration

  Simone Weiß (1):
        classes-global/insane: Add check for "virtual/" in RPROVIDES and RDEPENDS

  Tim Orling (1):
        python3-alabaster: upgrade 0.7.13 -> 0.7.16

  Trevor Woerner (1):
        bmaptool: add 3 fixes

  Vyacheslav Yurkov (9):
        recipetool: Don't fail on local go modules
        classes: go-vendor: Reference local modules
        classes: go-vendor: Handle modules from the same repo
        classes: go-vendor: Unlink vendor dir later
        recipetool: Proceed even with a missing license file
        recipetool: Disregard version in URL for replaced modules
        oeqa/selftest/recipetool: Move create_go test to a proper class
        oeqa/selftest/recipetool: Move helper function to the class scope
        oeqa/selftest/recipetool: Add test coverage for local go modules

  Wang Mingyu (22):
        mpg123: upgrade 1.32.3 -> 1.32.4
        bind: upgrade 9.18.20 -> 9.18.21
        iproute2: upgrade 6.6.0 -> 6.7.0
        kexec-tools: upgrade 2.0.27 -> 2.0.28
        libbsd: upgrade 0.11.7 -> 0.11.8
        libxmlb: upgrade 0.3.14 -> 0.3.15
        nghttp2: upgrade 1.57.0 -> 1.58.0
        ofono: upgrade 2.2 -> 2.3
        python3-numpy: upgrade 1.26.2 -> 1.26.3
        vte: upgrade 0.74.1 -> 0.74.2
        python3-cython: upgrade 3.0.7 -> 3.0.8
        python3-git: upgrade 3.1.40 -> 3.1.41
        python3-hypothesis: upgrade 6.92.2 -> 6.92.9
        python3-jinja2: upgrade 3.1.2 -> 3.1.3
        python3-markdown: upgrade 3.5 -> 3.5.2
        python3-more-itertools: upgrade 10.1.0 -> 10.2.0
        python3-pycryptodome: upgrade 3.19.1 -> 3.20.0
        python3-pycryptodomex: upgrade 3.19.1 -> 3.20.0
        python3-trove-classifiers: upgrade 2023.11.29 -> 2024.1.8
        stress-ng: upgrade 0.17.03 -> 0.17.04
        virglrenderer: upgrade 1.0.0 -> 1.0.1
        xz: upgrade 5.4.4 -> 5.4.5

Change-Id: I9581526d3addb54889dd73268e672c2d84345f3e
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
deleted file mode 100644
index 52f0cd3..0000000
--- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0d5c0e9a75eca43667b0e29155b635e50622b66a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 27 Feb 2015 21:55:36 +0000
-Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and
-
- libv4l2subdev"
-
-This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Conflicts:
-	utils/media-ctl/Makefile.am
-
----
-Upstream-Status: Pending
-
- utils/media-ctl/Makefile.am | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
-index c48c8d6..e255e16 100644
---- a/utils/media-ctl/Makefile.am
-+++ b/utils/media-ctl/Makefile.am
-@@ -1,8 +1,7 @@
--noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la
--
-+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la
- libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h
--libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS)
--libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS)
-+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS)
-+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS)
- 
- media-bus-format-names.h: ../../include/linux/media-bus-format.h
- 	$(AM_V_GEN) sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
-@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES)
- nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES)
- libv4l2subdev_la_SOURCES = libv4l2subdev.c
- libv4l2subdev_la_LIBADD = libmediactl.la
--libv4l2subdev_la_CFLAGS = -static
--libv4l2subdev_la_LDFLAGS = -static
--
- mediactl_includedir=$(includedir)/mediactl
- noinst_HEADERS = mediactl.h v4l2subdev.h
- 
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
new file mode 100644
index 0000000..64c01e4
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch
@@ -0,0 +1,46 @@
+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-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch
deleted file mode 100644
index d524759..0000000
--- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 1 Mar 2015 22:25:07 +0000
-Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch
-
----
-Upstream-Status: Pending
-
- utils/media-ctl/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
-index e255e16..ff7b417 100644
---- a/utils/media-ctl/Makefile.am
-+++ b/utils/media-ctl/Makefile.am
-@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la
- mediactl_includedir=$(includedir)/mediactl
- noinst_HEADERS = mediactl.h v4l2subdev.h
- 
-+pkgconfig_DATA = libmediactl.pc
- bin_PROGRAMS = media-ctl
- media_ctl_SOURCES = media-ctl.c options.c options.h tools.h
- media_ctl_LDADD = libmediactl.la libv4l2subdev.la
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch
deleted file mode 100644
index f6fcee9..0000000
--- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 1 Mar 2015 22:25:07 +0000
-Subject: [PATCH] %% original patch: export-mediactl-headers.patch
-
----
-Upstream-Status: Pending
-
- utils/media-ctl/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
-index ff7b417..6ce656f 100644
---- a/utils/media-ctl/Makefile.am
-+++ b/utils/media-ctl/Makefile.am
-@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES)
- nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES)
- libv4l2subdev_la_SOURCES = libv4l2subdev.c
- libv4l2subdev_la_LIBADD = libmediactl.la
--mediactl_includedir=$(includedir)/mediactl
--noinst_HEADERS = mediactl.h v4l2subdev.h
-+otherincludedir = $(includedir)/mediactl
-+otherinclude_HEADERS = mediactl.h v4l2subdev.h
- 
- pkgconfig_DATA = libmediactl.pc
- bin_PROGRAMS = media-ctl
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
similarity index 77%
rename from meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
index f314d9b..4ae1a18 100644
--- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.24.1.bb
+++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb
@@ -18,34 +18,30 @@
 # Needs further investigation
 GLIBC_64BIT_TIME_FLAGS = ""
 
-inherit autotools gettext pkgconfig
+inherit meson gettext pkgconfig
 
-PACKAGECONFIG ??= "media-ctl"
-PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,,"
-PACKAGECONFIG[qv4l2] = ",--disable-qv4l2"
-PACKAGECONFIG[qvidcap] = ",--disable-qvidcap"
-PACKAGECONFIG[v4l2-tracer] = ",--disable-v4l2-tracer,json-c"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled"
+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.24 \
-    file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \
-    file://0002-original-patch-mediactl-pkgconfig.patch \
-    file://0003-original-patch-export-mediactl-headers.patch \
+    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 \
     file://0004-Do-not-use-getsubopt.patch \
 "
 
-SRCREV = "8799081b143627c9c09dea0c60ad3d1cc17cc848"
+SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1"
 
 PV .= "+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-do_configure:prepend() {
-    cd ${S}; ./bootstrap.sh; cd -
-}
+EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false"
 
-EXTRA_OECONF = "--enable-shared --with-udevdir=${base_libdir}/udev \
-                --disable-v4l2-compliance-32 --disable-v4l2-ctl-32"
+# Disable the erroneous installation of gconv-modules that would break glib
+# like it is done in Debian and ArchLinux.
+EXTRA_OEMESON += "-Dgconv=disabled"
 
 VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps"