[PATCH 01/34] selftest: always tweak ERROR_QA/WARN_QA per package

[PATCH 01/34] selftest: always tweak ERROR_QA/WARN_QA per package

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Globally changing it completely destroys sstate reuse, as seen for example here:
https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/3763/steps/14/logs/stdio

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/selftest/cases/buildoptions.py     | 6 +++---
 meta/lib/oeqa/selftest/cases/incompatible_lic.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 31dafaa9c50..4b6f89d8cb6 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -84,7 +84,7 @@ class SanityOptionsTest(OESelftestTestCase):
 
         self.write_config("INHERIT:remove = \"report-error\"")
         if "packages-list" not in get_bb_var("ERROR_QA"):
-            self.append_config("ERROR_QA:append = \" packages-list\"")
+            self.append_config("ERROR_QA:append:pn-xcursor-transparent-theme = \" packages-list\"")
 
         self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
         self.add_command_to_tearDown('bitbake -c clean xcursor-transparent-theme')
@@ -94,8 +94,8 @@ class SanityOptionsTest(OESelftestTestCase):
         self.assertTrue(line and line.startswith("ERROR:"), msg=res.output)
         self.assertEqual(res.status, 1, msg = "bitbake reported exit code %s. It should have been 1. Bitbake output: %s" % (str(res.status), res.output))
         self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
-        self.append_config('ERROR_QA:remove = "packages-list"')
-        self.append_config('WARN_QA:append = " packages-list"')
+        self.append_config('ERROR_QA:remove:pn-xcursor-transparent-theme = "packages-list"')
+        self.append_config('WARN_QA:append:pn-xcursor-transparent-theme = " packages-list"')
         res = bitbake("xcursor-transparent-theme -f -c package")
         self.delete_recipeinc('xcursor-transparent-theme')
         line = self.getline(res, "QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors.")
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 439c1b9f0ec..be5484bca49 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -114,7 +114,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*"
 
     def test_bash_and_license(self):
         self.disable_class("create-spdx")
-        self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"\nERROR_QA:remove = "license-exists"')
+        self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"\nERROR_QA:remove:pn-bash = "license-exists"')
         error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later"
 
         result = bitbake('core-image-minimal', ignore_status=True)
@@ -123,12 +123,12 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*"
 
     def test_bash_or_license(self):
         self.disable_class("create-spdx")
-        self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"\nERROR_QA:remove = "license-exists license-file-missing"')
+        self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"\nERROR_QA:remove:pn-bash = "license-exists"\nERROR_QA:remove:pn-core-image-minimal = "license-file-missing"')
 
         bitbake('core-image-minimal')
 
     def test_bash_license_exceptions(self):
-        self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove = "license-exception"')
+        self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove:pn-core-image-minimal = "license-exception"')
 
         bitbake('core-image-minimal')
 
-- 
2.39.2

[PATCH 02/34] selftest: use INIT_MANAGER to enable systemd instead of custom settings

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

This is already done in most of selftest; these two were the last
holdouts I could fine.

Hopefully this improves sstate reuse as well.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 7 +------
 meta/lib/oeqa/selftest/cases/runtime_test.py  | 5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 74811d2c0aa..94d01ba1165 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -250,12 +250,7 @@ USERADD_GID_TABLES += "files/static-group"
 DISTRO_FEATURES:append = " pam opengl wayland"
 
 # Switch to systemd
-DISTRO_FEATURES:append = " systemd usrmerge"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-VIRTUAL-RUNTIME_initscripts = ""
-VIRTUAL-RUNTIME_syslog = ""
-VIRTUAL-RUNTIME_login_manager = "shadow-base"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+INIT_MANAGER = "systemd"
 
 # Replace busybox
 PREFERRED_PROVIDER_virtual/base-utils = "packagegroup-core-base-utils"
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py
index 13aa5f16c9b..27090ae5cd9 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -310,10 +310,7 @@ class Postinst(OESelftestTestCase):
                 features += 'IMAGE_FEATURES += "package-management empty-root-password"\n'
                 features += 'PACKAGE_CLASSES = "%s"\n' % classes
                 if init_manager == "systemd":
-                    features += 'DISTRO_FEATURES:append = " systemd usrmerge"\n'
-                    features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
-                    features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n'
-                    features += 'VIRTUAL-RUNTIME_initscripts = ""\n'
+                    features += 'INIT_MANAGER = "systemd"\n'
                 self.write_config(features)
 
                 bitbake('core-image-minimal')
-- 
2.39.2

[PATCH 03/34] xmlto: check upstream version tags, not new commits

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

With 0.0.29 upstream is tagging versions again.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/xmlto/xmlto_0.0.29.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
index 4e969fc12f4..1415e5d781c 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
@@ -7,7 +7,6 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 SRCREV = "74862a684907ada3d4ed2ce0f8111adf626e1456"
-UPSTREAM_CHECK_COMMITS = "1"
 SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
 S = "${WORKDIR}/git"
 
-- 
2.39.2

[PATCH 04/34] glib-2.0: update 2.80.2 -> 2.80.4

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop backport 0001-girepository-introspection-correctly-install-.gir-fi.patch

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...t-write-bindir-into-pkg-config-files.patch |  2 +-
 ...0001-Fix-DATADIRNAME-on-uclibc-Linux.patch |  2 +-
 ...-gio-querymodules-as-libexec_PROGRAM.patch |  2 +-
 ...ng-about-deprecated-paths-in-schemas.patch |  2 +-
 ...ces.c-comment-out-a-build-host-only-.patch |  2 +-
 ...rospection-correctly-install-.gir-fi.patch | 88 -------------------
 ...on-Run-atomics-test-on-clang-as-well.patch |  6 +-
 ...ot-enable-pidfd-features-on-native-g.patch |  6 +-
 ...dcode-python-path-into-various-tools.patch |  2 +-
 .../glib-2.0/files/relocate-modules.patch     |  2 +-
 .../glib-2.0/files/skip-timeout.patch         |  2 +-
 ...l_2.80.2.bb => glib-2.0-initial_2.80.4.bb} |  0
 ...{glib-2.0_2.80.2.bb => glib-2.0_2.80.4.bb} |  0
 meta/recipes-core/glib-2.0/glib.inc           |  3 +-
 14 files changed, 15 insertions(+), 104 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0-initial_2.80.2.bb => glib-2.0-initial_2.80.4.bb} (100%)
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.80.2.bb => glib-2.0_2.80.4.bb} (100%)

diff --git a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
index 10568b7c9fe..ae140b9930b 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 10b08af6c7dcb03f954da29b6c4f9636b8796f30 Mon Sep 17 00:00:00 2001
+From bcf62c2e776b9716880ac65e5d553d75d5fddc2e Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 15 Feb 2019 11:17:27 +0100
 Subject: [PATCH] Do not prefix executables with $bindir in pkg-config files
diff --git a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
index b9c9706fc46..6da93995696 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
@@ -1,4 +1,4 @@
-From 55c49c51d8db5af15132653003d2b65a5215eebf Mon Sep 17 00:00:00 2001
+From 1d88f52c42a0ed469cb5976f5788b4ba25bb14f9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 15 Mar 2014 22:42:29 -0700
 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
diff --git a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
index bc539fe3e88..8423f63cbbb 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
@@ -1,4 +1,4 @@
-From 53333cf3ec787cb7e60585237327390e2ca89f4c Mon Sep 17 00:00:00 2001
+From 75f9eaf2ef760ffb198b0b97a9054f435c79cde9 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Tue, 22 Mar 2016 15:14:58 +0200
 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
diff --git a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
index 5e543339d8c..bd7ed776423 100644
--- a/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
@@ -1,4 +1,4 @@
-From 3db055ce8029372096be534c5cfc385f068bab17 Mon Sep 17 00:00:00 2001
+From 22dcd727203d59a025c8be4280b4654a7054322f Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 12 Jun 2015 17:08:46 +0300
 Subject: [PATCH] Remove the warning about deprecated paths in schemas
diff --git a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
index aa7127b65b7..8b4304462e6 100644
--- a/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
@@ -1,4 +1,4 @@
-From 97b4f18c65c52c9e6412ecf8affc22f6f42d3465 Mon Sep 17 00:00:00 2001
+From 3f054111f991a9dd224b6201dafad7e2c28cb78d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 8 Jan 2020 18:22:46 +0100
 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
diff --git a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch b/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
deleted file mode 100644
index 7be9cd8b845..00000000000
--- a/meta/recipes-core/glib-2.0/files/0001-girepository-introspection-correctly-install-.gir-fi.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From f1beef5c2d09fae3a5e5a314f984cb3f20abe732 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 23 Apr 2024 11:24:34 +0200
-Subject: [PATCH] girepository/introspection: correctly install .gir files into
- custom locations provided via meson option
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4020]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- girepository/introspection/meson.build | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/girepository/introspection/meson.build b/girepository/introspection/meson.build
-index 9405686..862ca61 100644
---- a/girepository/introspection/meson.build
-+++ b/girepository/introspection/meson.build
-@@ -49,6 +49,7 @@ glib_gir = gnome.generate_gir(libglib,
-   export_packages: 'glib-2.0',
-   header: 'glib.h',
-   install: true,
-+  install_dir_gir: glib_girdir,
-   dependencies: [
-     libgobject_dep,
-   ],
-@@ -76,6 +77,7 @@ if host_system == 'windows'
-     header: 'glib.h',
-     includes: [ glib_gir[0] ],
-     install: true,
-+    install_dir_gir: glib_girdir,
-     dependencies: [
-       libgobject_dep,
-     ],
-@@ -104,6 +106,7 @@ else
-     header: 'glib.h',
-     includes: [ glib_gir[0] ],
-     install: true,
-+    install_dir_gir: glib_girdir,
-     dependencies: [
-       libgobject_dep,
-     ],
-@@ -137,6 +140,7 @@ gobject_gir = gnome.generate_gir(libgobject,
-   header: 'glib-object.h',
-   includes: [ glib_gir[0] ],
-   install: true,
-+  install_dir_gir: glib_girdir,
-   env: gi_gen_env_variables,
-   extra_args: gir_args + [
-       '-DGOBJECT_COMPILATION',
-@@ -162,6 +166,7 @@ gmodule_gir = gnome.generate_gir(libgmodule,
-   header: 'gmodule.h',
-   includes: [ glib_gir[0] ],
-   install: true,
-+  install_dir_gir: glib_girdir,
-   dependencies: [
-     libglib_dep,
-   ],
-@@ -224,6 +229,7 @@ gio_gir = gnome.generate_gir(libgio,
-   header: 'gio/gio.h',
-   includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0] ],
-   install: true,
-+  install_dir_gir: glib_girdir,
-   dependencies: [
-     libglib_dep,
-     libgobject_dep,
-@@ -249,6 +255,7 @@ if host_system == 'windows'
-     header: 'gio/gio.h',
-     includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
-     install: true,
-+    install_dir_gir: glib_girdir,
-     dependencies: [
-       libglib_dep,
-       libgobject_dep,
-@@ -277,6 +284,7 @@ else
-     header: 'gio/gio.h',
-     includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
-     install: true,
-+    install_dir_gir: glib_girdir,
-     dependencies: [
-       libglib_dep,
-       libgobject_dep,
-@@ -314,6 +322,7 @@ girepository_gir = gnome.generate_gir(libgirepository,
-   header: 'girepository/girepository.h',
-   includes: [ glib_gir[0], gmodule_gir[0], gobject_gir[0], gio_gir[0] ],
-   install: true,
-+  install_dir_gir: glib_girdir,
-   dependencies: [ libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep ],
-   extra_args: gir_args + libgirepository_gir_args,
- )
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
index 3a8d3596b0d..ea1ab568d18 100644
--- a/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-meson-Run-atomics-test-on-clang-as-well.patch
@@ -1,4 +1,4 @@
-From f04ea29f9f96892ada81bd0acfcef70183138229 Mon Sep 17 00:00:00 2001
+From de3eabf9295816b4b4eb7428dee504fd505e723d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 12 Oct 2019 17:46:26 -0700
 Subject: [PATCH] meson: Run atomics test on clang as well
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 257afb5..5caa6e6 100644
+index b995ebc..a907736 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2024,7 +2024,7 @@ atomicdefine = '''
+@@ -2021,7 +2021,7 @@ atomicdefine = '''
  # We know that we can always use real ("lock free") atomic operations with MSVC
  if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
    have_atomic_lock_free = true
diff --git a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
index 9be04960aaa..82a7a5ad23d 100644
--- a/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
+++ b/meta/recipes-core/glib-2.0/files/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch
@@ -1,4 +1,4 @@
-From a63c865aa9a24f3230e8e2bcb5bce88f179c7e2b Mon Sep 17 00:00:00 2001
+From 546aa941d2fd42f69b3e2bd6625d65c145a5e265 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Sat, 16 Sep 2023 22:28:27 +0200
 Subject: [PATCH] meson.build: do not enable pidfd features on native glib
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 5caa6e6..688f214 100644
+index a907736..53cffb5 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1022,7 +1022,8 @@ if cc.links('''#include <sys/syscall.h>
+@@ -1019,7 +1019,8 @@ if cc.links('''#include <sys/syscall.h>
                   waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG);
                   return 0;
                 }''', name : 'pidfd_open(2) system call')
diff --git a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
index 4dec252c1f0..30a6bd4c3ad 100644
--- a/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
+++ b/meta/recipes-core/glib-2.0/files/0010-Do-not-hardcode-python-path-into-various-tools.patch
@@ -1,4 +1,4 @@
-From dc7f09c4f52638a70768c528d186da6f83dedc97 Mon Sep 17 00:00:00 2001
+From 20f64ba4b48e46cf238dc638dc3305036358122b Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 3 Oct 2017 10:45:55 +0300
 Subject: [PATCH] Do not hardcode python path into various tools
diff --git a/meta/recipes-core/glib-2.0/files/relocate-modules.patch b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
index a1ff198aa65..a00703cef8b 100644
--- a/meta/recipes-core/glib-2.0/files/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/files/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 0133aeabd37a9137722abd86039d7d0797b5896f Mon Sep 17 00:00:00 2001
+From 41470a56d9ae12912e3f2f9cfb0c126b4f91cd53 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/files/skip-timeout.patch b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
index 0f8b51294ba..5ede64fd59f 100644
--- a/meta/recipes-core/glib-2.0/files/skip-timeout.patch
+++ b/meta/recipes-core/glib-2.0/files/skip-timeout.patch
@@ -1,4 +1,4 @@
-From ac75f5d9206e52eec64fef0db4cd91b58a764c99 Mon Sep 17 00:00:00 2001
+From 18d6798ba0e4e15d63a63485b729b6ef1b6a4457 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Thu, 28 Mar 2024 16:27:09 +0000
 Subject: [PATCH] Skip /timeout/rounding test
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.2.bb b/meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0-initial_2.80.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.80.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb
similarity index 100%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.80.2.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.80.4.bb
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 690d1c162cb..9e742c4d3bf 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -226,13 +226,12 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
            file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
            file://skip-timeout.patch \
-           file://0001-girepository-introspection-correctly-install-.gir-fi.patch \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch \ 
                                 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
                               "
 
-SRC_URI[sha256sum] = "b9cfb6f7a5bd5b31238fd5d56df226b2dda5ea37611475bf89f6a0f9400fe8bd"
+SRC_URI[sha256sum] = "24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
-- 
2.39.2

[PATCH 05/34] lttng-modules: update 2.13.13 -> 2.13.14

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Remove backports.

License-update: changed file paths.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...01-Fix-kfree_skb-changed-in-6.11-rc1.patch |  11 +-
 ...mplify-delayed-ref-tracepoints-v6.10.patch | 142 ------------------
 ...c-pass-files_struct-instead-of-fdtab.patch |  79 ----------
 ...e-missing-CONFIG_TRACEPOINTS-to-warn.patch |  12 +-
 ...da_reserve_space-changed-in-6.11-rc1.patch |  11 +-
 ...arent-and-ref_root-into-btrfs_delaye.patch |  58 -------
 ...emoved-from-btrfs_get_extent-in-6.11.patch |  11 +-
 ...IP-port-data-to-the-tracepoint-udp-u.patch |  79 ----------
 ...moved-frmo-btrfs_get_extent-in-6.11-.patch |  11 +-
 ...removed-from-btrfs_get_extent-in-6.1.patch |  12 +-
 ...omic-write-support-added-in-6.11-rc1.patch |  11 +-
 ...es_2.13.13.bb => lttng-modules_2.13.14.bb} |  10 +-
 12 files changed, 33 insertions(+), 414 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
 delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
 rename meta/recipes-kernel/lttng/{lttng-modules_2.13.13.bb => lttng-modules_2.13.14.bb} (78%)

diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch
index 83b753994ef..36bf697c516 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-Fix-kfree_skb-changed-in-6.11-rc1.patch
@@ -1,7 +1,7 @@
-From 9706d0431c9cc4178db4cf630fee6f5f85f2543e Mon Sep 17 00:00:00 2001
+From a06c63b0360cbe1a7c8073461b9cf088234875f7 Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:01:18 +0000
-Subject: [PATCH 1/6] Fix: kfree_skb changed in 6.11-rc1
+Subject: [PATCH] Fix: kfree_skb changed in 6.11-rc1
 
 See upstream commit:
 
@@ -30,10 +30,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 19 insertions(+), 1 deletion(-)
 
 diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
-index edfda7ff..0b5a95dc 100644
+index 9f1047c..5556ab6 100644
 --- a/include/instrumentation/events/skb.h
 +++ b/include/instrumentation/events/skb.h
-@@ -43,7 +43,25 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
+@@ -40,7 +40,25 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
  )
  #endif
  
@@ -60,6 +60,3 @@ index edfda7ff..0b5a95dc 100644
  	|| LTTNG_KERNEL_RANGE(5,15,58, 5,16,0) \
  	|| LTTNG_RHEL_KERNEL_RANGE(5,14,0,70,0,0, 5,15,0,0,0,0) \
  	|| LTTNG_RHEL_KERNEL_RANGE(4,18,0,477,10,1, 4,19,0,0,0,0))
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
deleted file mode 100644
index c1e11f2bfb6..00000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From db0f940136afd43ce5fcf87c4d4e9ca558db1d4f Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 27 May 2024 13:04:42 -0400
-Subject: [PATCH 1/3] fix: btrfs: simplify delayed ref tracepoints (v6.10)
-
-See upstream commit:
-
-  commit 1bff6d4f873790cfc675afce9860208576508c5a
-  Author: Josef Bacik <josef@toxicpanda.com>
-  Date:   Fri Apr 12 20:27:00 2024 -0400
-
-    btrfs: simplify delayed ref tracepoints
-
-    Now that all of the delayed ref information is in the delayed ref node,
-    drastically simplify the delayed ref tracepoints by simply passing in
-    the btrfs_delayed_ref_node and populating the tracepoints with the
-    values from the structure itself.
-
-Upstream-Status: Backport [commit db0f9401 fix: btrfs: simplify delayed ref tracepoints (v6.10)]
-
-Change-Id: Ic90bc23d6aa558baec33adc33b4d21e052e83375
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/instrumentation/events/btrfs.h | 94 +++++++++++++++++++++++++-
- 1 file changed, 92 insertions(+), 2 deletions(-)
-
-diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index ffb1b646..d73c1ce5 100644
---- a/include/instrumentation/events/btrfs.h
-+++ b/include/instrumentation/events/btrfs.h
-@@ -899,7 +899,51 @@ LTTNG_TRACEPOINT_EVENT(btrfs_add_block_group,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref),
-+
-+	TP_FIELDS(
-+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
-+		ctf_integer(u64, bytenr, ref->bytenr)
-+		ctf_integer(u64, num_bytes, ref->num_bytes)
-+		ctf_integer(int, action, ref->action)
-+		ctf_integer(u64, parent, ref->tree_ref.parent)
-+		ctf_integer(u64, ref_root, ref->tree_ref.root)
-+		ctf_integer(int, level, ref->tree_ref.level)
-+		ctf_integer(int, type, ref->type)
-+		ctf_integer(u64, seq, ref->seq)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
-+
-+	add_delayed_tree_ref,
-+
-+	btrfs_add_delayed_tree_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_tree_ref,
-+
-+	run_delayed_tree_ref,
-+
-+	btrfs_run_delayed_tree_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref)
-+)
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
-@@ -1139,7 +1183,53 @@ LTTNG_TRACEPOINT_EVENT(btrfs_delayed_tree_ref,
- )
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
-+LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref),
-+
-+	TP_FIELDS(
-+		ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
-+		ctf_integer(u64, bytenr, ref->bytenr)
-+		ctf_integer(u64, num_bytes, ref->num_bytes)
-+		ctf_integer(int, action, ref->action)
-+		ctf_integer(u64, parent, ref->data_ref.parent)
-+		ctf_integer(u64, ref_root, ref->data_ref.root)
-+		ctf_integer(u64, owner, ref->data_ref.objectid)
-+		ctf_integer(u64, offset, ref->data_ref.offset)
-+		ctf_integer(int, type, ref->type)
-+		ctf_integer(u64, seq, ref->seq)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
-+
-+	add_delayed_data_ref,
-+
-+	btrfs_add_delayed_data_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(btrfs_delayed_data_ref,
-+
-+	run_delayed_data_ref,
-+
-+	btrfs_run_delayed_data_ref,
-+
-+	TP_PROTO(const struct btrfs_fs_info *fs_info,
-+		 const struct btrfs_delayed_ref_node *ref),
-+
-+	TP_ARGS(fs_info, ref)
-+)
-+
-+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
- 	LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
deleted file mode 100644
index bb659d5563a..00000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From c8adc20d19d853527a29411a03e114efdeff5f59 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 27 May 2024 10:49:45 -0400
-Subject: [PATCH] fix: close_on_exec(): pass files_struct instead of fdtable
- (v6.10)
-
-See upstream commit:
-
-  commit f60d374d2cc88034385265d193a38e3f4a4b430c
-  Author: Al Viro <viro@zeniv.linux.org.uk>
-  Date:   Thu Jan 4 21:35:38 2024 -0500
-
-    close_on_exec(): pass files_struct instead of fdtable
-
-    both callers are happier that way...
-
-Upstream-Status: Backport [c8adc20d fix: close_on_exec(): pass files_struct instead of fdtable (v6.10)]
-
-Change-Id: I8cdabb073c2090842b27b74954d86cb486c43b3e
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/wrapper/fdtable.h  | 14 ++++++++++++++
- src/lttng-statedump-impl.c |  3 +--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-Index: lttng-modules-2.13.13/include/wrapper/fdtable.h
-===================================================================
---- lttng-modules-2.13.13.orig/include/wrapper/fdtable.h
-+++ lttng-modules-2.13.13/include/wrapper/fdtable.h
-@@ -69,20 +69,18 @@ int lttng_iterate_fd(struct files_struct
- 
- #endif
- 
--#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
--
--static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
-+static inline
-+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
- {
--	return close_on_exec(fd, fdt);
-+	return close_on_exec(fd, files);
- }
--
- #else
--
--static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
-+static inline
-+bool lttng_close_on_exec(unsigned int fd, const struct files_struct *files)
- {
--	return FD_ISSET(fd, fdt->close_on_exec);
-+	return close_on_exec(fd, files_fdtable(files));
- }
--
- #endif
- 
- #endif /* _LTTNG_WRAPPER_FDTABLE_H */
-Index: lttng-modules-2.13.13/src/lttng-statedump-impl.c
-===================================================================
---- lttng-modules-2.13.13.orig/src/lttng-statedump-impl.c
-+++ lttng-modules-2.13.13/src/lttng-statedump-impl.c
-@@ -44,7 +44,6 @@
- #include <wrapper/tracepoint.h>
- #include <wrapper/genhd.h>
- #include <wrapper/file.h>
--#include <wrapper/fdtable.h>
- #include <wrapper/sched.h>
- 
- #ifdef CONFIG_LTTNG_HAS_LIST_IRQ
-@@ -451,7 +450,7 @@ int lttng_dump_one_fd(const void *p, str
- 	 * the lock is taken, but we are not aware whether this is
- 	 * guaranteed or not, so play safe.
- 	 */
--	if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
-+	if (fd < fdt->max_fds && lttng_close_on_exec(fd, ctx->files))
- 		flags |= O_CLOEXEC;
- 	if (IS_ERR(s)) {
- 		struct dentry *dentry = file->f_path.dentry;
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
index 120528bf9ce..4911982461f 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch
@@ -1,4 +1,4 @@
-From 878f89b6136ff7b870a19e04901cc6f316bbe10a Mon Sep 17 00:00:00 2001
+From 60d423945bd4f4c4b7bfc6f29da9231152d05690 Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <bruce.ashfield@gmail.com>
 Date: Sat, 15 May 2021 10:26:38 -0400
 Subject: [PATCH] src/Kbuild: change missing CONFIG_TRACEPOINTS to warning
@@ -19,10 +19,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  src/Kbuild | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-Index: lttng-modules-2.13.10/src/Kbuild
-===================================================================
---- lttng-modules-2.13.10.orig/src/Kbuild
-+++ lttng-modules-2.13.10/src/Kbuild
+diff --git a/src/Kbuild b/src/Kbuild
+index 7137874..04eb5c9 100644
+--- a/src/Kbuild
++++ b/src/Kbuild
 @@ -2,10 +2,13 @@
  
  ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
@@ -38,7 +38,7 @@ Index: lttng-modules-2.13.10/src/Kbuild
  TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
  
  lttng_check_linux_version = $(shell pwd)/include/linux/version.h
-@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-
+@@ -150,3 +153,5 @@ lttng-statedump-objs := lttng-statedump-impl.o
  obj-$(CONFIG_LTTNG) += probes/
  obj-$(CONFIG_LTTNG) += lib/
  obj-$(CONFIG_LTTNG) += tests/
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch
index 94582cd47bd..e62717baeb4 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch
@@ -1,7 +1,7 @@
-From 7f0f61083a9e88abb289c7575586178739e94955 Mon Sep 17 00:00:00 2001
+From bfb177d2745d19cb56a27c438f4925d6397fbf0b Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:08:32 +0000
-Subject: [PATCH 2/6] Fix: ext4_da_reserve_space changed in 6.11-rc1
+Subject: [PATCH] Fix: ext4_da_reserve_space changed in 6.11-rc1
 
 See upstream commit:
 
@@ -25,10 +25,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h
-index 462b11bf..addf2246 100644
+index 4131803..9f1d4b1 100644
 --- a/include/instrumentation/events/ext4.h
 +++ b/include/instrumentation/events/ext4.h
-@@ -730,7 +730,23 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
+@@ -821,7 +821,23 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
  )
  #endif
  
@@ -53,6 +53,3 @@ index 462b11bf..addf2246 100644
  LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
  	TP_PROTO(struct inode *inode),
  
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
deleted file mode 100644
index 5d0d1fb314f..00000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9bb17e292631f54fb5af4be4fae32ccd3d3d15c7 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 27 May 2024 13:13:15 -0400
-Subject: [PATCH 2/3] fix: btrfs: move ->parent and ->ref_root into
- btrfs_delayed_ref_node (v6.10)
-
-See upstream commit:
-
-  commit cf4f04325b2b27efa5697ba0ea4c1abdee0035b4
-  Author: Josef Bacik <josef@toxicpanda.com>
-  Date:   Fri Apr 12 22:57:13 2024 -0400
-
-    btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node
-
-    These two members are shared by both the tree refs and data refs, so
-    move them into btrfs_delayed_ref_node proper.  This allows us to greatly
-    simplify the comparison code, as the shared refs always only sort on
-    parent, and the non shared refs always sort first on ref_root, and then
-    only data refs sort on their specific fields.
-
-Upstream-Status: Backport [9bb17e29 fix: btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node (v6.10)]
-
-Change-Id: Ib7c92cc4bb8d674ac66ccfa25c03476f7adaaf90
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/instrumentation/events/btrfs.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index d73c1ce5..c0c746e2 100644
---- a/include/instrumentation/events/btrfs.h
-+++ b/include/instrumentation/events/btrfs.h
-@@ -912,8 +912,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
- 		ctf_integer(u64, bytenr, ref->bytenr)
- 		ctf_integer(u64, num_bytes, ref->num_bytes)
- 		ctf_integer(int, action, ref->action)
--		ctf_integer(u64, parent, ref->tree_ref.parent)
--		ctf_integer(u64, ref_root, ref->tree_ref.root)
-+		ctf_integer(u64, parent, ref->parent)
-+		ctf_integer(u64, ref_root, ref->ref_root)
- 		ctf_integer(int, level, ref->tree_ref.level)
- 		ctf_integer(int, type, ref->type)
- 		ctf_integer(u64, seq, ref->seq)
-@@ -1196,8 +1196,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
- 		ctf_integer(u64, bytenr, ref->bytenr)
- 		ctf_integer(u64, num_bytes, ref->num_bytes)
- 		ctf_integer(int, action, ref->action)
--		ctf_integer(u64, parent, ref->data_ref.parent)
--		ctf_integer(u64, ref_root, ref->data_ref.root)
-+		ctf_integer(u64, parent, ref->parent)
-+		ctf_integer(u64, ref_root, ref->ref_root)
- 		ctf_integer(u64, owner, ref->data_ref.objectid)
- 		ctf_integer(u64, offset, ref->data_ref.offset)
- 		ctf_integer(int, type, ref->type)
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch
index 5273efe53ed..4d06ec76e78 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch
@@ -1,7 +1,7 @@
-From aef97cb8d8ce45a9ea02eaedd20c28e4b69f4acf Mon Sep 17 00:00:00 2001
+From 1e4cc8d271117af9262e28a5dd19790a0917818c Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:11:36 +0000
-Subject: [PATCH 3/6] Fix: orig_start removed from btrfs_get_extent in 6.11-rc1
+Subject: [PATCH] Fix: orig_start removed from btrfs_get_extent in 6.11-rc1
 
 See upstream commit:
 
@@ -28,10 +28,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 23 insertions(+), 1 deletion(-)
 
 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index f1b82db4..40139dee 100644
+index c0c746e..dfad19c 100644
 --- a/include/instrumentation/events/btrfs.h
 +++ b/include/instrumentation/events/btrfs.h
-@@ -176,7 +176,29 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
+@@ -177,7 +177,29 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
  )
  #endif
  
@@ -62,6 +62,3 @@ index f1b82db4..40139dee 100644
  
  LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
  
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
deleted file mode 100644
index ab28f870c5b..00000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 4ae0d960e149d1205d0cc167e44c120148c7f4f0 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Mon, 27 May 2024 11:11:21 -0400
-Subject: [PATCH 3/3] fix: net: udp: add IP/port data to the tracepoint
- udp/udp_fail_queue_rcv_skb (v6.10)
-
-See upstream commit:
-
-  commit e9669a00bba79442dd4862c57761333d6a020c24
-  Author: Balazs Scheidler <bazsi77@gmail.com>
-  Date:   Tue Mar 26 19:05:47 2024 +0100
-
-    net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb
-
-    The udp_fail_queue_rcv_skb() tracepoint lacks any details on the source
-    and destination IP/port whereas this information can be critical in case
-    of UDP/syslog.
-
-Upstream-Status: Backport [4ae0d960 fix: net: udp: add IP/port data to the tracepoint udp/udp_fail_queue_rcv_skb (v6.10)]
-
-Change-Id: I0c337c5817b0a120298cbf5088d60671d9625b0d
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
----
- include/instrumentation/events/udp.h | 30 ++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/include/instrumentation/events/udp.h b/include/instrumentation/events/udp.h
-index b63a1bb5..0a94b466 100644
---- a/include/instrumentation/events/udp.h
-+++ b/include/instrumentation/events/udp.h
-@@ -7,7 +7,36 @@
- 
- #include <lttng/tracepoint-event.h>
- #include <linux/udp.h>
-+#include <lttng/kernel-version.h>
- 
-+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,10,0))
-+LTTNG_TRACEPOINT_ENUM(lttng_sk_family,
-+	TP_ENUM_VALUES(
-+		ctf_enum_value("AF_INET", AF_INET)
-+		ctf_enum_value("AF_INET6", AF_INET6)
-+	)
-+)
-+
-+LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
-+
-+	TP_PROTO(int rc, struct sock *sk, struct sk_buff *skb),
-+
-+	TP_ARGS(rc, sk, skb),
-+
-+	TP_FIELDS(
-+		ctf_integer(int, rc, rc)
-+		ctf_integer(__u16, sport, ntohs(udp_hdr(skb)->source))
-+		ctf_integer(__u16, dport, ntohs(udp_hdr(skb)->dest))
-+		ctf_enum(lttng_sk_family, __u16, family, sk->sk_family)
-+		/*
-+		 * The 'saddr' and 'daddr' fields from the upstream tracepoint
-+		 * are currently not extracted. It is recommended to use a
-+		 * tracepoint from the 'net' probe instead which includes all
-+		 * fields from the IP header.
-+		 */
-+	)
-+)
-+#else
- LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
- 
- 	TP_PROTO(int rc, struct sock *sk),
-@@ -19,6 +48,7 @@ LTTNG_TRACEPOINT_EVENT(udp_fail_queue_rcv_skb,
- 		ctf_integer(__u16, lport, inet_sk(sk)->inet_num)
- 	)
- )
-+#endif
- 
- #endif /* LTTNG_TRACE_UDP_H */
- 
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
index 8dab9cac476..c9f48e2f2b2 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
@@ -1,7 +1,7 @@
-From d44bc12d138513eb3d1dae4e66a4d76d7c567212 Mon Sep 17 00:00:00 2001
+From 974125ab11a7f0b4df5658cdac26dc5cf9fdbc87 Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:12:47 +0000
-Subject: [PATCH 4/6] Fix: block_len removed frmo btrfs_get_extent in 6.11-rc1
+Subject: [PATCH] Fix: block_len removed frmo btrfs_get_extent in 6.11-rc1
 
 See upstream commit:
 
@@ -31,10 +31,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index 40139dee..a764fb3b 100644
+index dfad19c..28320d8 100644
 --- a/include/instrumentation/events/btrfs.h
 +++ b/include/instrumentation/events/btrfs.h
-@@ -191,7 +191,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
+@@ -192,7 +192,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
  		ctf_integer(u64, start, map->start)
  		ctf_integer(u64, len, map->len)
  		ctf_integer(u64, block_start, map->block_start)
@@ -42,6 +42,3 @@ index 40139dee..a764fb3b 100644
  		ctf_integer(unsigned int, flags, map->flags)
  		ctf_integer(int, refs, refcount_read(&map->refs))
  		ctf_integer(unsigned int, compress_type, extent_map_compression(map))
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch b/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch
index da933d2f726..86c72cc6502 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch
@@ -1,8 +1,7 @@
-From f2762247871d9340f3cbe7e40f25ceb6dbdb81f1 Mon Sep 17 00:00:00 2001
+From b845e79532c9c28c0108bf556171093236460251 Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:14:24 +0000
-Subject: [PATCH 5/6] Fix: block_start removed from btrfs_get_extent in
- 6.11-rc1
+Subject: [PATCH] Fix: block_start removed from btrfs_get_extent in 6.11-rc1
 
 See upstream commit:
 
@@ -38,10 +37,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
-index a764fb3b..4ceb8e02 100644
+index 28320d8..8fb6866 100644
 --- a/include/instrumentation/events/btrfs.h
 +++ b/include/instrumentation/events/btrfs.h
-@@ -190,7 +190,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
+@@ -191,7 +191,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
  		ctf_integer(u64, ino, btrfs_ino(inode))
  		ctf_integer(u64, start, map->start)
  		ctf_integer(u64, len, map->len)
@@ -49,6 +48,3 @@ index a764fb3b..4ceb8e02 100644
  		ctf_integer(unsigned int, flags, map->flags)
  		ctf_integer(int, refs, refcount_read(&map->refs))
  		ctf_integer(unsigned int, compress_type, extent_map_compression(map))
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch
index 778c7e3b862..2745e6444aa 100644
--- a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch
+++ b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch
@@ -1,7 +1,7 @@
-From 166a05ce64a05218f51563d201644ab3bfddaacc Mon Sep 17 00:00:00 2001
+From d0797fe4bce357d419d2f1f8a3cfe2f8e71ebfdb Mon Sep 17 00:00:00 2001
 From: Kienan Stewart <kstewart@efficios.com>
 Date: Mon, 29 Jul 2024 14:23:02 +0000
-Subject: [PATCH 6/6] Fix: scsi: sd: Atomic write support added in 6.11-rc1
+Subject: [PATCH] Fix: scsi: sd: Atomic write support added in 6.11-rc1
 
 See upstream commit:
 
@@ -90,10 +90,10 @@ Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  1 file changed, 97 insertions(+), 1 deletion(-)
 
 diff --git a/include/instrumentation/events/scsi.h b/include/instrumentation/events/scsi.h
-index de2a1998..175ab003 100644
+index 52c0ebd..54ba3ee 100644
 --- a/include/instrumentation/events/scsi.h
 +++ b/include/instrumentation/events/scsi.h
-@@ -19,7 +19,103 @@
+@@ -16,7 +16,103 @@
  
  #define scsi_opcode_name(opcode)	{ opcode, #opcode }
  
@@ -198,6 +198,3 @@ index de2a1998..175ab003 100644
  	|| LTTNG_SLE_KERNEL_RANGE(4,4,9,36,0,0, 4,5,0,0,0,0))
  
  #define show_opcode_name(val)					\
--- 
-2.39.2
-
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb
similarity index 78%
rename from meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb
index 0363e8be70e..5b1e61f3be1 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.13.13.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.14.bb
@@ -3,29 +3,25 @@ SUMMARY = "Linux Trace Toolkit KERNEL MODULE"
 DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules"
 HOMEPAGE = "https://lttng.org/"
 LICENSE = "LGPL-2.1-only & GPL-2.0-only & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=8d0d9f08888046474772a5d745d89d6a"
 
 inherit module
 
 include lttng-platforms.inc
 
 SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://0001-fix-btrfs-simplify-delayed-ref-tracepoints-v6.10.patch \
-           file://0002-fix-btrfs-move-parent-and-ref_root-into-btrfs_delaye.patch \
-           file://0003-fix-net-udp-add-IP-port-data-to-the-tracepoint-udp-u.patch \
-           file://0001-fix-close_on_exec-pass-files_struct-instead-of-fdtab.patch \
            file://0001-Fix-kfree_skb-changed-in-6.11-rc1.patch \
            file://0002-Fix-ext4_da_reserve_space-changed-in-6.11-rc1.patch \
            file://0003-Fix-orig_start-removed-from-btrfs_get_extent-in-6.11.patch \
            file://0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch \
            file://0005-Fix-block_start-removed-from-btrfs_get_extent-in-6.1.patch \
            file://0006-Fix-scsi-sd-Atomic-write-support-added-in-6.11-rc1.patch \
-        "
+           "
 
 # Use :append here so that the patch is applied also when using devupstream
 SRC_URI:append = " file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch"
 
-SRC_URI[sha256sum] = "7d26c07a5e80b66aa7bdcfdaaf4857f00fc9a5cdde79226b2528676700d50228"
+SRC_URI[sha256sum] = "c6449f7ff12ab644a630692a556304e51525ca37d98aebf826796918be0f5da6"
 
 export INSTALL_MOD_DIR="kernel/lttng-modules"
 
-- 
2.39.2

[PATCH 06/34] automake: update 1.16.5 -> 1.17

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop 0001-Drop-ar-u-argument.patch
(upstream resolved the issue).

Replace forced perl settings with an after-the-fact sed hack
(upstream added more checks to ensure there are no 'tricks' and
I don't want to fight with that).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../automake/0001-Drop-ar-u-argument.patch    | 35 --------
 ...ke-Add-default-libtool_tag-to-cppasm.patch | 12 +--
 ...ate-for-python.m4-to-respect-libdir.patch} | 34 +++++---
 ...3-build-fix-race-in-parallel-builds.patch} | 12 +--
 ...0004-Add-a-new-distro-feature-ptest.patch} | 12 +--
 ...op_builddir-path-in-Makefile-to-acc.patch} | 16 ++--
 ...delays-in-configure-scripts-using-au.patch | 77 +++++++++++++++++
 .../automake/automake/performance.patch       | 82 -------------------
 .../{automake_1.16.5.bb => automake_1.17.bb}  | 20 ++---
 9 files changed, 134 insertions(+), 166 deletions(-)
 delete mode 100644 meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch
 rename meta/recipes-devtools/automake/automake/{0001-automake-Update-for-python.m4-to-respect-libdir.patch => 0002-automake-Update-for-python.m4-to-respect-libdir.patch} (70%)
 rename meta/recipes-devtools/automake/automake/{0001-build-fix-race-in-parallel-builds.patch => 0003-build-fix-race-in-parallel-builds.patch} (89%)
 rename meta/recipes-devtools/automake/automake/{buildtest.patch => 0004-Add-a-new-distro-feature-ptest.patch} (84%)
 rename meta/recipes-devtools/automake/automake/{new_rt_path_for_test-driver.patch => 0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch} (81%)
 create mode 100644 meta/recipes-devtools/automake/automake/0006-automake-Remove-delays-in-configure-scripts-using-au.patch
 delete mode 100644 meta/recipes-devtools/automake/automake/performance.patch
 rename meta/recipes-devtools/automake/{automake_1.16.5.bb => automake_1.17.bb} (56%)

diff --git a/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch b/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch
deleted file mode 100644
index f72788c3a6f..00000000000
--- a/meta/recipes-devtools/automake/automake/0001-Drop-ar-u-argument.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bed646918bc67e9e2151ccbda03aae34717821fe Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei.gherzan@huawei.com>
-Date: Wed, 20 Apr 2022 14:57:14 +0200
-Subject: [PATCH] Drop ar 'u' argument
-
-binutils/ar is configured in deterministic mode by default making the
-'u' argument irrelevant while leading to warning massages similar to:
-
-| ar: `u' modifier ignored since `D' is the default (see `U')
-
-We also add 'D' flag explicitely to not rely in the default configuration
-for reproducible archives.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 92bcebe..0f2b84b 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -2678,7 +2678,7 @@ sub handle_libraries ()
-     }
- 
-   define_variable ('AR', 'ar', INTERNAL);
--  define_variable ('ARFLAGS', 'cru', INTERNAL);
-+  define_variable ('ARFLAGS', 'crD', INTERNAL);
-   define_verbose_tagvar ('AR');
- 
-   foreach my $pair (@liblist)
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
index deb1d03503d..9608b5db444 100644
--- a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
+++ b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
@@ -1,23 +1,22 @@
-From b3c6e1971786cd93a2e3017c92bfbfe96baaf2f7 Mon Sep 17 00:00:00 2001
+From 2884ad2aa8b51cbba25a376935151a242f488e30 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 26 Jul 2017 11:19:56 -0700
-Subject: [PATCH] automake: Add default libtool_tag to cppasm.
+Subject: [PATCH 1/6] automake: Add default libtool_tag to cppasm.
 
     * bin/automake.in (register_language): Define default libtool tag to be CC
     since CPPASCOMPILE is using CC to call assembler
 
 Upstream-Status: Submitted
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  bin/automake.in | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/bin/automake.in b/bin/automake.in
-index 3a66965..08ba09a 100644
+index a17f452..18626de 100644
 --- a/bin/automake.in
 +++ b/bin/automake.in
-@@ -898,6 +898,7 @@ register_language ('name' => 'cppasm',
+@@ -897,6 +897,7 @@ register_language ('name' => 'cppasm',
                     'libtool_tag' => 'CC',
  		   'compile_flag' => '-c',
  		   'output_flag' => '-o',
@@ -25,3 +24,6 @@ index 3a66965..08ba09a 100644
  		   'extensions' => ['.S', '.sx']);
  
  # Fortran 77
+-- 
+2.39.2
+
diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch b/meta/recipes-devtools/automake/automake/0002-automake-Update-for-python.m4-to-respect-libdir.patch
similarity index 70%
rename from meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch
rename to meta/recipes-devtools/automake/automake/0002-automake-Update-for-python.m4-to-respect-libdir.patch
index d28045618e1..308a7d075d4 100644
--- a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/0002-automake-Update-for-python.m4-to-respect-libdir.patch
@@ -1,7 +1,7 @@
-From dff74c5b19935cc11b30116a7ae9c8affdff246b Mon Sep 17 00:00:00 2001
+From 05194070775b597829abfa0d9a5f96d19cc064b8 Mon Sep 17 00:00:00 2001
 From: Kumar Gala <galak@kernel.crashing.org>
 Date: Thu, 11 Aug 2011 01:26:33 -0500
-Subject: [PATCH] automake: Update for python.m4 to respect libdir
+Subject: [PATCH 2/6] automake: Update for python.m4 to respect libdir
 
 Upstream-Status: Inappropriate [embedded specific]
 
@@ -12,14 +12,14 @@ Updated for automake-1.12.6
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
- m4/python.m4 | 24 ++++++------------------
- 1 file changed, 6 insertions(+), 18 deletions(-)
+ m4/python.m4 | 32 ++++++--------------------------
+ 1 file changed, 6 insertions(+), 26 deletions(-)
 
 diff --git a/m4/python.m4 b/m4/python.m4
-index 4e7de9427..40fc5b396 100644
+index 0b1db26..07db0eb 100644
 --- a/m4/python.m4
 +++ b/m4/python.m4
-@@ -96,6 +96,8 @@ AC_DEFUN([AM_PATH_PYTHON],
+@@ -99,6 +99,8 @@ AC_DEFUN([AM_PATH_PYTHON],
      [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`])
    AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
  
@@ -28,14 +28,18 @@ index 4e7de9427..40fc5b396 100644
    dnl At times, e.g., when building shared libraries, you may want
    dnl to know which OS platform Python thinks this is.
    dnl
-@@ -251,14 +253,7 @@ except ImportError:
+@@ -268,18 +270,7 @@ except ImportError:
     else
       am_py_prefix=$am_cv_python_prefix
     fi
 -   am_cv_python_pythondir=`$PYTHON -c "
 -$am_python_setup_sysconfig
 -if can_use_sysconfig:
--  sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+-  try:
+-    $am_python_setup_scheme
+-    sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'})
+-  except:
+-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
 -else:
 -  from distutils import sysconfig
 -  sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
@@ -44,7 +48,7 @@ index 4e7de9427..40fc5b396 100644
     #
     case $am_cv_python_pythondir in
     $am_py_prefix*)
-@@ -268,7 +263,7 @@ sys.stdout.write(sitedir)"`
+@@ -289,7 +280,7 @@ sys.stdout.write(sitedir)"`
     *)
       case $am_py_prefix in
         /usr|/System*) ;;
@@ -53,14 +57,18 @@ index 4e7de9427..40fc5b396 100644
            ;;
       esac
       ;;
-@@ -293,14 +288,7 @@ sys.stdout.write(sitedir)"`
+@@ -315,18 +306,7 @@ sys.stdout.write(sitedir)"`
     else
       am_py_exec_prefix=$am_cv_python_exec_prefix
     fi
 -   am_cv_python_pyexecdir=`$PYTHON -c "
 -$am_python_setup_sysconfig
 -if can_use_sysconfig:
--  sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
+-  try:
+-    $am_python_setup_scheme
+-    sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'})
+-  except:
+-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'})
 -else:
 -  from distutils import sysconfig
 -  sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix')
@@ -69,7 +77,7 @@ index 4e7de9427..40fc5b396 100644
     #
     case $am_cv_python_pyexecdir in
     $am_py_exec_prefix*)
-@@ -310,7 +298,7 @@ sys.stdout.write(sitedir)"`
+@@ -336,7 +316,7 @@ sys.stdout.write(sitedir)"`
     *)
       case $am_py_exec_prefix in
         /usr|/System*) ;;
@@ -79,5 +87,5 @@ index 4e7de9427..40fc5b396 100644
       esac
       ;;
 -- 
-2.20.1
+2.39.2
 
diff --git a/meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch b/meta/recipes-devtools/automake/automake/0003-build-fix-race-in-parallel-builds.patch
similarity index 89%
rename from meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch
rename to meta/recipes-devtools/automake/automake/0003-build-fix-race-in-parallel-builds.patch
index 591fce1bf16..a4039c3bbab 100644
--- a/meta/recipes-devtools/automake/automake/0001-build-fix-race-in-parallel-builds.patch
+++ b/meta/recipes-devtools/automake/automake/0003-build-fix-race-in-parallel-builds.patch
@@ -1,7 +1,7 @@
-From 592eb55b248a765abfc796fccb68baa3d53745ac Mon Sep 17 00:00:00 2001
+From b952d7064c9cee23857fbc7cb9d761542b98d59a Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Thu, 26 Jul 2018 00:58:12 -0700
-Subject: [PATCH] build: fix race in parallel builds
+Subject: [PATCH 3/6] build: fix race in parallel builds
 
 The automake-$(APIVERSION) is a hardlink of automake, if it is
 created later than update_mans executing, there is a failure
@@ -31,10 +31,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index c3e934c..7cddb8d 100644
+index a919544..c0f8c0d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -691,8 +691,8 @@ bin_SCRIPTS = bin/automake bin/aclocal
+@@ -723,8 +723,8 @@ bin_SCRIPTS = bin/automake bin/aclocal
  # Used by maintainer checks and such.
  automake_in = $(srcdir)/bin/automake.in
  aclocal_in = $(srcdir)/bin/aclocal.in
@@ -46,7 +46,7 @@ index c3e934c..7cddb8d 100644
  info_TEXINFOS = doc/automake.texi doc/automake-history.texi
  doc_automake_TEXINFOS = doc/fdl.texi
 diff --git a/bin/local.mk b/bin/local.mk
-index 97b38db..058ca99 100644
+index 4232448..8f043b0 100644
 --- a/bin/local.mk
 +++ b/bin/local.mk
 @@ -31,8 +31,8 @@ CLEANFILES += \
@@ -61,5 +61,5 @@ index 97b38db..058ca99 100644
  AUTOMAKESOURCES = $(automake_in) $(aclocal_in)
  TAGS_FILES += $(AUTOMAKESOURCES)
 -- 
-2.7.4
+2.39.2
 
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/0004-Add-a-new-distro-feature-ptest.patch
similarity index 84%
rename from meta/recipes-devtools/automake/automake/buildtest.patch
rename to meta/recipes-devtools/automake/automake/0004-Add-a-new-distro-feature-ptest.patch
index c43a4ac8f37..91c7f1c2ccb 100644
--- a/meta/recipes-devtools/automake/automake/buildtest.patch
+++ b/meta/recipes-devtools/automake/automake/0004-Add-a-new-distro-feature-ptest.patch
@@ -1,7 +1,7 @@
-From a860b28069785aa5bf2fa9b671287de9af5004ff Mon Sep 17 00:00:00 2001
+From 839dca38cf24e70c7f0e20015d55aa8e543dd403 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjst@enea.com>
 Date: Wed, 19 Dec 2012 17:18:27 +0100
-Subject: [PATCH] Add a new distro feature "ptest".
+Subject: [PATCH 4/6] Add a new distro feature "ptest".
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,13 +11,12 @@ be run separately.
 
 Signed-off-by: Björn Stenberg <bjst@enea.com>
 Upstream-Status: Pending
-
 ---
  lib/am/check.am | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/lib/am/check.am b/lib/am/check.am
-index e0db651..de137fa 100644
+index e51a771..070e2da 100644
 --- a/lib/am/check.am
 +++ b/lib/am/check.am
 @@ -41,7 +41,7 @@ am__tty_colors = { \
@@ -29,7 +28,7 @@ index e0db651..de137fa 100644
  
  if !%?SERIAL_TESTS%
  
-@@ -466,7 +466,14 @@ else %?SERIAL_TESTS%
+@@ -520,7 +520,14 @@ else %?SERIAL_TESTS%
  
  ## Obsolescent serial testsuite driver.
  
@@ -45,3 +44,6 @@ index e0db651..de137fa 100644
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
  ## Make sure Solaris VPATH-expands all members of this list, even
+-- 
+2.39.2
+
diff --git a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
similarity index 81%
rename from meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
rename to meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
index f92ec6b5487..a5bad068a45 100644
--- a/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
+++ b/meta/recipes-devtools/automake/automake/0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch
@@ -1,22 +1,21 @@
-From f78dfa39139d528c94d72f27994f337f2fd3b6bd Mon Sep 17 00:00:00 2001
+From 4f576c10613b43cbbfcdf5a451d893faecd6fea9 Mon Sep 17 00:00:00 2001
 From: Adrian Calianu <adrian.calianu@enea.com>
 Date: Thu, 25 Feb 2016 16:08:04 +0100
-Subject: [PATCH] Set relative to top_builddir path in Makefile to access
+Subject: [PATCH 5/6] Set relative to top_builddir path in Makefile to access
  test-driver
 
 Signed-off-by: Adrian Calianu <adrian.calianu@enea.com>
 Upstream-Status: Inappropriate [specific to oe-core target ptest installation]
 Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042
-
 ---
  bin/automake.in | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/bin/automake.in b/bin/automake.in
-index a52a489..8377d20 100644
+index 18626de..3aa8706 100644
 --- a/bin/automake.in
 +++ b/bin/automake.in
-@@ -324,6 +324,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
+@@ -325,6 +325,9 @@ my $config_aux_dir_set_in_configure_ac = 0;
  # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used
  # in Makefiles.
  my $am_config_aux_dir = '';
@@ -26,7 +25,7 @@ index a52a489..8377d20 100644
  
  # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR
  # in configure.ac.
-@@ -4854,7 +4857,7 @@ sub handle_per_suffix_test
+@@ -4917,7 +4920,7 @@ sub handle_per_suffix_test
      {
        require_conf_file ("parallel-tests", FOREIGN, 'test-driver');
        define_variable ("${pfx}LOG_DRIVER",
@@ -35,7 +34,7 @@ index a52a489..8377d20 100644
                         INTERNAL);
      }
    my $driver = '$(' . $pfx . 'LOG_DRIVER)';
-@@ -7440,6 +7443,10 @@ sub locate_aux_dir ()
+@@ -7554,6 +7557,10 @@ sub locate_aux_dir ()
    $am_config_aux_dir =
      '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir");
    $am_config_aux_dir =~ s,/*$,,;
@@ -46,3 +45,6 @@ index a52a489..8377d20 100644
  }
  
  
+-- 
+2.39.2
+
diff --git a/meta/recipes-devtools/automake/automake/0006-automake-Remove-delays-in-configure-scripts-using-au.patch b/meta/recipes-devtools/automake/automake/0006-automake-Remove-delays-in-configure-scripts-using-au.patch
new file mode 100644
index 00000000000..e5e39169b6f
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/0006-automake-Remove-delays-in-configure-scripts-using-au.patch
@@ -0,0 +1,77 @@
+From b43c0ccd1d98a43c0ddcade40fa288e98d381420 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Mon, 7 Dec 2015 18:28:05 +0000
+Subject: [PATCH 6/6] automake: Remove delays in configure scripts using
+ automake
+
+By default automake puts "sleep 1" into the start of configure scripts
+which adds pointless delays to them. Rather than do this, lets just assume
+our systems are sane.
+
+RP
+2015/12/7
+Upstream-Status: Inappropriate
+---
+ m4/sanity.m4 | 48 +-----------------------------------------------
+ 1 file changed, 1 insertion(+), 47 deletions(-)
+
+diff --git a/m4/sanity.m4 b/m4/sanity.m4
+index c7f32da..f25625a 100644
+--- a/m4/sanity.m4
++++ b/m4/sanity.m4
+@@ -176,51 +176,5 @@ case $srcdir in
+     AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+ esac
+ 
+-# Do 'set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-am_build_env_is_sane=no
+-am_has_slept=no
+-rm -f conftest.file
+-for am_try in 1 2; do
+-  echo "timestamp, slept: $am_has_slept" > conftest.file
+-  if (
+-    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+-    if test "$[]*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t "$srcdir/configure" conftest.file`
+-    fi
+-    test "$[]2" = conftest.file
+-  ); then
+-    am_build_env_is_sane=yes
+-    break
+-  fi
+-  # Just in case.
+-  sleep "$am_cv_filesystem_timestamp_resolution"
+-  am_has_slept=yes
+-done
+-
+-AC_MSG_RESULT([$am_build_env_is_sane])
+-if test "$am_build_env_is_sane" = no; then
+-  AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-
+-# If we didn't sleep, we still need to ensure time stamps of config.status and
+-# generated files are strictly newer.
+-am_sleep_pid=
+-AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+-  ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
+-  am_sleep_pid=$!
+-])
+-AC_CONFIG_COMMANDS_PRE(
+-  [AC_MSG_CHECKING([that generated files are newer than configure])
+-   if test -n "$am_sleep_pid"; then
+-     # Hide warnings about reused PIDs.
+-     wait $am_sleep_pid 2>/dev/null
+-   fi
+-   AC_MSG_RESULT([done])])
+-rm -f conftest.file
++AC_MSG_RESULT([yes])
+ ])
+-- 
+2.39.2
+
diff --git a/meta/recipes-devtools/automake/automake/performance.patch b/meta/recipes-devtools/automake/automake/performance.patch
deleted file mode 100644
index a8ba6592fa2..00000000000
--- a/meta/recipes-devtools/automake/automake/performance.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From cd47c328cb53546891bb3dc7c9b2c54ed01cc6d1 Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Mon, 7 Dec 2015 18:28:05 +0000
-Subject: [PATCH] automake: Remove delays in configure scripts using automake
-
-By default automake puts "sleep 1" into the start of configure scripts
-which adds pointless delays to them. Rather than do this, lets just assume
-our systems are sane.
-
-RP
-2015/12/7
-Upstream-Status: Inappropriate
-
----
- m4/sanity.m4 | 55 -------------------------------------------------------
- 1 file changed, 55 deletions(-)
-
-diff --git a/m4/sanity.m4 b/m4/sanity.m4
-index eaac218..bfdfe88 100644
---- a/m4/sanity.m4
-+++ b/m4/sanity.m4
-@@ -23,60 +23,5 @@ case $srcdir in
-     AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
- esac
- 
--# Do 'set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   am_has_slept=no
--   for am_try in 1 2; do
--     echo "timestamp, slept: $am_has_slept" > conftest.file
--     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--     if test "$[*]" = "X"; then
--	# -L didn't work.
--	set X `ls -t "$srcdir/configure" conftest.file`
--     fi
--     if test "$[*]" != "X $srcdir/configure conftest.file" \
--	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
--
--	# If neither matched, then we have a broken ls.  This can happen
--	# if, for instance, CONFIG_SHELL is bash and it inherits a
--	# broken ls alias from the environment.  This has actually
--	# happened.  Such a system could not be considered "sane".
--	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--  alias in your environment])
--     fi
--     if test "$[2]" = conftest.file || test $am_try -eq 2; then
--       break
--     fi
--     # Just in case.
--     sleep 1
--     am_has_slept=yes
--   done
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
- AC_MSG_RESULT([yes])
--# If we didn't sleep, we still need to ensure time stamps of config.status and
--# generated files are strictly newer.
--am_sleep_pid=
--if grep 'slept: no' conftest.file >/dev/null 2>&1; then
--  ( sleep 1 ) &
--  am_sleep_pid=$!
--fi
--AC_CONFIG_COMMANDS_PRE(
--  [AC_MSG_CHECKING([that generated files are newer than configure])
--   if test -n "$am_sleep_pid"; then
--     # Hide warnings about reused PIDs.
--     wait $am_sleep_pid 2>/dev/null
--   fi
--   AC_MSG_RESULT([done])])
--rm -f conftest.file
- ])
diff --git a/meta/recipes-devtools/automake/automake_1.16.5.bb b/meta/recipes-devtools/automake/automake_1.17.bb
similarity index 56%
rename from meta/recipes-devtools/automake/automake_1.16.5.bb
rename to meta/recipes-devtools/automake/automake_1.17.bb
index 469fcd69f73..27d8dfe1827 100644
--- a/meta/recipes-devtools/automake/automake_1.16.5.bb
+++ b/meta/recipes-devtools/automake/automake_1.17.bb
@@ -19,25 +19,19 @@ RDEPENDS:${PN} += "\
 RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native"
 
 SRC_URI += "\
-           file://0001-automake-Update-for-python.m4-to-respect-libdir.patch \
-           file://buildtest.patch \
-           file://performance.patch \
-           file://new_rt_path_for_test-driver.patch \
            file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \
-           file://0001-build-fix-race-in-parallel-builds.patch \
-           file://0001-Drop-ar-u-argument.patch \
+           file://0002-automake-Update-for-python.m4-to-respect-libdir.patch \
+           file://0003-build-fix-race-in-parallel-builds.patch \
+           file://0004-Add-a-new-distro-feature-ptest.patch \
+           file://0005-Set-relative-to-top_builddir-path-in-Makefile-to-acc.patch \
+           file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
            "
 
-SRC_URI[sha256sum] = "07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605"
-
-PERL = "${USRBINPATH}/perl"
-PERL:class-native = "${USRBINPATH}/env perl"
-PERL:class-nativesdk = "${USRBINPATH}/env perl"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
+SRC_URI[sha256sum] = "397767d4db3018dd4440825b60c64258b636eaf6bf99ac8b0897f06c89310acd"
 
 do_install:append () {
     install -d ${D}${datadir}
+    sed -i -e 's@^#!.*perl$@#!/usr/bin/env perl@' ${D}/${bindir}/*
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.39.2

[PATCH 07/34] fmt: update 10.2.1 -> 11.0.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/fmt/{fmt_10.2.1.bb => fmt_11.0.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/fmt/{fmt_10.2.1.bb => fmt_11.0.2.bb} (77%)

diff --git a/meta/recipes-devtools/fmt/fmt_10.2.1.bb b/meta/recipes-devtools/fmt/fmt_11.0.2.bb
similarity index 77%
rename from meta/recipes-devtools/fmt/fmt_10.2.1.bb
rename to meta/recipes-devtools/fmt/fmt_11.0.2.bb
index 1437eb48034..5a7041088cd 100644
--- a/meta/recipes-devtools/fmt/fmt_10.2.1.bb
+++ b/meta/recipes-devtools/fmt/fmt_11.0.2.bb
@@ -4,8 +4,8 @@ HOMEPAGE = "https://fmt.dev"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
 
-SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https"
-SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281"
+SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
+SRCREV = "0c9fce2ffefecfdce794e1859584e25877b7b592"
 
 S = "${WORKDIR}/git"
 
-- 
2.39.2

Re: [OE-core] [PATCH 07/34] fmt: update 10.2.1 -> 11.0.2

[Khem Raj]

breaks
mariadb-native - https://errors.yoctoproject.org/Errors/Details/800105/
gerbera - https://errors.yoctoproject.org/Errors/Details/800106/

On Mon, Aug 26, 2024 at 10:24 PM Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> From: Alexander Kanavin <alex@linutronix.de>
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  meta/recipes-devtools/fmt/{fmt_10.2.1.bb => fmt_11.0.2.bb} | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-devtools/fmt/{fmt_10.2.1.bb => fmt_11.0.2.bb} (77%)
>
> diff --git a/meta/recipes-devtools/fmt/fmt_10.2.1.bb b/meta/recipes-devtools/fmt/fmt_11.0.2.bb
> similarity index 77%
> rename from meta/recipes-devtools/fmt/fmt_10.2.1.bb
> rename to meta/recipes-devtools/fmt/fmt_11.0.2.bb
> index 1437eb48034..5a7041088cd 100644
> --- a/meta/recipes-devtools/fmt/fmt_10.2.1.bb
> +++ b/meta/recipes-devtools/fmt/fmt_11.0.2.bb
> @@ -4,8 +4,8 @@ HOMEPAGE = "https://fmt.dev"
>  LICENSE = "MIT"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=b9257785fc4f3803a4b71b76c1412729"
>
> -SRC_URI = "git://github.com/fmtlib/fmt;branch=10.x;protocol=https"
> -SRCREV = "e69e5f977d458f2650bb346dadf2ad30c5320281"
> +SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https"
> +SRCREV = "0c9fce2ffefecfdce794e1859584e25877b7b592"
>
>  S = "${WORKDIR}/git"
>
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#203782): https://lists.openembedded.org/g/openembedded-core/message/203782
> Mute This Topic: https://lists.openembedded.org/mt/108118408/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

[PATCH 08/34] git: 2.45.2 -> 2.46.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-do-not-force-RHEL-7-specific-build-.patch |  7 +++---
 meta/recipes-devtools/git/git/fixsort.patch   | 22 ++++++++++++-------
 .../git/{git_2.45.2.bb => git_2.46.0.bb}      |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/git/{git_2.45.2.bb => git_2.46.0.bb} (98%)

diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
index fc803c73c78..3f0bc4aaa1b 100644
--- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
+++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
@@ -1,4 +1,4 @@
-From c0c5241abdc113acbe6bcd960686cea414bce357 Mon Sep 17 00:00:00 2001
+From be83596773e42b88ba1104f044a139f35d90a7f5 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Mon, 7 Feb 2022 10:13:15 +0100
 Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
@@ -12,13 +12,12 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 Rebased for 2.45.1.
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
 ---
  config.mak.uname | 4 ----
  1 file changed, 4 deletions(-)
 
 diff --git a/config.mak.uname b/config.mak.uname
-index a7607a5..251057e 100644
+index 85d6382..bdf06ca 100644
 --- a/config.mak.uname
 +++ b/config.mak.uname
 @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -29,6 +28,6 @@ index a7607a5..251057e 100644
 -        ifneq ($(findstring .el7.,$(uname_R)),)
 -		BASIC_CFLAGS += -std=c99
 -        endif
+ 	LINK_FUZZ_PROGRAMS = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
- 	HAVE_ALLOCA_H = YesPlease
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch
index 07a487e8ca6..d9a3672f1d6 100644
--- a/meta/recipes-devtools/git/git/fixsort.patch
+++ b/meta/recipes-devtools/git/git/fixsort.patch
@@ -1,13 +1,16 @@
-[PATCH] generate-configlist.sh: Fix determinism issue
+From 83ae059943d3efd824978a759bcfd894ce5085d4 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 17 Feb 2021 17:57:13 +0000
+Subject: [PATCH] [PATCH] generate-configlist.sh: Fix determinism issue
 
-Currently git binaries are not entirely reproducible, at least partly 
+Currently git binaries are not entirely reproducible, at least partly
 due to config-list.h differing in order depending on the system's
 locale settings. Under different locales, the entries:
 
 "sendemail.identity",
 "sendemail.<identity>.*",
 
-would differ in order for example and this leads to differences in 
+would differ in order for example and this leads to differences in
 the debug symbols for the binaries.
 
 This can be fixed by specifying the C locale for the sort in the
@@ -15,12 +18,15 @@ shell script generating the header.
 
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u]
+---
+ generate-configlist.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: git-2.30.0/generate-configlist.sh
-===================================================================
---- git-2.30.0.orig/generate-configlist.sh
-+++ git-2.30.0/generate-configlist.sh
-@@ -9,7 +9,7 @@ static const char *config_name_list[] =
+diff --git a/generate-configlist.sh b/generate-configlist.sh
+index 8692fe5..e67ccac 100755
+--- a/generate-configlist.sh
++++ b/generate-configlist.sh
+@@ -9,7 +9,7 @@ static const char *config_name_list[] = {
  EOF
  	grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
  	sed '/deprecated/d; s/::$//; s/,  */\n/g' |
diff --git a/meta/recipes-devtools/git/git_2.45.2.bb b/meta/recipes-devtools/git/git_2.46.0.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.45.2.bb
rename to meta/recipes-devtools/git/git_2.46.0.bb
index 6393c976e6a..7c6beb5b5cc 100644
--- a/meta/recipes-devtools/git/git_2.45.2.bb
+++ b/meta/recipes-devtools/git/git_2.46.0.bb
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234"
+SRC_URI[tarball.sha256sum] = "b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230"
-- 
2.39.2

[PATCH 09/34] perlcross: update 1.5.2 -> 1.6

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ile-check-the-file-if-patched-or-not.patch |  3 +-
 ...oss-add-LDFLAGS-when-linking-libperl.patch |  9 ++--
 .../perl-cross/files/determinism.patch        | 41 +++++++++++--------
 .../{perlcross_1.5.2.bb => perlcross_1.6.bb}  |  2 +-
 4 files changed, 29 insertions(+), 26 deletions(-)
 rename meta/recipes-devtools/perl-cross/{perlcross_1.5.2.bb => perlcross_1.6.bb} (92%)

diff --git a/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch b/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch
index 4e9153ebf10..7efee733c67 100644
--- a/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch
+++ b/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch
@@ -1,4 +1,4 @@
-From 3eb33dce6e3c93e1b3efcc9649f871100adada30 Mon Sep 17 00:00:00 2001
+From d0292a4f91ca22f8919a0f13d8961f98743bdbf1 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Fri, 2 Jul 2021 09:08:21 +0000
 Subject: [PATCH] Makefile: check the file if patched or not
@@ -9,7 +9,6 @@ one time.
 Upstream-Status: Inappropriate (OE-specific)
 
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
index 6c3f08c4324..6d387fe66a0 100644
--- a/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
+++ b/meta/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch
@@ -1,4 +1,4 @@
-From f824cbec9ac8f113a4ae35d57bd18625d415a71b Mon Sep 17 00:00:00 2001
+From c4ebb6d11d690185f66a3f0a591f193fd6611122 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 27 Nov 2018 15:37:40 +0100
 Subject: [PATCH] perl-cross: add LDFLAGS when linking libperl
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 01644cd..be811a7 100644
+index 4b80079..c6d6042 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -180,7 +180,7 @@ endif
+@@ -191,7 +191,7 @@ endif
  
  ifeq ($(useshrplib),true)
  $(LIBPERL):
@@ -22,6 +22,3 @@ index 01644cd..be811a7 100644
  else
  $(LIBPERL):
  	$(AR) cru $@ $(filter %$o,$^)
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/perl-cross/files/determinism.patch b/meta/recipes-devtools/perl-cross/files/determinism.patch
index e9bf752bcb6..29de36cbafb 100644
--- a/meta/recipes-devtools/perl-cross/files/determinism.patch
+++ b/meta/recipes-devtools/perl-cross/files/determinism.patch
@@ -1,4 +1,7 @@
-Fixes to make the perl build reproducible:
+From 8fd84d6d760b21bad2c499b572951cc3f2235953 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 5 Feb 2020 23:54:02 +0000
+Subject: [PATCH] Fixes to make the perl build reproducible:
 
 a) Remove the \n from configure_attr.sh since it gets quoted differently depending on
    whether the shell is bash or dash which can cause the test result to be incorrect.
@@ -8,7 +11,7 @@ b) Sort the order of the module lists from configure_mods.sh since otherwise
    the result isn't the same leading to makefile differences.
    Reported upstream: https://github.com/arsv/perl-cross/issues/88
 
-c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst 
+c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst
    there for good measure)
    This needs to go to upstream perl (not done)
 
@@ -20,12 +23,26 @@ RP 2020/2/7
 
 Upstream-Status: Pending [75% submitted]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
+---
+ cnf/configure         | 2 +-
+ cnf/configure_mods.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: perl-5.30.1/cnf/configure_mods.sh
-===================================================================
---- perl-5.30.1.orig/cnf/configure_mods.sh
-+++ perl-5.30.1/cnf/configure_mods.sh
-@@ -82,7 +82,7 @@ extonlyif() {
+diff --git a/cnf/configure b/cnf/configure
+index 2f451c6..86bc865 100755
+--- a/cnf/configure
++++ b/cnf/configure
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ base=${0%/*}; test -z "$base" && base=.
+ 
+diff --git a/cnf/configure_mods.sh b/cnf/configure_mods.sh
+index d4ef5a7..8e88b48 100644
+--- a/cnf/configure_mods.sh
++++ b/cnf/configure_mods.sh
+@@ -108,7 +108,7 @@ extonlyif() {
  }
  
  definetrimspaces() {
@@ -34,13 +51,3 @@ Index: perl-5.30.1/cnf/configure_mods.sh
  	define $1 "$v"
  }
  
-Index: perl-5.30.1/cnf/configure
-===================================================================
---- perl-5.30.1.orig/cnf/configure
-+++ perl-5.30.1/cnf/configure
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- base=${0%/*}; test -z "$base" && base=.
- 
diff --git a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb b/meta/recipes-devtools/perl-cross/perlcross_1.6.bb
similarity index 92%
rename from meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb
rename to meta/recipes-devtools/perl-cross/perlcross_1.6.bb
index 48bda7e4b6f..34d9236cabd 100644
--- a/meta/recipes-devtools/perl-cross/perlcross_1.5.2.bb
+++ b/meta/recipes-devtools/perl-cross/perlcross_1.6.bb
@@ -18,7 +18,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/perl-cross-${PV}.tar.gz;name=perl-c
            "
 GITHUB_BASE_URI = "https://github.com/arsv/perl-cross/releases/"
 
-SRC_URI[perl-cross.sha256sum] = "584dc54c48dca25e032b676a15bef377c1fed9de318b4fc140292a5dbf326e90"
+SRC_URI[perl-cross.sha256sum] = "5abf198ee50ce9e69eb68fede68c87f65241caa744e4203e97490fa59b45ed69"
 
 S = "${WORKDIR}/perl-cross-${PV}"
 
-- 
2.39.2

[PATCH 10/34] perl: update 5.38.2 -> 5.40.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Update rdepends generator to account for new version specifiers
(v{version} instead of just {version}) and exclude a few more
external modules detected at runtime.

Adjust musl configuration to set custom LC_ALL handling
(musl doesn't follow glibc in that, see the last few comments here:
https://github.com/Perl/perl5/issues/22375 ).

Adjust ptest packaging to add a dummy Makefile for 'make perl
releases' test (otherwise the packaging specifically excludes makefiles).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ent-failure-of-test-t-op-sigsystem.t.patch |  77 --
 ...ule-breaks-through-the-perl-wrapper-.patch |   8 +-
 ...Makefile.PL-Fix-_PATH_LOG-for-determ.patch |   5 +-
 .../files/0002-Constant-Fix-up-shebang.patch  |   9 +-
 .../perl/files/determinism.patch              |  16 +-
 .../perl/files/encodefix.patch                |  16 +-
 .../perl/files/errno_ver.diff                 |  15 +-
 .../perl/files/native-perlinc.patch           |  18 +-
 .../perl/files/perl-configpm-switch.patch     |   3 +-
 .../perl/files/perl-dynloader.patch           |  18 +-
 .../perl/files/perl-rdepends.txt              | 694 ++++++++++++++++--
 meta/recipes-devtools/perl/perl-ptest.inc     |   3 +
 .../perl/{perl_5.38.2.bb => perl_5.40.0.bb}   |  11 +-
 13 files changed, 713 insertions(+), 180 deletions(-)
 delete mode 100644 meta/recipes-devtools/perl/files/0001-Fix-intermittent-failure-of-test-t-op-sigsystem.t.patch
 rename meta/recipes-devtools/perl/{perl_5.38.2.bb => perl_5.40.0.bb} (96%)

diff --git a/meta/recipes-devtools/perl/files/0001-Fix-intermittent-failure-of-test-t-op-sigsystem.t.patch b/meta/recipes-devtools/perl/files/0001-Fix-intermittent-failure-of-test-t-op-sigsystem.t.patch
deleted file mode 100644
index 86fd42cd3d3..00000000000
--- a/meta/recipes-devtools/perl/files/0001-Fix-intermittent-failure-of-test-t-op-sigsystem.t.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 75d974a58c461b3b5d35280e497810e46abae4ca Mon Sep 17 00:00:00 2001
-From: William Lyu <William.Lyu@windriver.com>
-Date: Wed, 4 Oct 2023 08:58:41 -0400
-Subject: [PATCH] Fix intermittent failure of test t/op/sigsystem.t
-
-[Perl issue #21546] -- https://github.com/Perl/perl5/issues/21546
-
-This fix addresses the intermittent failure of the test
-t/op/sigsystem.t by improving its robustness. Before the fix, this
-test waits a hard-coded amount of time in the parent process for the
-child process to exit, and the child process may not be able to exit
-soon enough. With this fix, the parent process in this test polls for
-whether the SIGCHLD handler reaped the child process for at most 25
-seconds.
-
-Upstream-Status: Backport [commit ID: 75d974a]
-
-Signed-off-by: William Lyu <William.Lyu@windriver.com>
-Signed-off-by: Randy MacLeod <randy.macleod@windriver.com>
-Reported-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-
-Committer: William Lyu is now a Perl author.
----
- AUTHORS          |  1 +
- t/op/sigsystem.t | 17 ++++++++++++++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 21948bfdc7..527dd992fd 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -1443,6 +1443,7 @@ Wayne Scott                    <wscott@ichips.intel.com>
- Wayne Thompson                 <Wayne.Thompson@Ebay.sun.com>
- Wilfredo Sánchez               <wsanchez@mit.edu>
- William J. Middleton           <William.Middleton@oslo.mobil.telenor.no>
-+William Lyu                    <William.Lyu@windriver.com>
- William Mann                   <wmann@avici.com>
- William Middleton              <wmiddlet@adobe.com>
- William R Ward                 <hermit@BayView.COM>
-diff --git a/t/op/sigsystem.t b/t/op/sigsystem.t
-index 25da854902..831feefb0f 100644
---- a/t/op/sigsystem.t
-+++ b/t/op/sigsystem.t
-@@ -37,7 +37,15 @@ SKIP: {
-     test_system('with reaper');
- 
-     note("Waiting briefly for SIGCHLD...");
--    Time::HiRes::sleep(0.500);
-+
-+    # Wait at most 50 * 0.500 = 25.0 seconds for the child process to be 
-+    # reaped. If the child process exits and gets reaped early, this polling
-+    # loop will exit early. 
-+
-+    for (1..50) {
-+	last if @pids;
-+	Time::HiRes::sleep(0.500);
-+    }
- 
-     ok(@pids == 1, 'Reaped only one process');
-     ok($pids[0] == $pid, "Reaped the right process.") or diag(Dumper(\@pids));
-@@ -50,8 +58,11 @@ sub test_system {
-     my $got_zeroes      = 0;
- 
-     # This test is looking for a race between system()'s waitpid() and a
--    # signal handler.    Looping a few times increases the chances of
--    # catching the error.
-+    # signal handler. The system() call is expected to not interfere with the 
-+    # SIGCHLD signal handler. In particular, the wait() called within system() 
-+    # is expected to reap the child process forked by system() before the 
-+    # SIGCHLD signal handler is called. 
-+    # Looping a few times increases the chances of catching the error.
- 
-     for (1..$expected_zeroes) {
- 	$got_zeroes++ unless system(TRUE);
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch b/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch
index ed8ec1d4168..2076c61ee0e 100644
--- a/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch
+++ b/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch
@@ -1,4 +1,4 @@
-From e8e095b9c71c58f8197d6315359446b6b084cb2b Mon Sep 17 00:00:00 2001
+From 47cd22cd213d2c5f28e674b12c264dc731682560 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 5 Jun 2018 14:58:42 +0300
 Subject: [PATCH] Somehow this module breaks through the perl wrapper and
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-index 948c476..f537526 100644
+index fe38598..0828f52 100644
 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -1110,6 +1110,9 @@ WARNING
+@@ -1161,6 +1161,9 @@ WARNING
      }
  
      foreach my $name (@$names){
@@ -24,7 +24,7 @@ index 948c476..f537526 100644
          my ($abs, $use_dir);
          if ($self->file_name_is_absolute($name)) {     # /foo/bar
              $abs = $name;
-@@ -2006,6 +2009,7 @@ sub init_PERL {
+@@ -2097,6 +2100,7 @@ sub init_PERL {
  
      $self->{PERL} ||=
          $self->find_perl(5.0, \@perls, \@defpath, $Verbose );
diff --git a/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch
index 63815d44fb6..7e5d08d8db5 100644
--- a/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch
+++ b/meta/recipes-devtools/perl/files/0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch
@@ -1,4 +1,4 @@
-From a73fff1fcf0def4ce93964f1b63fe3ad0967259d Mon Sep 17 00:00:00 2001
+From 322972384e0795be339252f7cf9a318dc759b51e Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Fri, 18 Feb 2022 09:44:26 +0000
 Subject: [PATCH] cpan/Sys-Syslog/Makefile.PL: Fix _PATH_LOG for deterministic
@@ -31,6 +31,3 @@ index d09ba69..d44e58c 100644
  
  # if possible, generate the code that handles the constants with 
  # ExtUtils::Constant, otherwise use cached copy in fallback/
--- 
-2.31.1
-
diff --git a/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch b/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch
index 686cc7167bb..80986e66dab 100644
--- a/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch
+++ b/meta/recipes-devtools/perl/files/0002-Constant-Fix-up-shebang.patch
@@ -1,7 +1,7 @@
-From 260ebd15e16cd86b9b58e5c5f3a496b3853ca46d Mon Sep 17 00:00:00 2001
+From a02355bdc8cde1115daf101675cdfb707d337bf1 Mon Sep 17 00:00:00 2001
 From: Joshua Watt <JPEWhacker@gmail.com>
 Date: Mon, 17 Jun 2019 10:47:23 -0500
-Subject: [PATCH 2/2] Constant: Fix up shebang
+Subject: [PATCH] Constant: Fix up shebang
 
 The instructions indicate that the script should be explicitly passed to
 "perl -x", so automatically setting the #! to be ^X is unnecessary and
@@ -15,7 +15,7 @@ Upstream-Status: Submitted [https://rt.cpan.org/Public/Bug/Display.html?id=12986
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
-index 14eb809714..d4d074e121 100644
+index 14eb809..d4d074e 100644
 --- a/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
 +++ b/cpan/ExtUtils-Constant/lib/ExtUtils/Constant/XS.pm
 @@ -219,7 +219,7 @@ sub dogfood {
@@ -27,6 +27,3 @@ index 14eb809714..d4d074e121 100644
  use ExtUtils::Constant qw (constant_types C_constant XS_constant);
  
  EOT
--- 
-2.21.0
-
diff --git a/meta/recipes-devtools/perl/files/determinism.patch b/meta/recipes-devtools/perl/files/determinism.patch
index f2b11115524..bdb9a928bb6 100644
--- a/meta/recipes-devtools/perl/files/determinism.patch
+++ b/meta/recipes-devtools/perl/files/determinism.patch
@@ -1,4 +1,7 @@
-Fixes to make the perl build reproducible:
+From 5c4fd57daf125357262aa796057d7be8e78d378e Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 5 Feb 2020 23:54:02 +0000
+Subject: [PATCH] Fixes to make the perl build reproducible:
 
 a) Remove the \n from configure_attr.sh since it gets quoted differently depending on
    whether the shell is bash or dash which can cause the test result to be incorrect.
@@ -20,11 +23,14 @@ RP 2020/2/7
 
 Upstream-Status: Submitted [see links above]
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
+---
+ cpan/Encode/Byte/Makefile.PL | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
-===================================================================
---- perl-5.30.1.orig/cpan/Encode/Byte/Makefile.PL
-+++ perl-5.30.1/cpan/Encode/Byte/Makefile.PL
+diff --git a/cpan/Encode/Byte/Makefile.PL b/cpan/Encode/Byte/Makefile.PL
+index 6824bbb..4af4a50 100644
+--- a/cpan/Encode/Byte/Makefile.PL
++++ b/cpan/Encode/Byte/Makefile.PL
 @@ -171,7 +171,7 @@ sub postamble
      my $lengthsofar = length($str);
      my $continuator = '';
diff --git a/meta/recipes-devtools/perl/files/encodefix.patch b/meta/recipes-devtools/perl/files/encodefix.patch
index 396ed0d53e3..665699d12df 100644
--- a/meta/recipes-devtools/perl/files/encodefix.patch
+++ b/meta/recipes-devtools/perl/files/encodefix.patch
@@ -1,14 +1,22 @@
+From a4e22c7f2a519f24bc8aa89c6677017c0fe13679 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 18 Feb 2020 17:27:26 +0000
+Subject: [PATCH] perl: Fix encode module reproducibility issues
+
 The code is encoding host compiler parameters into target builds. Avoid
 this for our target builds (patch is target specific, not native)
 
 Upstream-Status: Inappropriate [Cross compile hack]
 RP 2020/2/18
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ cpan/Encode/bin/enc2xs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: perl-5.30.1/cpan/Encode/bin/enc2xs
-===================================================================
---- perl-5.30.1.orig/cpan/Encode/bin/enc2xs
-+++ perl-5.30.1/cpan/Encode/bin/enc2xs
+diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
+index 502ae39..7669b05 100644
+--- a/cpan/Encode/bin/enc2xs
++++ b/cpan/Encode/bin/enc2xs
 @@ -195,7 +195,7 @@ sub compiler_info {
      # above becomes false.
      my $sized  = $declaration && !($compat && !$pedantic);
diff --git a/meta/recipes-devtools/perl/files/errno_ver.diff b/meta/recipes-devtools/perl/files/errno_ver.diff
index a965fbeeecf..477642f4570 100644
--- a/meta/recipes-devtools/perl/files/errno_ver.diff
+++ b/meta/recipes-devtools/perl/files/errno_ver.diff
@@ -1,7 +1,7 @@
-From 8e1efba7560d8d55524c7a0f1b0539ddce419b86 Mon Sep 17 00:00:00 2001
+From 9c404d4b1c3607e827fb56b5ae4f8fbbdb52cd0b Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <bod@debian.org>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
-Subject: [PATCH 6/8] Remove Errno version check due to upgrade problems with
+Subject: [PATCH] Remove Errno version check due to upgrade problems with
  long-running processes.
 
 Bug-Debian: http://bugs.debian.org/343351
@@ -17,21 +17,18 @@ Upstream-Status: Pending
  1 file changed, 5 deletions(-)
 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 6251a3c..eeed445 100644
+index 77aa19b..4bdbef1 100644
 --- a/ext/Errno/Errno_pm.PL
 +++ b/ext/Errno/Errno_pm.PL
-@@ -294,11 +294,6 @@ EDQ
+@@ -295,11 +295,6 @@ EDQ
      # they've already declared perl doesn't need to worry about this risk.
      if(!$ENV{'PERL_BUILD_EXPAND_CONFIG_VARS'}) {
          print <<"CONFIG_CHECK_END";
 -use Config;
 -"\$Config{'archname'}-\$Config{'osvers'}" eq
--"$archname-$Config{'osvers'}" or
--	die "Errno architecture ($archname-$Config{'osvers'}) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
+-"$archname-$osvers" or
+-	die "Errno architecture ($archname-$osvers) does not match executable architecture (\$Config{'archname'}-\$Config{'osvers'})";
 -
  CONFIG_CHECK_END
  }
  
--- 
-2.1.4
-
diff --git a/meta/recipes-devtools/perl/files/native-perlinc.patch b/meta/recipes-devtools/perl/files/native-perlinc.patch
index 20d7fe60604..7e3e5f6652a 100644
--- a/meta/recipes-devtools/perl/files/native-perlinc.patch
+++ b/meta/recipes-devtools/perl/files/native-perlinc.patch
@@ -1,11 +1,19 @@
+From 9fec62b19a49d1451fd1120c5dc38baf59f73856 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 30 May 2007 09:33:32 +0000
+Subject: [PATCH] perl: sync with OE
+
 Upstream-Status: Inappropriate [embedded specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
 
-Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
-===================================================================
---- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
-+++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
-@@ -1597,6 +1597,19 @@
+diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+index 0828f52..b8abff4 100644
+--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+@@ -1862,6 +1862,19 @@ from the perl source tree.
  	$self->{PERL_LIB}     ||= $Config{privlibexp};
  	$self->{PERL_ARCHLIB} ||= $Config{archlibexp};
  	$self->{PERL_INC}     = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
diff --git a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch
index 0be1d5a93c5..3721277933f 100644
--- a/meta/recipes-devtools/perl/files/perl-configpm-switch.patch
+++ b/meta/recipes-devtools/perl/files/perl-configpm-switch.patch
@@ -1,4 +1,4 @@
-From c25d460a2f00e9af25087d40447fe1a81c89710c Mon Sep 17 00:00:00 2001
+From 7a48538a7e8614a3342151b646d2105c0cb0cdd9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sun, 27 May 2007 21:04:11 +0000
 Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
@@ -14,7 +14,6 @@ values would be valid for the host only.
 
 Upstream-Status: Inappropriate [native]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  configpm | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/perl/files/perl-dynloader.patch b/meta/recipes-devtools/perl/files/perl-dynloader.patch
index 887f7c0f7ff..5472602d3af 100644
--- a/meta/recipes-devtools/perl/files/perl-dynloader.patch
+++ b/meta/recipes-devtools/perl/files/perl-dynloader.patch
@@ -1,3 +1,8 @@
+From 25a26c52c320e699b37a7ad1f4f045bc8aa4cb00 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
 Upstream-Status: Inappropriate [embedded specific]
 
 Allow the location that .so files are searched for for dynamic
@@ -6,12 +11,15 @@ us to load .so's from the host system while building for the target
 system.
 
 Update by Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/21
+---
+ dist/XSLoader/XSLoader_pm.PL | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
-Index: perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
-===================================================================
---- perl-5.24.1.orig/dist/XSLoader/XSLoader_pm.PL
-+++ perl-5.24.1/dist/XSLoader/XSLoader_pm.PL
-@@ -52,6 +52,24 @@ sub load {
+diff --git a/dist/XSLoader/XSLoader_pm.PL b/dist/XSLoader/XSLoader_pm.PL
+index ff5ca31..0d50803 100644
+--- a/dist/XSLoader/XSLoader_pm.PL
++++ b/dist/XSLoader/XSLoader_pm.PL
+@@ -32,6 +32,24 @@ sub load {
      my ($caller, $modlibname) = caller();
      my $module = $caller;
  
diff --git a/meta/recipes-devtools/perl/files/perl-rdepends.txt b/meta/recipes-devtools/perl/files/perl-rdepends.txt
index e5f45bf2910..48e5a9de2f1 100644
--- a/meta/recipes-devtools/perl/files/perl-rdepends.txt
+++ b/meta/recipes-devtools/perl/files/perl-rdepends.txt
@@ -166,9 +166,6 @@ RDEPENDS:perl-module-builtin += "perl-module-warnings"
 RDEPENDS:perl-module-b-xref += "perl-module-b"
 RDEPENDS:perl-module-b-xref += "perl-module-config"
 RDEPENDS:perl-module-b-xref += "perl-module-strict"
-RDEPENDS:perl-module-bytes += "perl-module-bytes-heavy"
-RDEPENDS:perl-module-bytes += "perl-module-strict"
-RDEPENDS:perl-module-bytes += "perl-module-warnings"
 RDEPENDS:perl-module--charnames += "perl-module-bytes"
 RDEPENDS:perl-module-charnames += "perl-module-bytes"
 RDEPENDS:perl-module-charnames += "perl-module--charnames"
@@ -299,6 +296,7 @@ RDEPENDS:perl-module-digest-md5 += "perl-module-warnings"
 RDEPENDS:perl-module-digest-md5 += "perl-module-xsloader"
 RDEPENDS:perl-module-digest += "perl-module-strict"
 RDEPENDS:perl-module-digest += "perl-module-warnings"
+RDEPENDS:perl-module-digest-sha += "perl-module-cwd"
 RDEPENDS:perl-module-digest-sha += "perl-module-digest-base"
 RDEPENDS:perl-module-digest-sha += "perl-module-dynaloader"
 RDEPENDS:perl-module-digest-sha += "perl-module-exporter"
@@ -479,6 +477,7 @@ RDEPENDS:perl-module-extutils-cbuilder-platform-android += "perl-module-warnings
 RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-extutils-cbuilder-platform-unix"
 RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-strict"
 RDEPENDS:perl-module-extutils-cbuilder-platform-cygwin += "perl-module-warnings"
+RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-config"
 RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-extutils-cbuilder-platform-unix"
 RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-strict"
 RDEPENDS:perl-module-extutils-cbuilder-platform-darwin += "perl-module-warnings"
@@ -518,7 +517,6 @@ RDEPENDS:perl-module-extutils-command += "perl-module-file-copy"
 RDEPENDS:perl-module-extutils-command += "perl-module-file-find"
 RDEPENDS:perl-module-extutils-command += "perl-module-file-path"
 RDEPENDS:perl-module-extutils-command += "perl-module-strict"
-RDEPENDS:perl-module-extutils-command += "perl-module-vars"
 RDEPENDS:perl-module-extutils-command += "perl-module-warnings"
 RDEPENDS:perl-module-extutils-constant-base += "perl-module-constant"
 RDEPENDS:perl-module-extutils-constant-base += "perl-module-extutils-constant-utils"
@@ -588,7 +586,6 @@ RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-encode-alias"
 RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-i18n-langinfo"
 RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-strict"
 RDEPENDS:perl-module-extutils-makemaker-locale += "perl-module-warnings"
-RDEPENDS:perl-module-extutils-makemaker += "perl-module-b"
 RDEPENDS:perl-module-extutils-makemaker += "perl-module-cpan"
 RDEPENDS:perl-module-extutils-makemaker += "perl-module-cwd"
 RDEPENDS:perl-module-extutils-makemaker += "perl-module-exporter"
@@ -689,7 +686,6 @@ RDEPENDS:perl-module-extutils-mm-unix += "perl-module-extutils-mm-any"
 RDEPENDS:perl-module-extutils-mm-unix += "perl-module-file-basename"
 RDEPENDS:perl-module-extutils-mm-unix += "perl-module-file-find"
 RDEPENDS:perl-module-extutils-mm-unix += "perl-module-strict"
-RDEPENDS:perl-module-extutils-mm-unix += "perl-module-vars"
 RDEPENDS:perl-module-extutils-mm-unix += "perl-module-version"
 RDEPENDS:perl-module-extutils-mm-unix += "perl-module-warnings"
 RDEPENDS:perl-module-extutils-mm-uwin += "perl-module-extutils-mm-unix"
@@ -845,8 +841,6 @@ RDEPENDS:perl-module-file-stat += "perl-module-constant"
 RDEPENDS:perl-module-file-stat += "perl-module-exporter"
 RDEPENDS:perl-module-file-stat += "perl-module-fcntl"
 RDEPENDS:perl-module-file-stat += "perl-module-overload "
-RDEPENDS:perl-module-file-stat += "perl-module-strict"
-RDEPENDS:perl-module-file-stat += "perl-module-warnings"
 RDEPENDS:perl-module-file-stat += "perl-module-warnings-register"
 RDEPENDS:perl-module-file-temp += "perl-module-constant"
 RDEPENDS:perl-module-file-temp += "perl-module-cwd"
@@ -875,13 +869,16 @@ RDEPENDS:perl-module-gdbm-file += "perl-module-strict"
 RDEPENDS:perl-module-gdbm-file += "perl-module-tie-hash"
 RDEPENDS:perl-module-gdbm-file += "perl-module-warnings"
 RDEPENDS:perl-module-gdbm-file += "perl-module-xsloader"
+RDEPENDS:perl-module-getopt-long-parser += "perl-module-getopt-long"
+RDEPENDS:perl-module-getopt-long-parser += "perl-module-warnings"
+RDEPENDS:perl-module-getopt-long += "perl-module-base"
 RDEPENDS:perl-module-getopt-long += "perl-module-constant"
 RDEPENDS:perl-module-getopt-long += "perl-module-exporter"
+RDEPENDS:perl-module-getopt-long += "perl-module-getopt-long-parser"
 RDEPENDS:perl-module-getopt-long += "perl-module-overload"
 RDEPENDS:perl-module-getopt-long += "perl-module-pod-usage"
 RDEPENDS:perl-module-getopt-long += "perl-module-strict"
 RDEPENDS:perl-module-getopt-long += "perl-module-text-parsewords"
-RDEPENDS:perl-module-getopt-long += "perl-module-vars"
 RDEPENDS:perl-module-getopt-long += "perl-module-warnings"
 RDEPENDS:perl-module-getopt-std += "perl-module-exporter"
 RDEPENDS:perl-module-getopt-std += "perl-module-strict"
@@ -1048,7 +1045,6 @@ RDEPENDS:perl-module-io-socket-ip += "perl-module-constant"
 RDEPENDS:perl-module-io-socket-ip += "perl-module-errno"
 RDEPENDS:perl-module-io-socket-ip += "perl-module-posix"
 RDEPENDS:perl-module-io-socket-ip += "perl-module-socket"
-RDEPENDS:perl-module-io-socket-ip += "perl-module-strict"
 RDEPENDS:perl-module-io-socket-ip += "perl-module-warnings"
 RDEPENDS:perl-module-io-socket += "perl-module-errno"
 RDEPENDS:perl-module-io-socket += "perl-module-exporter"
@@ -1144,8 +1140,8 @@ RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-file"
 RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-identity"
 RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-adapter-inflate"
 RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-io-uncompress-rawinflate"
-RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-posix"
 RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-strict "
+RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-time-local "
 RDEPENDS:perl-module-io-uncompress-unzip += "perl-module-warnings"
 RDEPENDS:perl-module-io-zlib += "perl-module-fcntl"
 RDEPENDS:perl-module-io-zlib += "perl-module-io-handle"
@@ -1196,6 +1192,7 @@ RDEPENDS:perl-module-ipc-sysv += "perl-module-vars"
 RDEPENDS:perl-module-ipc-sysv += "perl-module-xsloader"
 RDEPENDS:perl-module-json-pp-boolean += "perl-module-overload"
 RDEPENDS:perl-module-json-pp-boolean += "perl-module-strict"
+RDEPENDS:perl-module-json-pp-boolean += "perl-module-warnings"
 RDEPENDS:perl-module-json-pp += "perl-module-b"
 RDEPENDS:perl-module-json-pp += "perl-module-bytes"
 RDEPENDS:perl-module-json-pp += "perl-module-constant"
@@ -1206,7 +1203,6 @@ RDEPENDS:perl-module-json-pp += "perl-module-math-bigfloat"
 RDEPENDS:perl-module-json-pp += "perl-module-math-bigint"
 RDEPENDS:perl-module-json-pp += "perl-module-overload"
 RDEPENDS:perl-module-json-pp += "perl-module-strict"
-RDEPENDS:perl-module-json-pp += "perl-module-subs"
 RDEPENDS:perl-module-less += "perl-module-strict"
 RDEPENDS:perl-module-less += "perl-module-warnings"
 RDEPENDS:perl-module-lib += "perl-module-config"
@@ -1245,6 +1241,7 @@ RDEPENDS:perl-module-locale += "perl-module-strict"
 RDEPENDS:perl-module-locale += "perl-module-warnings"
 RDEPENDS:perl-module-math-bigfloat += "perl-module-exporter"
 RDEPENDS:perl-module-math-bigfloat += "perl-module-math-bigint"
+RDEPENDS:perl-module-math-bigfloat += "perl-module-math-bigrat"
 RDEPENDS:perl-module-math-bigfloat += "perl-module-math-complex"
 RDEPENDS:perl-module-math-bigfloat += "perl-module-overload"
 RDEPENDS:perl-module-math-bigfloat += "perl-module-strict"
@@ -1269,6 +1266,7 @@ RDEPENDS:perl-module-math-bigint-lib += "perl-module-strict"
 RDEPENDS:perl-module-math-bigint-lib += "perl-module-warnings"
 RDEPENDS:perl-module-math-bigint += "perl-module-exporter"
 RDEPENDS:perl-module-math-bigint += "perl-module-math-bigfloat"
+RDEPENDS:perl-module-math-bigint += "perl-module-math-bigrat"
 RDEPENDS:perl-module-math-bigint += "perl-module-math-complex"
 RDEPENDS:perl-module-math-bigint += "perl-module-overload"
 RDEPENDS:perl-module-math-bigint += "perl-module-strict"
@@ -1297,13 +1295,13 @@ RDEPENDS:perl-module-math-complex += "perl-module-warnings"
 RDEPENDS:perl-module-math-trig += "perl-module-exporter"
 RDEPENDS:perl-module-math-trig += "perl-module-math-complex"
 RDEPENDS:perl-module-math-trig += "perl-module-strict"
-RDEPENDS:perl-module-memoize-anydbm-file += "perl-module-vars"
-RDEPENDS:perl-module-memoize += "perl-module-config"
-RDEPENDS:perl-module-memoize += "perl-module-exporter"
+RDEPENDS:perl-module-memoize-anydbm-file += "perl-module-strict"
+RDEPENDS:perl-module-memoize-expire += "perl-module-strict"
 RDEPENDS:perl-module-memoize += "perl-module-strict"
-RDEPENDS:perl-module-memoize += "perl-module-vars"
 RDEPENDS:perl-module-memoize-sdbm-file += "perl-module-sdbm-file"
+RDEPENDS:perl-module-memoize-sdbm-file += "perl-module-strict"
 RDEPENDS:perl-module-memoize-storable += "perl-module-storable"
+RDEPENDS:perl-module-memoize-storable += "perl-module-strict"
 RDEPENDS:perl-module-mime-base64 += "perl-module-exporter"
 RDEPENDS:perl-module-mime-base64 += "perl-module-strict"
 RDEPENDS:perl-module-mime-base64 += "perl-module-warnings"
@@ -1362,11 +1360,9 @@ RDEPENDS:perl-module-net-ftp += "perl-module-warnings"
 RDEPENDS:perl-module-net-hostent += "perl-module-class-struct"
 RDEPENDS:perl-module-net-hostent += "perl-module-exporter"
 RDEPENDS:perl-module-net-hostent += "perl-module-socket"
-RDEPENDS:perl-module-net-hostent += "perl-module-strict"
 RDEPENDS:perl-module-net-netent += "perl-module-class-struct"
 RDEPENDS:perl-module-net-netent += "perl-module-exporter"
 RDEPENDS:perl-module-net-netent += "perl-module-socket"
-RDEPENDS:perl-module-net-netent += "perl-module-strict"
 RDEPENDS:perl-module-net-netrc += "perl-module-filehandle"
 RDEPENDS:perl-module-net-netrc += "perl-module-strict"
 RDEPENDS:perl-module-net-netrc += "perl-module-warnings"
@@ -1397,10 +1393,8 @@ RDEPENDS:perl-module-net-pop3 += "perl-module-strict"
 RDEPENDS:perl-module-net-pop3 += "perl-module-warnings"
 RDEPENDS:perl-module-net-protoent += "perl-module-class-struct"
 RDEPENDS:perl-module-net-protoent += "perl-module-exporter"
-RDEPENDS:perl-module-net-protoent += "perl-module-strict"
 RDEPENDS:perl-module-net-servent += "perl-module-class-struct"
 RDEPENDS:perl-module-net-servent += "perl-module-exporter"
-RDEPENDS:perl-module-net-servent += "perl-module-strict"
 RDEPENDS:perl-module-net-smtp += "perl-module-io-socket"
 RDEPENDS:perl-module-net-smtp += "perl-module-io-socket-ip"
 RDEPENDS:perl-module-net-smtp += "perl-module-mime-base64"
@@ -1446,7 +1440,6 @@ RDEPENDS:perl-module-perlio-encoding += "perl-module-xsloader"
 RDEPENDS:perl-module-perlio-mmap += "perl-module-strict"
 RDEPENDS:perl-module-perlio-mmap += "perl-module-warnings"
 RDEPENDS:perl-module-perlio-mmap += "perl-module-xsloader"
-RDEPENDS:perl-module-perlio-scalar += "perl-module-xsloader"
 RDEPENDS:perl-module-perlio-via += "perl-module-xsloader"
 RDEPENDS:perl-module-perlio-via-quotedprint += "perl-module-mime-quotedprint"
 RDEPENDS:perl-module-perlio-via-quotedprint += "perl-module-strict"
@@ -1461,14 +1454,12 @@ RDEPENDS:perl-module-pod-escapes += "perl-module-warnings"
 RDEPENDS:perl-module-pod-functions += "perl-module-exporter"
 RDEPENDS:perl-module-pod-functions += "perl-module-strict"
 RDEPENDS:perl-module-pod-man += "perl-module-file-basename"
+RDEPENDS:perl-module-pod-man += "perl-module-perlio"
 RDEPENDS:perl-module-pod-man += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-man += "perl-module-strict"
-RDEPENDS:perl-module-pod-man += "perl-module-subs"
-RDEPENDS:perl-module-pod-man += "perl-module-vars"
 RDEPENDS:perl-module-pod-man += "perl-module-warnings"
 RDEPENDS:perl-module-pod-parselink += "perl-module-exporter"
 RDEPENDS:perl-module-pod-parselink += "perl-module-strict"
-RDEPENDS:perl-module-pod-parselink += "perl-module-vars"
 RDEPENDS:perl-module-pod-parselink += "perl-module-warnings"
 RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-config"
 RDEPENDS:perl-module-pod-perldoc-baseto += "perl-module-strict"
@@ -1537,107 +1528,108 @@ RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-integer"
 RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-pod-simple-transcode"
 RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-blackbox += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-checker += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-checker += "perl-module-pod-simple-methody"
 RDEPENDS:perl-module-pod-simple-checker += "perl-module-strict"
 RDEPENDS:perl-module-pod-simple-checker += "perl-module-text-wrap"
-RDEPENDS:perl-module-pod-simple-checker += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-checker += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-debug += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-debug += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-debug += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-debug += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-dumpastext += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-dumpastext += "perl-module-strict"
+RDEPENDS:perl-module-pod-simple-dumpastext += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-strict"
 RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-text-wrap"
+RDEPENDS:perl-module-pod-simple-dumpasxml += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-justpod += "perl-module-pod-simple-methody"
 RDEPENDS:perl-module-pod-simple-justpod += "perl-module-strict"
 RDEPENDS:perl-module-pod-simple-justpod += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-linksection += "perl-module-overload"
 RDEPENDS:perl-module-pod-simple-linksection += "perl-module-pod-simple-blackbox"
 RDEPENDS:perl-module-pod-simple-linksection += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-linksection += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-linksection += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-methody += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-methody += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-methody += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-methody += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple += "perl-module-integer"
 RDEPENDS:perl-module-pod-simple += "perl-module-pod-escapes"
 RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-blackbox"
 RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-linksection"
 RDEPENDS:perl-module-pod-simple += "perl-module-pod-simple-tiedoutfh"
 RDEPENDS:perl-module-pod-simple += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-progress += "perl-module-strict"
+RDEPENDS:perl-module-pod-simple-progress += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-pod-simple-pullparsertoken"
 RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-pullparserendtoken += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserendtoken"
 RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparserstarttoken"
 RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-pod-simple-pullparsertexttoken"
 RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-strict"
+RDEPENDS:perl-module-pod-simple-pullparser += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-pod-simple-pullparsertoken"
 RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-pullparserstarttoken += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-pod-simple-pullparsertoken"
 RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-pullparsertexttoken += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-pullparsertoken += "perl-module-strict"
+RDEPENDS:perl-module-pod-simple-pullparsertoken += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-rtf += "perl-module-if"
 RDEPENDS:perl-module-pod-simple-rtf += "perl-module-integer"
 RDEPENDS:perl-module-pod-simple-rtf += "perl-module-pod-simple-pullparser"
 RDEPENDS:perl-module-pod-simple-rtf += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-rtf += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-rtf += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-search += "perl-module-config"
 RDEPENDS:perl-module-pod-simple-search += "perl-module-cwd"
 RDEPENDS:perl-module-pod-simple-search += "perl-module-file-basename"
 RDEPENDS:perl-module-pod-simple-search += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-search += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-search += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-simpletree += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-textcontent += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-text += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-text += "perl-module-pod-simple-methody"
 RDEPENDS:perl-module-pod-simple-text += "perl-module-strict"
 RDEPENDS:perl-module-pod-simple-text += "perl-module-text-wrap"
-RDEPENDS:perl-module-pod-simple-text += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-text += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-tiedoutfh += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-tiedoutfh += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-tiedoutfh += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-transcodedumb += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-transcodedumb += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-transcodedumb += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-transcode += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-transcode += "perl-module-vars"
 RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-encode"
 RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-transcodesmart += "perl-module-warnings"
 RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-strict"
-RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-vars"
+RDEPENDS:perl-module-pod-simple-xmloutstream += "perl-module-warnings"
 RDEPENDS:perl-module-pod-text-color += "perl-module-pod-text"
 RDEPENDS:perl-module-pod-text-color += "perl-module-strict"
 RDEPENDS:perl-module-pod-text-color += "perl-module-term-ansicolor"
-RDEPENDS:perl-module-pod-text-color += "perl-module-vars"
 RDEPENDS:perl-module-pod-text-color += "perl-module-warnings"
 RDEPENDS:perl-module-pod-text-overstrike += "perl-module-pod-text"
 RDEPENDS:perl-module-pod-text-overstrike += "perl-module-strict"
-RDEPENDS:perl-module-pod-text-overstrike += "perl-module-vars"
 RDEPENDS:perl-module-pod-text-overstrike += "perl-module-warnings"
 RDEPENDS:perl-module-pod-text += "perl-module-encode"
 RDEPENDS:perl-module-pod-text += "perl-module-exporter"
+RDEPENDS:perl-module-pod-text += "perl-module-perlio"
 RDEPENDS:perl-module-pod-text += "perl-module-pod-simple"
 RDEPENDS:perl-module-pod-text += "perl-module-strict"
-RDEPENDS:perl-module-pod-text += "perl-module-vars"
 RDEPENDS:perl-module-pod-text += "perl-module-warnings"
 RDEPENDS:perl-module-pod-text-termcap += "perl-module-pod-text"
 RDEPENDS:perl-module-pod-text-termcap += "perl-module-posix"
 RDEPENDS:perl-module-pod-text-termcap += "perl-module-strict"
 RDEPENDS:perl-module-pod-text-termcap += "perl-module-term-cap"
-RDEPENDS:perl-module-pod-text-termcap += "perl-module-vars"
 RDEPENDS:perl-module-pod-text-termcap += "perl-module-warnings"
 RDEPENDS:perl-module-pod-usage += "perl-module-config"
 RDEPENDS:perl-module-pod-usage += "perl-module-exporter"
@@ -1674,6 +1666,10 @@ RDEPENDS:perl-module-socket += "perl-module-warnings-register"
 RDEPENDS:perl-module-socket += "perl-module-xsloader"
 RDEPENDS:perl-module-sort += "perl-module-strict"
 RDEPENDS:perl-module-sort += "perl-module-warnings"
+RDEPENDS:perl-module-stable += "perl-module-experimental"
+RDEPENDS:perl-module-stable += "perl-module-strict"
+RDEPENDS:perl-module-stable += "perl-module-version"
+RDEPENDS:perl-module-stable += "perl-module-warnings"
 RDEPENDS:perl-module-storable += "perl-module-exporter"
 RDEPENDS:perl-module-storable += "perl-module-io-file"
 RDEPENDS:perl-module-subs += "perl-module-strict"
@@ -1899,6 +1895,34 @@ RDEPENDS:perl-module-term-complete += "perl-module-exporter"
 RDEPENDS:perl-module-term-complete += "perl-module-strict"
 RDEPENDS:perl-module-term-readline += "perl-module-strict"
 RDEPENDS:perl-module-term-readline += "perl-module-term-cap"
+RDEPENDS:perl-module-term-table-cell += "perl-module-list-util"
+RDEPENDS:perl-module-term-table-cell += "perl-module-strict"
+RDEPENDS:perl-module-term-table-cell += "perl-module-term-table-hashbase"
+RDEPENDS:perl-module-term-table-cell += "perl-module-term-table-linebreak"
+RDEPENDS:perl-module-term-table-cell += "perl-module-term-table-util"
+RDEPENDS:perl-module-term-table-cell += "perl-module-warnings"
+RDEPENDS:perl-module-term-table-cellstack += "perl-module-list-util"
+RDEPENDS:perl-module-term-table-cellstack += "perl-module-strict"
+RDEPENDS:perl-module-term-table-cellstack += "perl-module-term-table-hashbase"
+RDEPENDS:perl-module-term-table-cellstack += "perl-module-warnings"
+RDEPENDS:perl-module-term-table-hashbase += "perl-module-strict"
+RDEPENDS:perl-module-term-table-hashbase += "perl-module-warnings"
+RDEPENDS:perl-module-term-table-linebreak += "perl-module-strict"
+RDEPENDS:perl-module-term-table-linebreak += "perl-module-term-table-hashbase"
+RDEPENDS:perl-module-term-table-linebreak += "perl-module-term-table-util"
+RDEPENDS:perl-module-term-table-linebreak += "perl-module-warnings"
+RDEPENDS:perl-module-term-table += "perl-module-list-util"
+RDEPENDS:perl-module-term-table += "perl-module-strict"
+RDEPENDS:perl-module-term-table += "perl-module-term-table-cell"
+RDEPENDS:perl-module-term-table += "perl-module-term-table-hashbase"
+RDEPENDS:perl-module-term-table += "perl-module-term-table-util"
+RDEPENDS:perl-module-term-table += "perl-module-warnings"
+RDEPENDS:perl-module-term-table-spacer += "perl-module-strict"
+RDEPENDS:perl-module-term-table-spacer += "perl-module-warnings"
+RDEPENDS:perl-module-term-table-util += "perl-module-base"
+RDEPENDS:perl-module-term-table-util += "perl-module-config"
+RDEPENDS:perl-module-term-table-util += "perl-module-strict"
+RDEPENDS:perl-module-term-table-util += "perl-module-warnings"
 RDEPENDS:perl-module-test2-api-breakage += "perl-module-strict"
 RDEPENDS:perl-module-test2-api-breakage += "perl-module-test2-util"
 RDEPENDS:perl-module-test2-api-breakage += "perl-module-warnings"
@@ -1964,6 +1988,193 @@ RDEPENDS:perl-module-test2-api-stack += "perl-module-strict"
 RDEPENDS:perl-module-test2-api-stack += "perl-module-test2-api"
 RDEPENDS:perl-module-test2-api-stack += "perl-module-test2-hub"
 RDEPENDS:perl-module-test2-api-stack += "perl-module-warnings"
+RDEPENDS:perl-module-test2-asyncsubtest-event-attach += "perl-module-base"
+RDEPENDS:perl-module-test2-asyncsubtest-event-attach += "perl-module-strict"
+RDEPENDS:perl-module-test2-asyncsubtest-event-attach += "perl-module-test2-event-exception"
+RDEPENDS:perl-module-test2-asyncsubtest-event-attach += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-asyncsubtest-event-attach += "perl-module-warnings"
+RDEPENDS:perl-module-test2-asyncsubtest-event-detach += "perl-module-base"
+RDEPENDS:perl-module-test2-asyncsubtest-event-detach += "perl-module-strict"
+RDEPENDS:perl-module-test2-asyncsubtest-event-detach += "perl-module-test2-event-exception"
+RDEPENDS:perl-module-test2-asyncsubtest-event-detach += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-asyncsubtest-event-detach += "perl-module-warnings"
+RDEPENDS:perl-module-test2-asyncsubtest-formatter += "perl-module-strict"
+RDEPENDS:perl-module-test2-asyncsubtest-formatter += "perl-module-warnings"
+RDEPENDS:perl-module-test2-asyncsubtest-hub += "perl-module-base"
+RDEPENDS:perl-module-test2-asyncsubtest-hub += "perl-module-strict"
+RDEPENDS:perl-module-test2-asyncsubtest-hub += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-asyncsubtest-hub += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-asyncsubtest-hub += "perl-module-warnings"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-list-util"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-strict"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-api-context"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-asyncsubtest-event-attach"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-asyncsubtest-event-detach"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-asyncsubtest-hub"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-ipc"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-util-guard"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-test2-util-trace"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-time-hires"
+RDEPENDS:perl-module-test2-asyncsubtest += "perl-module-warnings"
+RDEPENDS:perl-module-test2-bundle-extended += "perl-module-strict"
+RDEPENDS:perl-module-test2-bundle-extended += "perl-module-test2-v0"
+RDEPENDS:perl-module-test2-bundle-extended += "perl-module-warnings"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-base"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-strict"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-test2-plugin-exitsummary"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-test2-tools-basic"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-test2-tools-class"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-test2-tools-classiccompare"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-test2-tools-subtest"
+RDEPENDS:perl-module-test2-bundle-more += "perl-module-warnings"
+RDEPENDS:perl-module-test2-bundle += "perl-module-strict"
+RDEPENDS:perl-module-test2-bundle += "perl-module-warnings"
+RDEPENDS:perl-module-test2-bundle-simple += "perl-module-base"
+RDEPENDS:perl-module-test2-bundle-simple += "perl-module-strict"
+RDEPENDS:perl-module-test2-bundle-simple += "perl-module-test2-plugin-exitsummary"
+RDEPENDS:perl-module-test2-bundle-simple += "perl-module-test2-tools-basic"
+RDEPENDS:perl-module-test2-bundle-simple += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-array += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-array += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-array += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-array += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-bag += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-bag += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-bag += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-bag += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-test2-compare-delta"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-test2-util-sub"
+RDEPENDS:perl-module-test2-compare-base += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-bool += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-bool += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-bool += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-bool += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-bool += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-custom += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-custom += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-custom += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-custom += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-deepref += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-deepref += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-deepref += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-deepref += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare-deepref += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-test2-eventfacet-info-table"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-test2-util-table"
+RDEPENDS:perl-module-test2-compare-delta += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-eventmeta += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-eventmeta += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-eventmeta += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-eventmeta += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-event += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-event += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-event += "perl-module-test2-compare-eventmeta"
+RDEPENDS:perl-module-test2-compare-event += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-event += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-float += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-float += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-float += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-float += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-float += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-hash += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-hash += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-hash += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-hash += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-isa += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-isa += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-isa += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-isa += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-isa += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-test2-compare-delta"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-test2-compare-isa"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-meta += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-negatable += "perl-module-overload"
+RDEPENDS:perl-module-test2-compare-negatable += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-negatable += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-negatable += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-number += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-number += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-number += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-number += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-number += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-test2-compare-meta"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-object += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-orderedsubset += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-orderedsubset += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-orderedsubset += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-orderedsubset += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-pattern += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-pattern += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-pattern += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-pattern += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-pattern += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare += "perl-module-base"
+RDEPENDS:perl-module-test2-compare += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-array"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-base"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-custom"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-deepref"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-hash"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-pattern"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-ref"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-regex"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-scalar"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-string"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-undef"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-compare-wildcard"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-compare += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-ref += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-ref += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-ref += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-ref += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare-ref += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-regex += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-regex += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-regex += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-regex += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-compare-regex += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-scalar += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-scalar += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-scalar += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-scalar += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-set += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-set += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-set += "perl-module-test2-compare-delta"
+RDEPENDS:perl-module-test2-compare-set += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-set += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-string += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-string += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-string += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-string += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-string += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-undef += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-undef += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-undef += "perl-module-test2-compare-negatable"
+RDEPENDS:perl-module-test2-compare-undef += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-undef += "perl-module-warnings"
+RDEPENDS:perl-module-test2-compare-wildcard += "perl-module-base"
+RDEPENDS:perl-module-test2-compare-wildcard += "perl-module-strict"
+RDEPENDS:perl-module-test2-compare-wildcard += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-compare-wildcard += "perl-module-warnings"
 RDEPENDS:perl-module-test2-event-bail += "perl-module-strict"
 RDEPENDS:perl-module-test2-event-bail += "perl-module-test2-util-hashbase"
 RDEPENDS:perl-module-test2-event-bail += "perl-module-warnings"
@@ -2018,6 +2229,7 @@ RDEPENDS:perl-module-test2-eventfacet-render += "perl-module-warnings"
 RDEPENDS:perl-module-test2-eventfacet-trace += "perl-module-strict"
 RDEPENDS:perl-module-test2-eventfacet-trace += "perl-module-test2-util"
 RDEPENDS:perl-module-test2-eventfacet-trace += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-eventfacet-trace += "perl-module-time-hires"
 RDEPENDS:perl-module-test2-eventfacet-trace += "perl-module-warnings"
 RDEPENDS:perl-module-test2-event-fail += "perl-module-strict"
 RDEPENDS:perl-module-test2-event-fail += "perl-module-test2-event"
@@ -2120,8 +2332,278 @@ RDEPENDS:perl-module-test2-ipc += "perl-module-test2-api-instance"
 RDEPENDS:perl-module-test2-ipc += "perl-module-test2-ipc-driver-files"
 RDEPENDS:perl-module-test2-ipc += "perl-module-test2-util"
 RDEPENDS:perl-module-test2-ipc += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-api += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-api += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-context += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-context += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-endtoend += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-endtoend += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-event += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-event += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-hubs += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-hubs += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-ipc += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-ipc += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-anatomy-utilities += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-anatomy-utilities += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-concurrency += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-concurrency += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-testing-introduction += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-testing-introduction += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-testing-migrating += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-testing-migrating += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-testing += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-testing += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-testing-planning += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-testing-planning += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-testing-todo += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-testing-todo += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-tooling-nesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-tooling-nesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-tooling += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-tooling += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-tooling-subtest += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-tooling-subtest += "perl-module-warnings"
+RDEPENDS:perl-module-test2-manual-tooling-testing += "perl-module-strict"
+RDEPENDS:perl-module-test2-manual-tooling-testing += "perl-module-warnings"
+RDEPENDS:perl-module-test2-mock += "perl-module-strict"
+RDEPENDS:perl-module-test2-mock += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-mock += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-mock += "perl-module-test2-util-stash"
+RDEPENDS:perl-module-test2-mock += "perl-module-test2-util-sub"
+RDEPENDS:perl-module-test2-mock += "perl-module-warnings"
 RDEPENDS:perl-module-test2 += "perl-module-strict"
 RDEPENDS:perl-module-test2 += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-bailonfail += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-bailonfail += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-bailonfail += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-dieonfail += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-dieonfail += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-dieonfail += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-exitsummary += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-exitsummary += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-exitsummary += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-srand += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-srand += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-srand += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-times += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-times += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-times += "perl-module-test2-util-times"
+RDEPENDS:perl-module-test2-plugin-times += "perl-module-time-hires"
+RDEPENDS:perl-module-test2-plugin-times += "perl-module-warnings"
+RDEPENDS:perl-module-test2-plugin-utf8 += "perl-module-strict"
+RDEPENDS:perl-module-test2-plugin-utf8 += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-plugin-utf8 += "perl-module-utf8"
+RDEPENDS:perl-module-test2-plugin-utf8 += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-authortesting += "perl-module-base"
+RDEPENDS:perl-module-test2-require-authortesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-authortesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-automatedtesting += "perl-module-base"
+RDEPENDS:perl-module-test2-require-automatedtesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-automatedtesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-envvar += "perl-module-base"
+RDEPENDS:perl-module-test2-require-envvar += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-envvar += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-extendedtesting += "perl-module-base"
+RDEPENDS:perl-module-test2-require-extendedtesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-extendedtesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-fork += "perl-module-base"
+RDEPENDS:perl-module-test2-require-fork += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-fork += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-require-fork += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-module += "perl-module-base"
+RDEPENDS:perl-module-test2-require-module += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-module += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-require-module += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-noninteractivetesting += "perl-module-base"
+RDEPENDS:perl-module-test2-require-noninteractivetesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-noninteractivetesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require += "perl-module-strict"
+RDEPENDS:perl-module-test2-require += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-require += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-perl += "perl-module-base"
+RDEPENDS:perl-module-test2-require-perl += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-perl += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-require-perl += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-realfork += "perl-module-base"
+RDEPENDS:perl-module-test2-require-realfork += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-realfork += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-require-realfork += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-releasetesting += "perl-module-base"
+RDEPENDS:perl-module-test2-require-releasetesting += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-releasetesting += "perl-module-warnings"
+RDEPENDS:perl-module-test2-require-threads += "perl-module-base"
+RDEPENDS:perl-module-test2-require-threads += "perl-module-strict"
+RDEPENDS:perl-module-test2-require-threads += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-require-threads += "perl-module-warnings"
+RDEPENDS:perl-module-test2-suite += "perl-module-strict"
+RDEPENDS:perl-module-test2-suite += "perl-module-warnings"
+RDEPENDS:perl-module-test2-todo += "perl-module-overload"
+RDEPENDS:perl-module-test2-todo += "perl-module-strict"
+RDEPENDS:perl-module-test2-todo += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-todo += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-todo += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-test2-asyncsubtest"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-test2-ipc"
+RDEPENDS:perl-module-test2-tools-asyncsubtest += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-basic += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-basic += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-basic += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-basic += "perl-module-test2-todo"
+RDEPENDS:perl-module-test2-tools-basic += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-array"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-bag"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-custom"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-event"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-hash"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-meta"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-number"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-object"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-orderedsubset"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-pattern"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-ref"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-regex"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-scalar"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-set"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-string"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-undef"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-compare-wildcard"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-test2-util-table"
+RDEPENDS:perl-module-test2-tools-classiccompare += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-class += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-class += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-class += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-class += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-tools-class += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-data-dumper"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-array"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-bag"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-bool"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-custom"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-deepref"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-event"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-float"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-hash"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-isa"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-meta"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-number"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-object"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-orderedsubset"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-pattern"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-ref"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-regex"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-scalar"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-set"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-string"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-undef"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-compare-wildcard"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-tools-compare += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-data-dumper"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-defer += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-encoding += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-encoding += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-encoding += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-encoding += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-event += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-event += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-event += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-event += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-exception += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-exception += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-exception += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-exception += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-exports += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-exports += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-exports += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-exports += "perl-module-test2-util-stash"
+RDEPENDS:perl-module-test2-tools-exports += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-gentemp += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-gentemp += "perl-module-file-temp"
+RDEPENDS:perl-module-test2-tools-gentemp += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-gentemp += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-grab += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-grab += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-grab += "perl-module-test2-eventfacet-trace"
+RDEPENDS:perl-module-test2-tools-grab += "perl-module-test2-util-grabber"
+RDEPENDS:perl-module-test2-tools-grab += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-test2-mock"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-test2-util-sub"
+RDEPENDS:perl-module-test2-tools-mock += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-b"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-constant"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-refcount += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-ref += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-ref += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-ref += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-ref += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-tools-ref += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-tools-mock"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-util-importer"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-workflow"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-workflow-runner"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-workflow-task-action"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-test2-workflow-task-group"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-vars"
+RDEPENDS:perl-module-test2-tools-spec += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-subtest += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-subtest += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-subtest += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-subtest += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-subtest += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-target += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-target += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-tools-target += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-about"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-amnesty"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-assert"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-control"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-error"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-hub"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-info"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-info-table"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-meta"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-parent"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-plan"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-render"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-eventfacet-trace"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-util-importer"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-test2-util-ref"
+RDEPENDS:perl-module-test2-tools-tester += "perl-module-warnings"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-data-dumper"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-strict"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-test2-api"
@@ -2129,20 +2611,127 @@ RDEPENDS:perl-module-test2-tools-tiny += "perl-module-test2-hub-interceptor"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-test2-hub-interceptor-terminator"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-test2-util"
 RDEPENDS:perl-module-test2-tools-tiny += "perl-module-warnings"
+RDEPENDS:perl-module-test2-tools-warnings += "perl-module-base"
+RDEPENDS:perl-module-test2-tools-warnings += "perl-module-strict"
+RDEPENDS:perl-module-test2-tools-warnings += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-tools-warnings += "perl-module-warnings"
 RDEPENDS:perl-module-test2-util-externalmeta += "perl-module-strict"
 RDEPENDS:perl-module-test2-util-externalmeta += "perl-module-warnings"
 RDEPENDS:perl-module-test2-util-facets2legacy += "perl-module-base"
 RDEPENDS:perl-module-test2-util-facets2legacy += "perl-module-strict"
 RDEPENDS:perl-module-test2-util-facets2legacy += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-test2-eventfacet-trace"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-test2-hub-interceptor"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-util-grabber += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-guard += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-guard += "perl-module-warnings"
 RDEPENDS:perl-module-test2-util-hashbase += "perl-module-strict"
 RDEPENDS:perl-module-test2-util-hashbase += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-importer += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-importer += "perl-module-warnings"
 RDEPENDS:perl-module-test2-util += "perl-module-config"
 RDEPENDS:perl-module-test2-util += "perl-module-posix"
 RDEPENDS:perl-module-test2-util += "perl-module-strict"
 RDEPENDS:perl-module-test2-util += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-ref += "perl-module-base"
+RDEPENDS:perl-module-test2-util-ref += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-ref += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-stash += "perl-module-b"
+RDEPENDS:perl-module-test2-util-stash += "perl-module-base"
+RDEPENDS:perl-module-test2-util-stash += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-stash += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-sub += "perl-module-b"
+RDEPENDS:perl-module-test2-util-sub += "perl-module-base"
+RDEPENDS:perl-module-test2-util-sub += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-sub += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-table-cell += "perl-module-base"
+RDEPENDS:perl-module-test2-util-table-cell += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-table-cell += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-table-linebreak += "perl-module-base"
+RDEPENDS:perl-module-test2-util-table-linebreak += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-table-linebreak += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-table += "perl-module-base"
+RDEPENDS:perl-module-test2-util-table += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-table += "perl-module-test2-util-importer"
+RDEPENDS:perl-module-test2-util-table += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-term += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-term += "perl-module-term-table-util"
+RDEPENDS:perl-module-test2-util-term += "perl-module-test2-util-importer"
+RDEPENDS:perl-module-test2-util-term += "perl-module-warnings"
+RDEPENDS:perl-module-test2-util-times += "perl-module-base"
+RDEPENDS:perl-module-test2-util-times += "perl-module-list-util"
+RDEPENDS:perl-module-test2-util-times += "perl-module-strict"
+RDEPENDS:perl-module-test2-util-times += "perl-module-warnings"
 RDEPENDS:perl-module-test2-util-trace += "perl-module-strict"
 RDEPENDS:perl-module-test2-util-trace += "perl-module-test2-eventfacet-trace"
 RDEPENDS:perl-module-test2-util-trace += "perl-module-warnings"
+RDEPENDS:perl-module-test2-v0 += "perl-module-strict"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-plugin-exitsummary"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-plugin-srand"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-plugin-utf8"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-basic"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-class"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-classiccompare"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-compare"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-defer"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-encoding"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-event"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-exception"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-exports"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-mock"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-ref"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-refcount"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-target"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-tools-warnings"
+RDEPENDS:perl-module-test2-v0 += "perl-module-test2-util-importer"
+RDEPENDS:perl-module-test2-v0 += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-list-util"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-test2-util-sub"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-test2-util-trace"
+RDEPENDS:perl-module-test2-workflow-blockbase += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-build += "perl-module-base"
+RDEPENDS:perl-module-test2-workflow-build += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-build += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-build += "perl-module-test2-workflow-task-group"
+RDEPENDS:perl-module-test2-workflow-build += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow += "perl-module-base"
+RDEPENDS:perl-module-test2-workflow += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-workflow += "perl-module-test2-workflow-build"
+RDEPENDS:perl-module-test2-workflow += "perl-module-test2-workflow-task-group"
+RDEPENDS:perl-module-test2-workflow += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-list-util"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-overload"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-test2-asyncsubtest"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-test2-todo"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-test2-util"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-time-hires"
+RDEPENDS:perl-module-test2-workflow-runner += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-task-action += "perl-module-base"
+RDEPENDS:perl-module-test2-workflow-task-action += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-task-action += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-task-action += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-task-group += "perl-module-base"
+RDEPENDS:perl-module-test2-workflow-task-group += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-task-group += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-task-group += "perl-module-test2-workflow-task-action"
+RDEPENDS:perl-module-test2-workflow-task-group += "perl-module-warnings"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-base"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-list-util"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-strict"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-test2-api"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-test2-event-exception"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-test2-util-hashbase"
+RDEPENDS:perl-module-test2-workflow-task += "perl-module-warnings"
 RDEPENDS:perl-module-test-builder-formatter += "perl-module-strict"
 RDEPENDS:perl-module-test-builder-formatter += "perl-module-test2-util-hashbase"
 RDEPENDS:perl-module-test-builder-formatter += "perl-module-warnings"
@@ -2237,6 +2826,7 @@ RDEPENDS:perl-module-threads-shared += "perl-module-strict"
 RDEPENDS:perl-module-threads-shared += "perl-module-warnings"
 RDEPENDS:perl-module-threads-shared += "perl-module-xsloader"
 RDEPENDS:perl-module-tie-array += "perl-module-strict"
+RDEPENDS:perl-module-tie-file += "perl-module-constant"
 RDEPENDS:perl-module-tie-file += "perl-module-fcntl"
 RDEPENDS:perl-module-tie-file += "perl-module-posix"
 RDEPENDS:perl-module-tie-file += "perl-module-strict"
@@ -2258,8 +2848,7 @@ RDEPENDS:perl-module-tie-substrhash += "perl-module-integer"
 RDEPENDS:perl-module-tie-substrhash += "perl-module-strict"
 RDEPENDS:perl-module-tie-substrhash += "perl-module-warnings"
 RDEPENDS:perl-module-time-gmtime += "perl-module-exporter"
-RDEPENDS:perl-module-time-gmtime += "perl-module-strict"
-RDEPENDS:perl-module-time-gmtime += "perl-module-time-tm"
+RDEPENDS:perl-module-time-gmtime += "perl-module-parent"
 RDEPENDS:perl-module-time-hires += "perl-module-exporter"
 RDEPENDS:perl-module-time-hires += "perl-module-strict"
 RDEPENDS:perl-module-time-hires += "perl-module-xsloader"
@@ -2269,8 +2858,7 @@ RDEPENDS:perl-module-time-local += "perl-module-exporter"
 RDEPENDS:perl-module-time-local += "perl-module-parent"
 RDEPENDS:perl-module-time-local += "perl-module-strict"
 RDEPENDS:perl-module-time-localtime += "perl-module-exporter"
-RDEPENDS:perl-module-time-localtime += "perl-module-strict"
-RDEPENDS:perl-module-time-localtime += "perl-module-time-tm"
+RDEPENDS:perl-module-time-localtime += "perl-module-parent"
 RDEPENDS:perl-module-time-piece += "perl-module-constant"
 RDEPENDS:perl-module-time-piece += "perl-module-exporter"
 RDEPENDS:perl-module-time-piece += "perl-module-integer"
@@ -2284,7 +2872,6 @@ RDEPENDS:perl-module-time-seconds += "perl-module-exporter"
 RDEPENDS:perl-module-time-seconds += "perl-module-overload"
 RDEPENDS:perl-module-time-seconds += "perl-module-strict"
 RDEPENDS:perl-module-time-tm += "perl-module-class-struct"
-RDEPENDS:perl-module-time-tm += "perl-module-strict"
 RDEPENDS:perl-module-unicode-collate-cjk-big5 += "perl-module-strict"
 RDEPENDS:perl-module-unicode-collate-cjk-big5 += "perl-module-warnings"
 RDEPENDS:perl-module-unicode-collate-cjk-gb2312 += "perl-module-strict"
@@ -2322,12 +2909,9 @@ RDEPENDS:perl-module-unicode-ucd += "perl-module-unicode-normalize"
 RDEPENDS:perl-module-unicode-ucd += "perl-module-warnings"
 RDEPENDS:perl-module-user-grent += "perl-module-class-struct"
 RDEPENDS:perl-module-user-grent += "perl-module-exporter"
-RDEPENDS:perl-module-user-grent += "perl-module-strict"
 RDEPENDS:perl-module-user-pwent += "perl-module-class-struct"
 RDEPENDS:perl-module-user-pwent += "perl-module-config"
 RDEPENDS:perl-module-user-pwent += "perl-module-exporter"
-RDEPENDS:perl-module-user-pwent += "perl-module-strict"
-RDEPENDS:perl-module-user-pwent += "perl-module-warnings"
 RDEPENDS:perl-module-utf8 += "perl-module-strict"
 RDEPENDS:perl-module-utf8 += "perl-module-warnings"
 RDEPENDS:perl-module-version += "perl-module-strict"
diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc
index e07355d3f54..4b4756118ce 100644
--- a/meta/recipes-devtools/perl/perl-ptest.inc
+++ b/meta/recipes-devtools/perl/perl-ptest.inc
@@ -45,6 +45,9 @@ do_install_ptest () {
 
 	 # Remove files with host-specific configuration for building native binaries
 	 rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh
+
+         # create an empty file that is checked for existence by makerel test
+         touch ${D}${PTEST_PATH}/win32/Makefile
 }
 
 python populate_packages:prepend() {
diff --git a/meta/recipes-devtools/perl/perl_5.38.2.bb b/meta/recipes-devtools/perl/perl_5.40.0.bb
similarity index 96%
rename from meta/recipes-devtools/perl/perl_5.38.2.bb
rename to meta/recipes-devtools/perl/perl_5.40.0.bb
index 63909c242d4..77b92ae804e 100644
--- a/meta/recipes-devtools/perl/perl_5.38.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.40.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
            file://0002-Constant-Fix-up-shebang.patch \
            file://determinism.patch \
            file://0001-cpan-Sys-Syslog-Makefile.PL-Fix-_PATH_LOG-for-determ.patch \
-           file://0001-Fix-intermittent-failure-of-test-t-op-sigsystem.t.patch \
            "
 SRC_URI:append:class-native = " \
            file://perl-configpm-switch.patch \
@@ -26,7 +25,7 @@ SRC_URI:append:class-target = " \
            file://encodefix.patch \
 "
 
-SRC_URI[perl.sha256sum] = "a0a31534451eb7b83c7d6594a497543a54d488bc90ca00f5e34762577f40655e"
+SRC_URI[perl.sha256sum] = "c740348f357396327a9795d3e8323bafd0fe8a5c7835fc1cbaba0cc8dfe7161f"
 
 B = "${WORKDIR}/perl-${PV}-build"
 
@@ -39,10 +38,13 @@ DEPENDS += "make-native"
 PERL_LIB_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}.0"
 
 PACKAGECONFIG ??= "gdbm"
-PACKAGECONFIG:append:libc-musl = " anylocale"
+PACKAGECONFIG:append:libc-musl = " anylocale lcallnopairs"
 PACKAGECONFIG[bdb] = ",-Ui_db,db"
 PACKAGECONFIG[gdbm] = ",-Ui_gdbm,gdbm"
 PACKAGECONFIG[anylocale] = "-Dd_setlocale_accepts_any_locale_name=define,,"
+PACKAGECONFIG[lcallnopairs] = "-Dd_perl_lc_all_uses_name_value_pairs=undef -Dd_perl_lc_all_category_positions_init=define -Dd_perl_lc_all_separator=define,,"
+
+PACKAGECONFIG_CONFARGS:append:libc-musl = " -Dperl_lc_all_category_positions_init='{ 0, 1, 2, 3, 4, 5 }' -Dperl_lc_all_separator='";"'"
 
 # Don't generate comments in enc2xs output files. They are not reproducible
 export ENC2XS_NO_COMMENTS = "1"
@@ -392,9 +394,10 @@ EOPREAMBLE
     egrep -r "^\s*(\<use .*|\<require .*);?" perl-module-* --include="*.pm" | \
     sed "s/\/.*\.pm: */ += /g;s/[\"\']//g;s/;.*/\"/g;s/+= .*\(require\|use\)\> */+= \"perl-module-/g;s/CPANPLUS::.*/cpanplus/g;s/CPAN::.*/cpan/g;s/::/-/g;s/ [^+\"].*//g;s/_/-/g;s/\.pl\"$/\"/;s/\"\?\$/\"/;s/(//;s/)//;" | tr [:upper:] [:lower:] | \
     awk '{if ($3 != "\x22"$1"\x22"){ print $0}}'| \
-    grep -v -e "\-vms\-" -e module-5 -e "^$" -e "\\$" -e your -e tk -e autoperl -e html -e http -e parse-cpan -e perl-ostype -e ndbm-file -e module-mac -e fcgi -e lwp -e dbd -e dbix | \
+    grep -v -e "\-vms\-" -e module-5 -e module-v5 -e "^$" -e "\\$" -e your -e tk -e autoperl -e html -e http -e parse-cpan -e perl-ostype -e ndbm-file -e module-mac -e fcgi -e lwp -e dbd -e dbix | \
     sort -u | \
     sed 's/^/RDEPENDS:/;s/perl-module-/${PN}-module-/g;s/module-\(module-\)/\1/g;s/\(module-load\)-conditional/\1/g;s/encode-configlocal/&-pm/;' | \
+    egrep -wv 'module-devel-mat-dumper|module-net-ssleay|module-pluggable|module-io-compress-xz|module-io-compress-zstd' | \
     egrep -wv '=>|module-a|module-apache.?|module-apr|module-authen-sasl|module-b-asmdata|module-convert-ebcdic|module-devel-size|module-digest-perl-md5|module-dumpvalue|module-extutils-constant-aaargh56hash|module-extutils-xssymset|module-file-bsdglob|module-for|module-it|module-io-socket-inet6|module-io-socket-ssl|module-io-string|module-ipc-system-simple|module-lexical|module-local-lib|metadata|module-modperl-util|module-pluggable-object|module-test-builder-io-scalar|module-text-unidecode|module-unicore|module-win32|objects\sload|syscall.ph|systeminfo.ph|%s' | \
     egrep -wv '=>|module-algorithm-diff|module-carp|module-c<extutils-mm-unix>|module-l<extutils-mm-unix>|module-encode-hanextra|module-extutils-makemaker-version-regex|module-file-spec|module-io-compress-lzma|module-io-uncompress-unxz|module-locale-maketext-lexicon|module-log-agent|module-meta-notation|module-net-localcfg|module-net-ping-external|module-b-deparse|module-scalar-util|module-some-module|module-symbol|module-uri|module-win32api-file' > ${WORKDIR}/perl-rdepends.generated
     cat ${WORKDIR}/perl-rdepends.inc ${WORKDIR}/perl-rdepends.generated > ${THISDIR}/files/perl-rdepends.txt
-- 
2.39.2

[PATCH 11/34] gnu-config: update to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/gnu-config/gnu-config_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 95a7d5485ba..60601d23e22 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -9,8 +9,8 @@ DEPENDS:class-native = "hostperl-runtime-native"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-SRCREV = "948ae97ca5703224bd3eada06b7a69f40dd15a02"
-PV = "20240101+git"
+SRCREV = "00b15927496058d23e6258a28d8996f87cf1f191"
+PV = "20240823+git"
 
 SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \
            file://gnu-configize.in"
-- 
2.39.2

[PATCH 12/34] python3-license-expression: update 30.3.0 -> 30.3.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...pression_30.3.0.bb => python3-license-expression_30.3.1.bb} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-license-expression_30.3.0.bb => python3-license-expression_30.3.1.bb} (87%)

diff --git a/meta/recipes-devtools/python/python3-license-expression_30.3.0.bb b/meta/recipes-devtools/python/python3-license-expression_30.3.1.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-license-expression_30.3.0.bb
rename to meta/recipes-devtools/python/python3-license-expression_30.3.1.bb
index f36336b592e..edf7ead2e42 100644
--- a/meta/recipes-devtools/python/python3-license-expression_30.3.0.bb
+++ b/meta/recipes-devtools/python/python3-license-expression_30.3.1.bb
@@ -4,9 +4,10 @@ HOMEPAGE = "https://github.com/nexB/license-expression"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRC_URI[sha256sum] = "1295406f736b4f395ff069aec1cebfad53c0fcb3cf57df0f5ec58fc7b905aea5"
+SRC_URI[sha256sum] = "60d5bec1f3364c256a92b9a08583d7ea933c7aa272c8d36d04144a89a3858c01"
 
 inherit pypi ptest python_setuptools_build_meta
+PYPI_PACKAGE = "license_expression"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-- 
2.39.2

[PATCH 13/34] python3-pip: 24.0 -> 24.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

License-update: formatting, newly added trustore is under MIT.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python/python3-pip/no_shebang_mangling.patch   |  8 ++++----
 .../{python3-pip_24.0.bb => python3-pip_24.2.bb}   | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)
 rename meta/recipes-devtools/python/{python3-pip_24.0.bb => python3-pip_24.2.bb} (73%)

diff --git a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch
index 99fa14ee031..0481a78a88a 100644
--- a/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch
+++ b/meta/recipes-devtools/python/python3-pip/no_shebang_mangling.patch
@@ -1,4 +1,4 @@
-From 2aa82aeb0783c5fa7777b32bfe1dd3da9ae8fc6e Mon Sep 17 00:00:00 2001
+From 41542c2bf85c1c79bb55e6549e8f844b3a1db208 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Wed, 23 Feb 2022 12:27:06 +0000
 Subject: [PATCH] python3-pip: Don't change shebang
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific config]
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/pip/_vendor/distlib/scripts.py b/src/pip/_vendor/distlib/scripts.py
-index cfa45d2..313f499 100644
+index e16292b..a3a161d 100644
 --- a/src/pip/_vendor/distlib/scripts.py
 +++ b/src/pip/_vendor/distlib/scripts.py
-@@ -144,6 +144,8 @@ class ScriptMaker(object):
+@@ -162,6 +162,8 @@ class ScriptMaker(object):
          See also: http://www.in-ulm.de/~mascheck/various/shebang/#length
                    https://hg.mozilla.org/mozilla-central/file/tip/mach
          """
@@ -25,7 +25,7 @@ index cfa45d2..313f499 100644
          if os.name != 'posix':
              simple_shebang = True
          else:
-@@ -362,7 +364,7 @@ class ScriptMaker(object):
+@@ -380,7 +382,7 @@ class ScriptMaker(object):
                  return
  
              match = FIRST_LINE_RE.match(first_line.replace(b'\r\n', b'\n'))
diff --git a/meta/recipes-devtools/python/python3-pip_24.0.bb b/meta/recipes-devtools/python/python3-pip_24.2.bb
similarity index 73%
rename from meta/recipes-devtools/python/python3-pip_24.0.bb
rename to meta/recipes-devtools/python/python3-pip_24.2.bb
index be4a29500a5..1f8aeb35fc8 100644
--- a/meta/recipes-devtools/python/python3-pip_24.0.bb
+++ b/meta/recipes-devtools/python/python3-pip_24.2.bb
@@ -4,36 +4,30 @@ SECTION = "devel/python"
 LICENSE = "MIT & Apache-2.0 & MPL-2.0 & LGPL-2.1-only & BSD-3-Clause & PSF-2.0 & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \
                     file://src/pip/_vendor/cachecontrol/LICENSE.txt;md5=6572692148079ebbbd800be4b9f36c6d \
-                    file://src/pip/_vendor/certifi/LICENSE;md5=3c2b7404369c587c3559afb604fce2f2 \
-                    file://src/pip/_vendor/chardet/LICENSE;md5=4fbd65380cdd255951079008b364516c \
-                    file://src/pip/_vendor/colorama/LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26 \
+                    file://src/pip/_vendor/certifi/LICENSE;md5=11618cb6a975948679286b1211bd573c \
                     file://src/pip/_vendor/distlib/LICENSE.txt;md5=f6a11430d5cd6e2cd3832ee94f22ddfc \
                     file://src/pip/_vendor/distro/LICENSE;md5=d2794c0df5b907fdace235a619d80314 \
-                    file://src/pip/_vendor/idna/LICENSE.md;md5=239668a7c6066d9e0c5382e9c8c6c0e1 \
+                    file://src/pip/_vendor/idna/LICENSE.md;md5=204c0612e40a4dd46012a78d02c80fb1 \
                     file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \
                     file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \
-                    file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \
                     file://src/pip/_vendor/pkg_resources/LICENSE;md5=141643e11c48898150daa83802dbc65f \
                     file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \
                     file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \
-                    file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \
                     file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \
                     file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \
                     file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \
                     file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \
-                    file://src/pip/_vendor/six.LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \
-                    file://src/pip/_vendor/tenacity/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
                     file://src/pip/_vendor/tomli/LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5 \
+                    file://src/pip/_vendor/truststore/LICENSE;md5=74420fc3965c4558a4a1529e63c2867f \
                     file://src/pip/_vendor/typing_extensions.LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2 \
                     file://src/pip/_vendor/urllib3/LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c \
-                    file://src/pip/_vendor/webencodings/LICENSE;md5=81fb24cd7823cce23b69f721993dce4d \
                     "
 
 inherit pypi python_setuptools_build_meta
 
 SRC_URI += "file://no_shebang_mangling.patch"
 
-SRC_URI[sha256sum] = "ea9bd1a847e8c5774a5777bb398c19e80bcd4e2aa16a4b301b718fe6f593aba2"
+SRC_URI[sha256sum] = "5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8"
 
 do_install:append() {
     rm -f ${D}/${bindir}/pip
-- 
2.39.2

[PATCH 14/34] python3-pyopenssl: update 24.1.0 -> 24.2.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ython3-pyopenssl_24.1.0.bb => python3-pyopenssl_24.2.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pyopenssl_24.1.0.bb => python3-pyopenssl_24.2.1.bb} (79%)

diff --git a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_24.2.1.bb
similarity index 79%
rename from meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb
rename to meta/recipes-devtools/python/python3-pyopenssl_24.2.1.bb
index 9ef3145bf86..d9ccd553a19 100644
--- a/meta/recipes-devtools/python/python3-pyopenssl_24.1.0.bb
+++ b/meta/recipes-devtools/python/python3-pyopenssl_24.2.1.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS += "openssl python3-cryptography"
 
-SRC_URI[sha256sum] = "cabed4bfaa5df9f1a16c0ef64a0cb65318b5cd077a7eda7d6970131ca2f41a6f"
+SRC_URI[sha256sum] = "4247f0dbe3748d560dcbb2ff3ea01af0f9a1a001ef5f7c4c647956ed8cbf0e95"
+UPSTREAM_CHECK_PYPI_PACKAGE = "pyOpenSSL"
 
-PYPI_PACKAGE = "pyOpenSSL"
 inherit pypi setuptools3
 
 PACKAGES =+ "${PN}-tests"
-- 
2.39.2

[PATCH 15/34] python3-pyyaml: update 6.0.1 -> 6.0.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

With this release, cython 3.x is finally officially supported.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Fix-builds-with-Cython-3.patch       | 54 -------------------
 ...yyaml_6.0.1.bb => python3-pyyaml_6.0.2.bb} |  6 +--
 2 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
 rename meta/recipes-devtools/python/{python3-pyyaml_6.0.1.bb => python3-pyyaml_6.0.2.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch b/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
deleted file mode 100644
index a87d588b6a1..00000000000
--- a/meta/recipes-devtools/python/python3-pyyaml/0001-Fix-builds-with-Cython-3.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9cc23db56add79357b8f8257fe6fc0d6879d4579 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 21 Jul 2023 09:50:00 -0400
-Subject: [PATCH] Fix builds with Cython 3
-
-This is a *de minimis* fix for building with Cython 3. Recent Cython<3
-releases provided `Cython.Distutils.build_ext` as an alias to
-`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this
-alias and instead uses a wholly new `Cython.Distutils.build_ext` that
-does not provide the `cython_sources` function used in `setup.py`.
-
-Explicitly importing `old_build_ext` preserves the existing behavior for
-recent Cython<3 and uses the correct behavior for Cython 3. Should the
-import fail (*e.g.*, because the version of Cython available predates
-the availability of `old_build_ext`), the import falls back to just
-`Cython.Distutils.build_ext`.
-
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
-Upstream-Status: Denied [https://github.com/yaml/pyyaml/pull/731]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- pyproject.toml | 2 +-
- setup.py       | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 4bc04c0..2bf5ec8 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,3 +1,3 @@
- [build-system]
--requires = ["setuptools", "wheel", "Cython<3.0"]
-+requires = ["setuptools", "wheel", "Cython"]
- build-backend = "setuptools.build_meta"
-diff --git a/setup.py b/setup.py
-index 65b0ea0..4461580 100644
---- a/setup.py
-+++ b/setup.py
-@@ -82,7 +82,11 @@ if 'sdist' in sys.argv or os.environ.get('PYYAML_FORCE_CYTHON') == '1':
-     with_cython = True
- try:
-     from Cython.Distutils.extension import Extension as _Extension
--    from Cython.Distutils import build_ext as _build_ext
-+    try:
-+        from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
-+    except ImportError:
-+        from Cython.Distutils import build_ext as _build_ext
-+
-     with_cython = True
- except ImportError:
-     if with_cython:
--- 
-2.39.2
-
diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb
rename to meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
index 6e2022719c1..a41d073af95 100644
--- a/meta/recipes-devtools/python/python3-pyyaml_6.0.1.bb
+++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
@@ -5,12 +5,10 @@ HOMEPAGE = "https://pyyaml.org/"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079"
 
-PYPI_PACKAGE = "PyYAML"
-
 inherit pypi python_setuptools_build_meta
 
-SRC_URI += "file://0001-Fix-builds-with-Cython-3.patch"
-SRC_URI[sha256sum] = "bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"
+SRC_URI[sha256sum] = "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
+UPSTREAM_CHECK_PYPI_PACKAGE = "PyYAML"
 
 PACKAGECONFIG ?= "libyaml"
 PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml"
-- 
2.39.2

[PATCH 16/34] python3-scons: update 4.7.0 -> 4.8.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Manpages are no longer installed, and so the patch isn't needed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Fix-man-page-installation.patch      | 29 -------------------
 ...-scons_4.7.0.bb => python3-scons_4.8.0.bb} | 13 +++------
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
 rename meta/recipes-devtools/python/{python3-scons_4.7.0.bb => python3-scons_4.8.0.bb} (70%)

diff --git a/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch b/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
deleted file mode 100644
index 6dffe648097..00000000000
--- a/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8b482e618047e94833545dce3a26924ef4f075db Mon Sep 17 00:00:00 2001
-From: Tim Orling <ticotimo@gmail.com>
-Date: Sat, 22 May 2021 11:20:46 -0700
-Subject: [PATCH] Fix man page installation
-
-Fixes:
-  error: can't copy 'build/doc/man/scons.1': doesn't exist or not a regular file
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Tim Orling <ticotimo@gmail.com>
-
----
- MANIFEST.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 04ec000..937f6f3 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,7 +4,7 @@ recursive-include SCons/Tool/docbook *
- include LICENSE
- 
- include scons.1 sconsign.1 scons-time.1
--recursive-include build/doc/man *.1
-+#recursive-include build/doc/man *.1
- 
- 
- 
diff --git a/meta/recipes-devtools/python/python3-scons_4.7.0.bb b/meta/recipes-devtools/python/python3-scons_4.8.0.bb
similarity index 70%
rename from meta/recipes-devtools/python/python3-scons_4.7.0.bb
rename to meta/recipes-devtools/python/python3-scons_4.8.0.bb
index f41b3e92711..b1348665e04 100644
--- a/meta/recipes-devtools/python/python3-scons_4.7.0.bb
+++ b/meta/recipes-devtools/python/python3-scons_4.8.0.bb
@@ -4,13 +4,13 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7"
 
-SRC_URI += " file://0001-Fix-man-page-installation.patch"
-SRC_URI[sha256sum] = "d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3"
-
-PYPI_PACKAGE = "SCons"
+SRC_URI[sha256sum] = "2c7377ff6a22ca136c795ae3dc3d0824696e5478d1e4940f2af75659b0d45454"
+UPSTREAM_CHECK_PYPI_PACKAGE = "SCons"
 
 inherit pypi python_setuptools_build_meta
 
+S = "${WORKDIR}/SCons-${PV}"
+
 RDEPENDS:${PN}:class-target = "\
   python3-core \
   python3-compression \
@@ -23,11 +23,6 @@ RDEPENDS:${PN}:class-target = "\
   python3-pprint \
   "
 
-do_install:append() {
-    install -d ${D}${mandir}/man1
-    mv ${D}${prefix}/scons*.1 ${D}${mandir}/man1/
-}
-
 do_install:append:class-native() {
     create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1'
 }
-- 
2.39.2

[PATCH 17/34] cargo-c-native: update 0.9.30 -> 0.10.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/rust/cargo-c-crates.inc | 798 +++++++++---------
 ... => cargo-c-native_0.10.3+cargo-0.81.0.bb} |   2 +-
 2 files changed, 411 insertions(+), 389 deletions(-)
 rename meta/recipes-devtools/rust/{cargo-c-native_0.9.30+cargo-0.77.0.bb => cargo-c-native_0.10.3+cargo-0.81.0.bb} (82%)

diff --git a/meta/recipes-devtools/rust/cargo-c-crates.inc b/meta/recipes-devtools/rust/cargo-c-crates.inc
index f6da3e654e6..2c84c326a1e 100644
--- a/meta/recipes-devtools/rust/cargo-c-crates.inc
+++ b/meta/recipes-devtools/rust/cargo-c-crates.inc
@@ -3,146 +3,150 @@
 # from Cargo.lock
 SRC_URI += " \
     crate://crates.io/adler/1.0.2 \
-    crate://crates.io/ahash/0.8.7 \
-    crate://crates.io/aho-corasick/1.1.2 \
-    crate://crates.io/allocator-api2/0.2.16 \
-    crate://crates.io/anstream/0.6.11 \
-    crate://crates.io/anstyle/1.0.6 \
-    crate://crates.io/anstyle-parse/0.2.3 \
-    crate://crates.io/anstyle-query/1.0.2 \
-    crate://crates.io/anstyle-wincon/3.0.2 \
-    crate://crates.io/anyhow/1.0.79 \
-    crate://crates.io/arc-swap/1.6.0 \
-    crate://crates.io/autocfg/1.1.0 \
+    crate://crates.io/ahash/0.8.11 \
+    crate://crates.io/aho-corasick/1.1.3 \
+    crate://crates.io/allocator-api2/0.2.18 \
+    crate://crates.io/annotate-snippets/0.11.4 \
+    crate://crates.io/anstream/0.6.15 \
+    crate://crates.io/anstyle/1.0.8 \
+    crate://crates.io/anstyle-parse/0.2.5 \
+    crate://crates.io/anstyle-query/1.1.1 \
+    crate://crates.io/anstyle-wincon/3.0.4 \
+    crate://crates.io/anyhow/1.0.86 \
+    crate://crates.io/arc-swap/1.7.1 \
+    crate://crates.io/autocfg/1.3.0 \
     crate://crates.io/base16ct/0.2.0 \
-    crate://crates.io/base64/0.21.7 \
+    crate://crates.io/base64/0.22.1 \
     crate://crates.io/base64ct/1.6.0 \
     crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/bitflags/2.4.2 \
+    crate://crates.io/bitflags/2.6.0 \
     crate://crates.io/bitmaps/2.1.0 \
     crate://crates.io/block-buffer/0.10.4 \
-    crate://crates.io/bstr/1.9.0 \
-    crate://crates.io/btoi/0.4.3 \
-    crate://crates.io/bumpalo/3.14.0 \
-    crate://crates.io/bytes/1.5.0 \
+    crate://crates.io/bstr/1.10.0 \
+    crate://crates.io/bumpalo/3.16.0 \
+    crate://crates.io/byteorder/1.5.0 \
+    crate://crates.io/bytes/1.6.1 \
     crate://crates.io/bytesize/1.3.0 \
-    crate://crates.io/cargo/0.77.0 \
-    crate://crates.io/cargo-credential/0.4.2 \
-    crate://crates.io/cargo-credential-libsecret/0.4.2 \
-    crate://crates.io/cargo-credential-macos-keychain/0.4.2 \
-    crate://crates.io/cargo-credential-wincred/0.4.2 \
-    crate://crates.io/cargo-platform/0.1.7 \
-    crate://crates.io/cargo-util/0.2.9 \
+    crate://crates.io/cargo/0.81.0 \
+    crate://crates.io/cargo-credential/0.4.6 \
+    crate://crates.io/cargo-credential-libsecret/0.4.6 \
+    crate://crates.io/cargo-credential-macos-keychain/0.4.6 \
+    crate://crates.io/cargo-credential-wincred/0.4.6 \
+    crate://crates.io/cargo-platform/0.1.8 \
+    crate://crates.io/cargo-util/0.2.13 \
+    crate://crates.io/cargo-util-schemas/0.4.0 \
     crate://crates.io/cbindgen/0.26.0 \
-    crate://crates.io/cc/1.0.83 \
+    crate://crates.io/cc/1.1.7 \
     crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/clap/4.5.0 \
-    crate://crates.io/clap_builder/4.5.0 \
-    crate://crates.io/clap_derive/4.5.0 \
-    crate://crates.io/clap_lex/0.7.0 \
-    crate://crates.io/clru/0.6.1 \
-    crate://crates.io/color-print/0.3.5 \
-    crate://crates.io/color-print-proc-macro/0.3.5 \
-    crate://crates.io/colorchoice/1.0.0 \
+    crate://crates.io/clap/4.5.11 \
+    crate://crates.io/clap_builder/4.5.11 \
+    crate://crates.io/clap_derive/4.5.11 \
+    crate://crates.io/clap_lex/0.7.2 \
+    crate://crates.io/clru/0.6.2 \
+    crate://crates.io/color-print/0.3.6 \
+    crate://crates.io/color-print-proc-macro/0.3.6 \
+    crate://crates.io/colorchoice/1.0.2 \
     crate://crates.io/const-oid/0.9.6 \
     crate://crates.io/core-foundation/0.9.4 \
     crate://crates.io/core-foundation-sys/0.8.6 \
     crate://crates.io/cpufeatures/0.2.12 \
-    crate://crates.io/crates-io/0.39.2 \
-    crate://crates.io/crc32fast/1.3.2 \
-    crate://crates.io/crossbeam-channel/0.5.11 \
+    crate://crates.io/crates-io/0.40.3 \
+    crate://crates.io/crc32fast/1.4.2 \
+    crate://crates.io/crossbeam-channel/0.5.13 \
     crate://crates.io/crossbeam-deque/0.8.5 \
     crate://crates.io/crossbeam-epoch/0.9.18 \
-    crate://crates.io/crossbeam-utils/0.8.19 \
+    crate://crates.io/crossbeam-utils/0.8.20 \
     crate://crates.io/crypto-bigint/0.5.5 \
     crate://crates.io/crypto-common/0.1.6 \
     crate://crates.io/ct-codecs/1.1.1 \
-    crate://crates.io/curl/0.4.45 \
-    crate://crates.io/curl-sys/0.4.72+curl-8.6.0 \
-    crate://crates.io/der/0.7.8 \
+    crate://crates.io/curl/0.4.46 \
+    crate://crates.io/curl-sys/0.4.73+curl-8.8.0 \
+    crate://crates.io/dbus/0.9.7 \
+    crate://crates.io/der/0.7.9 \
     crate://crates.io/deranged/0.3.11 \
     crate://crates.io/digest/0.10.7 \
     crate://crates.io/dunce/1.0.4 \
     crate://crates.io/ecdsa/0.16.9 \
     crate://crates.io/ed25519-compact/2.1.1 \
-    crate://crates.io/either/1.9.0 \
+    crate://crates.io/either/1.13.0 \
     crate://crates.io/elliptic-curve/0.13.8 \
-    crate://crates.io/encoding_rs/0.8.33 \
+    crate://crates.io/encoding_rs/0.8.34 \
     crate://crates.io/equivalent/1.0.1 \
-    crate://crates.io/erased-serde/0.4.2 \
-    crate://crates.io/errno/0.3.8 \
+    crate://crates.io/erased-serde/0.4.5 \
+    crate://crates.io/errno/0.3.9 \
     crate://crates.io/fallible-iterator/0.3.0 \
     crate://crates.io/fallible-streaming-iterator/0.1.9 \
     crate://crates.io/faster-hex/0.9.0 \
-    crate://crates.io/fastrand/2.0.1 \
+    crate://crates.io/fastrand/2.1.0 \
     crate://crates.io/ff/0.13.0 \
-    crate://crates.io/fiat-crypto/0.2.6 \
+    crate://crates.io/fiat-crypto/0.2.9 \
     crate://crates.io/filetime/0.2.23 \
-    crate://crates.io/flate2/1.0.28 \
+    crate://crates.io/flate2/1.0.30 \
+    crate://crates.io/fnv/1.0.7 \
     crate://crates.io/foreign-types/0.3.2 \
     crate://crates.io/foreign-types-shared/0.1.1 \
     crate://crates.io/form_urlencoded/1.2.1 \
     crate://crates.io/generic-array/0.14.7 \
-    crate://crates.io/getrandom/0.2.12 \
-    crate://crates.io/git2/0.18.2 \
+    crate://crates.io/getrandom/0.2.15 \
+    crate://crates.io/git2/0.18.3 \
     crate://crates.io/git2-curl/0.19.0 \
-    crate://crates.io/gix/0.56.0 \
-    crate://crates.io/gix-actor/0.28.1 \
-    crate://crates.io/gix-attributes/0.20.1 \
-    crate://crates.io/gix-bitmap/0.2.10 \
-    crate://crates.io/gix-chunk/0.4.7 \
-    crate://crates.io/gix-command/0.3.4 \
-    crate://crates.io/gix-commitgraph/0.22.1 \
-    crate://crates.io/gix-config/0.32.1 \
-    crate://crates.io/gix-config-value/0.14.4 \
-    crate://crates.io/gix-credentials/0.22.0 \
-    crate://crates.io/gix-date/0.8.3 \
-    crate://crates.io/gix-diff/0.38.0 \
-    crate://crates.io/gix-discover/0.27.0 \
-    crate://crates.io/gix-features/0.35.0 \
-    crate://crates.io/gix-features/0.36.1 \
-    crate://crates.io/gix-filter/0.7.0 \
-    crate://crates.io/gix-fs/0.8.1 \
-    crate://crates.io/gix-glob/0.14.1 \
-    crate://crates.io/gix-hash/0.13.3 \
-    crate://crates.io/gix-hashtable/0.4.1 \
-    crate://crates.io/gix-ignore/0.9.1 \
-    crate://crates.io/gix-index/0.27.1 \
-    crate://crates.io/gix-lock/11.0.1 \
-    crate://crates.io/gix-macros/0.1.3 \
-    crate://crates.io/gix-negotiate/0.10.0 \
-    crate://crates.io/gix-object/0.39.0 \
-    crate://crates.io/gix-odb/0.55.0 \
-    crate://crates.io/gix-pack/0.45.0 \
-    crate://crates.io/gix-packetline/0.17.3 \
-    crate://crates.io/gix-packetline-blocking/0.17.3 \
-    crate://crates.io/gix-path/0.10.5 \
-    crate://crates.io/gix-pathspec/0.4.1 \
-    crate://crates.io/gix-prompt/0.8.2 \
-    crate://crates.io/gix-protocol/0.42.0 \
-    crate://crates.io/gix-quote/0.4.10 \
-    crate://crates.io/gix-ref/0.39.1 \
-    crate://crates.io/gix-refspec/0.20.0 \
-    crate://crates.io/gix-revision/0.24.0 \
-    crate://crates.io/gix-revwalk/0.10.0 \
-    crate://crates.io/gix-sec/0.10.4 \
-    crate://crates.io/gix-submodule/0.6.0 \
-    crate://crates.io/gix-tempfile/11.0.1 \
-    crate://crates.io/gix-trace/0.1.7 \
-    crate://crates.io/gix-transport/0.39.0 \
-    crate://crates.io/gix-traverse/0.35.0 \
-    crate://crates.io/gix-url/0.25.2 \
-    crate://crates.io/gix-utils/0.1.9 \
-    crate://crates.io/gix-validate/0.8.3 \
-    crate://crates.io/gix-worktree/0.28.0 \
+    crate://crates.io/gix/0.63.0 \
+    crate://crates.io/gix-actor/0.31.5 \
+    crate://crates.io/gix-attributes/0.22.3 \
+    crate://crates.io/gix-bitmap/0.2.11 \
+    crate://crates.io/gix-chunk/0.4.8 \
+    crate://crates.io/gix-command/0.3.8 \
+    crate://crates.io/gix-commitgraph/0.24.3 \
+    crate://crates.io/gix-config/0.37.0 \
+    crate://crates.io/gix-config-value/0.14.7 \
+    crate://crates.io/gix-credentials/0.24.4 \
+    crate://crates.io/gix-date/0.8.7 \
+    crate://crates.io/gix-diff/0.44.1 \
+    crate://crates.io/gix-dir/0.5.0 \
+    crate://crates.io/gix-discover/0.32.0 \
+    crate://crates.io/gix-features/0.38.2 \
+    crate://crates.io/gix-filter/0.11.3 \
+    crate://crates.io/gix-fs/0.11.2 \
+    crate://crates.io/gix-glob/0.16.4 \
+    crate://crates.io/gix-hash/0.14.2 \
+    crate://crates.io/gix-hashtable/0.5.2 \
+    crate://crates.io/gix-ignore/0.11.3 \
+    crate://crates.io/gix-index/0.33.1 \
+    crate://crates.io/gix-lock/14.0.0 \
+    crate://crates.io/gix-macros/0.1.5 \
+    crate://crates.io/gix-negotiate/0.13.2 \
+    crate://crates.io/gix-object/0.42.3 \
+    crate://crates.io/gix-odb/0.61.1 \
+    crate://crates.io/gix-pack/0.51.1 \
+    crate://crates.io/gix-packetline/0.17.5 \
+    crate://crates.io/gix-packetline-blocking/0.17.4 \
+    crate://crates.io/gix-path/0.10.9 \
+    crate://crates.io/gix-pathspec/0.7.6 \
+    crate://crates.io/gix-prompt/0.8.6 \
+    crate://crates.io/gix-protocol/0.45.2 \
+    crate://crates.io/gix-quote/0.4.12 \
+    crate://crates.io/gix-ref/0.44.1 \
+    crate://crates.io/gix-refspec/0.23.1 \
+    crate://crates.io/gix-revision/0.27.2 \
+    crate://crates.io/gix-revwalk/0.13.2 \
+    crate://crates.io/gix-sec/0.10.7 \
+    crate://crates.io/gix-submodule/0.11.0 \
+    crate://crates.io/gix-tempfile/14.0.1 \
+    crate://crates.io/gix-trace/0.1.9 \
+    crate://crates.io/gix-transport/0.42.2 \
+    crate://crates.io/gix-traverse/0.39.2 \
+    crate://crates.io/gix-url/0.27.4 \
+    crate://crates.io/gix-utils/0.1.12 \
+    crate://crates.io/gix-validate/0.8.5 \
+    crate://crates.io/gix-worktree/0.34.1 \
     crate://crates.io/glob/0.3.1 \
     crate://crates.io/globset/0.4.14 \
     crate://crates.io/group/0.13.0 \
     crate://crates.io/hashbrown/0.12.3 \
-    crate://crates.io/hashbrown/0.14.3 \
-    crate://crates.io/hashlink/0.8.4 \
+    crate://crates.io/hashbrown/0.14.5 \
+    crate://crates.io/hashlink/0.9.1 \
     crate://crates.io/heck/0.4.1 \
-    crate://crates.io/hermit-abi/0.3.5 \
+    crate://crates.io/heck/0.5.0 \
     crate://crates.io/hex/0.4.3 \
     crate://crates.io/hkdf/0.12.4 \
     crate://crates.io/hmac/0.12.1 \
@@ -153,322 +157,333 @@ SRC_URI += " \
     crate://crates.io/ignore/0.4.22 \
     crate://crates.io/im-rc/15.1.0 \
     crate://crates.io/indexmap/1.9.3 \
-    crate://crates.io/indexmap/2.2.2 \
-    crate://crates.io/is-terminal/0.4.11 \
+    crate://crates.io/indexmap/2.2.6 \
+    crate://crates.io/is_terminal_polyfill/1.70.1 \
     crate://crates.io/itertools/0.12.1 \
-    crate://crates.io/itoa/1.0.10 \
-    crate://crates.io/jobserver/0.1.28 \
-    crate://crates.io/js-sys/0.3.68 \
-    crate://crates.io/kstring/2.0.0 \
-    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/itertools/0.13.0 \
+    crate://crates.io/itoa/1.0.11 \
+    crate://crates.io/jobserver/0.1.32 \
+    crate://crates.io/js-sys/0.3.69 \
+    crate://crates.io/kstring/2.0.2 \
+    crate://crates.io/lazy_static/1.5.0 \
     crate://crates.io/lazycell/1.3.0 \
-    crate://crates.io/libc/0.2.153 \
+    crate://crates.io/libc/0.2.155 \
+    crate://crates.io/libdbus-sys/0.2.5 \
     crate://crates.io/libgit2-sys/0.16.2+1.7.2 \
-    crate://crates.io/libloading/0.8.1 \
-    crate://crates.io/libnghttp2-sys/0.1.9+1.58.0 \
-    crate://crates.io/libsqlite3-sys/0.27.0 \
+    crate://crates.io/libloading/0.8.5 \
+    crate://crates.io/libnghttp2-sys/0.1.10+1.61.0 \
+    crate://crates.io/libsqlite3-sys/0.28.0 \
     crate://crates.io/libssh2-sys/0.3.0 \
-    crate://crates.io/libz-sys/1.1.15 \
-    crate://crates.io/linux-raw-sys/0.4.13 \
-    crate://crates.io/lock_api/0.4.11 \
-    crate://crates.io/log/0.4.20 \
+    crate://crates.io/libz-sys/1.1.18 \
+    crate://crates.io/linux-raw-sys/0.4.14 \
+    crate://crates.io/lock_api/0.4.12 \
+    crate://crates.io/log/0.4.22 \
     crate://crates.io/matchers/0.1.0 \
-    crate://crates.io/maybe-async/0.2.9 \
-    crate://crates.io/memchr/2.7.1 \
+    crate://crates.io/maybe-async/0.2.10 \
+    crate://crates.io/memchr/2.7.4 \
     crate://crates.io/memmap2/0.9.4 \
     crate://crates.io/minimal-lexical/0.2.1 \
-    crate://crates.io/miniz_oxide/0.7.2 \
+    crate://crates.io/miniz_oxide/0.7.4 \
     crate://crates.io/miow/0.6.0 \
     crate://crates.io/nom/7.1.3 \
-    crate://crates.io/normpath/1.1.1 \
+    crate://crates.io/normpath/1.2.0 \
     crate://crates.io/nu-ansi-term/0.46.0 \
     crate://crates.io/num-conv/0.1.0 \
-    crate://crates.io/num-traits/0.2.18 \
-    crate://crates.io/num_threads/0.1.6 \
+    crate://crates.io/num-traits/0.2.19 \
+    crate://crates.io/num_threads/0.1.7 \
     crate://crates.io/once_cell/1.19.0 \
-    crate://crates.io/opener/0.6.1 \
-    crate://crates.io/openssl/0.10.63 \
+    crate://crates.io/opener/0.7.1 \
+    crate://crates.io/openssl/0.10.66 \
     crate://crates.io/openssl-macros/0.1.1 \
     crate://crates.io/openssl-probe/0.1.5 \
-    crate://crates.io/openssl-src/300.2.2+3.2.1 \
-    crate://crates.io/openssl-sys/0.9.99 \
+    crate://crates.io/openssl-src/300.3.1+3.3.1 \
+    crate://crates.io/openssl-sys/0.9.103 \
     crate://crates.io/ordered-float/2.10.1 \
     crate://crates.io/orion/0.17.6 \
-    crate://crates.io/os_info/3.7.0 \
+    crate://crates.io/os_info/3.8.2 \
     crate://crates.io/overload/0.1.1 \
     crate://crates.io/p384/0.13.0 \
-    crate://crates.io/parking_lot/0.12.1 \
-    crate://crates.io/parking_lot_core/0.9.9 \
+    crate://crates.io/parking_lot/0.12.3 \
+    crate://crates.io/parking_lot_core/0.9.10 \
     crate://crates.io/pasetors/0.6.8 \
     crate://crates.io/pathdiff/0.2.1 \
     crate://crates.io/pem-rfc7468/0.7.0 \
     crate://crates.io/percent-encoding/2.3.1 \
-    crate://crates.io/pin-project-lite/0.2.13 \
+    crate://crates.io/pin-project-lite/0.2.14 \
     crate://crates.io/pkcs8/0.10.2 \
-    crate://crates.io/pkg-config/0.3.29 \
+    crate://crates.io/pkg-config/0.3.30 \
     crate://crates.io/powerfmt/0.2.0 \
-    crate://crates.io/ppv-lite86/0.2.17 \
+    crate://crates.io/ppv-lite86/0.2.18 \
     crate://crates.io/primeorder/0.13.6 \
-    crate://crates.io/proc-macro2/1.0.78 \
-    crate://crates.io/prodash/26.2.2 \
-    crate://crates.io/pulldown-cmark/0.9.6 \
-    crate://crates.io/quote/1.0.35 \
+    crate://crates.io/proc-macro2/1.0.86 \
+    crate://crates.io/prodash/28.0.0 \
+    crate://crates.io/quote/1.0.36 \
     crate://crates.io/rand/0.8.5 \
     crate://crates.io/rand_chacha/0.3.1 \
     crate://crates.io/rand_core/0.6.4 \
     crate://crates.io/rand_xoshiro/0.6.0 \
     crate://crates.io/redox_syscall/0.4.1 \
-    crate://crates.io/regex/1.10.3 \
+    crate://crates.io/redox_syscall/0.5.3 \
+    crate://crates.io/regex/1.10.5 \
     crate://crates.io/regex-automata/0.1.10 \
-    crate://crates.io/regex-automata/0.4.5 \
+    crate://crates.io/regex-automata/0.4.7 \
     crate://crates.io/regex-syntax/0.6.29 \
-    crate://crates.io/regex-syntax/0.8.2 \
+    crate://crates.io/regex-syntax/0.8.4 \
     crate://crates.io/rfc6979/0.4.0 \
-    crate://crates.io/rusqlite/0.30.0 \
-    crate://crates.io/rustfix/0.7.0 \
-    crate://crates.io/rustix/0.38.31 \
-    crate://crates.io/ryu/1.0.16 \
+    crate://crates.io/rusqlite/0.31.0 \
+    crate://crates.io/rustfix/0.8.4 \
+    crate://crates.io/rustix/0.38.34 \
+    crate://crates.io/ryu/1.0.18 \
     crate://crates.io/same-file/1.0.6 \
     crate://crates.io/schannel/0.1.23 \
     crate://crates.io/scopeguard/1.2.0 \
     crate://crates.io/sec1/0.7.3 \
-    crate://crates.io/security-framework/2.9.2 \
-    crate://crates.io/security-framework-sys/2.9.1 \
-    crate://crates.io/semver/1.0.21 \
-    crate://crates.io/serde/1.0.196 \
-    crate://crates.io/serde-untagged/0.1.5 \
+    crate://crates.io/security-framework/2.11.1 \
+    crate://crates.io/security-framework-sys/2.11.1 \
+    crate://crates.io/semver/1.0.23 \
+    crate://crates.io/serde/1.0.204 \
+    crate://crates.io/serde-untagged/0.1.6 \
     crate://crates.io/serde-value/0.7.0 \
-    crate://crates.io/serde_derive/1.0.196 \
+    crate://crates.io/serde_derive/1.0.204 \
     crate://crates.io/serde_ignored/0.1.10 \
-    crate://crates.io/serde_json/1.0.113 \
-    crate://crates.io/serde_spanned/0.6.5 \
+    crate://crates.io/serde_json/1.0.121 \
+    crate://crates.io/serde_spanned/0.6.7 \
     crate://crates.io/sha1/0.10.6 \
-    crate://crates.io/sha1_smol/1.0.0 \
+    crate://crates.io/sha1_smol/1.0.1 \
     crate://crates.io/sha2/0.10.8 \
     crate://crates.io/sharded-slab/0.1.7 \
     crate://crates.io/shell-escape/0.1.5 \
     crate://crates.io/shell-words/1.1.0 \
     crate://crates.io/signature/2.2.0 \
     crate://crates.io/sized-chunks/0.6.5 \
-    crate://crates.io/smallvec/1.13.1 \
-    crate://crates.io/socket2/0.5.5 \
+    crate://crates.io/smallvec/1.13.2 \
+    crate://crates.io/socket2/0.5.7 \
     crate://crates.io/spki/0.7.3 \
     crate://crates.io/static_assertions/1.1.0 \
-    crate://crates.io/strsim/0.11.0 \
-    crate://crates.io/subtle/2.5.0 \
-    crate://crates.io/supports-hyperlinks/2.1.0 \
+    crate://crates.io/strsim/0.11.1 \
+    crate://crates.io/subtle/2.6.1 \
+    crate://crates.io/supports-hyperlinks/3.0.0 \
+    crate://crates.io/supports-unicode/3.0.0 \
     crate://crates.io/syn/1.0.109 \
-    crate://crates.io/syn/2.0.48 \
-    crate://crates.io/tar/0.4.40 \
-    crate://crates.io/tempfile/3.10.0 \
+    crate://crates.io/syn/2.0.72 \
+    crate://crates.io/tar/0.4.41 \
+    crate://crates.io/tempfile/3.10.1 \
     crate://crates.io/terminal_size/0.3.0 \
-    crate://crates.io/thiserror/1.0.56 \
-    crate://crates.io/thiserror-impl/1.0.56 \
-    crate://crates.io/thread_local/1.1.7 \
-    crate://crates.io/time/0.3.34 \
+    crate://crates.io/thiserror/1.0.63 \
+    crate://crates.io/thiserror-impl/1.0.63 \
+    crate://crates.io/thread_local/1.1.8 \
+    crate://crates.io/time/0.3.36 \
     crate://crates.io/time-core/0.1.2 \
-    crate://crates.io/time-macros/0.2.17 \
-    crate://crates.io/tinyvec/1.6.0 \
+    crate://crates.io/time-macros/0.2.18 \
+    crate://crates.io/tinyvec/1.8.0 \
     crate://crates.io/tinyvec_macros/0.1.1 \
     crate://crates.io/toml/0.5.11 \
-    crate://crates.io/toml/0.8.10 \
-    crate://crates.io/toml_datetime/0.6.5 \
-    crate://crates.io/toml_edit/0.21.1 \
-    crate://crates.io/toml_edit/0.22.4 \
+    crate://crates.io/toml/0.8.16 \
+    crate://crates.io/toml_datetime/0.6.7 \
+    crate://crates.io/toml_edit/0.22.17 \
     crate://crates.io/tracing/0.1.40 \
     crate://crates.io/tracing-attributes/0.1.27 \
+    crate://crates.io/tracing-chrome/0.7.2 \
     crate://crates.io/tracing-core/0.1.32 \
     crate://crates.io/tracing-log/0.2.0 \
     crate://crates.io/tracing-subscriber/0.3.18 \
+    crate://crates.io/typeid/1.0.0 \
     crate://crates.io/typenum/1.17.0 \
     crate://crates.io/unicase/2.7.0 \
     crate://crates.io/unicode-bidi/0.3.15 \
     crate://crates.io/unicode-bom/2.0.3 \
     crate://crates.io/unicode-ident/1.0.12 \
-    crate://crates.io/unicode-normalization/0.1.22 \
-    crate://crates.io/unicode-width/0.1.11 \
+    crate://crates.io/unicode-normalization/0.1.23 \
+    crate://crates.io/unicode-width/0.1.13 \
     crate://crates.io/unicode-xid/0.2.4 \
-    crate://crates.io/url/2.5.0 \
-    crate://crates.io/utf8parse/0.2.1 \
+    crate://crates.io/url/2.5.2 \
+    crate://crates.io/utf8parse/0.2.2 \
     crate://crates.io/valuable/0.1.0 \
     crate://crates.io/vcpkg/0.2.15 \
-    crate://crates.io/version_check/0.9.4 \
-    crate://crates.io/walkdir/2.4.0 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/walkdir/2.5.0 \
     crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
-    crate://crates.io/wasm-bindgen/0.2.91 \
-    crate://crates.io/wasm-bindgen-backend/0.2.91 \
-    crate://crates.io/wasm-bindgen-macro/0.2.91 \
-    crate://crates.io/wasm-bindgen-macro-support/0.2.91 \
-    crate://crates.io/wasm-bindgen-shared/0.2.91 \
+    crate://crates.io/wasm-bindgen/0.2.92 \
+    crate://crates.io/wasm-bindgen-backend/0.2.92 \
+    crate://crates.io/wasm-bindgen-macro/0.2.92 \
+    crate://crates.io/wasm-bindgen-macro-support/0.2.92 \
+    crate://crates.io/wasm-bindgen-shared/0.2.92 \
     crate://crates.io/winapi/0.3.9 \
     crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-util/0.1.6 \
+    crate://crates.io/winapi-util/0.1.8 \
     crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
     crate://crates.io/windows-sys/0.48.0 \
     crate://crates.io/windows-sys/0.52.0 \
     crate://crates.io/windows-targets/0.48.5 \
-    crate://crates.io/windows-targets/0.52.0 \
+    crate://crates.io/windows-targets/0.52.6 \
     crate://crates.io/windows_aarch64_gnullvm/0.48.5 \
-    crate://crates.io/windows_aarch64_gnullvm/0.52.0 \
+    crate://crates.io/windows_aarch64_gnullvm/0.52.6 \
     crate://crates.io/windows_aarch64_msvc/0.48.5 \
-    crate://crates.io/windows_aarch64_msvc/0.52.0 \
+    crate://crates.io/windows_aarch64_msvc/0.52.6 \
     crate://crates.io/windows_i686_gnu/0.48.5 \
-    crate://crates.io/windows_i686_gnu/0.52.0 \
+    crate://crates.io/windows_i686_gnu/0.52.6 \
+    crate://crates.io/windows_i686_gnullvm/0.52.6 \
     crate://crates.io/windows_i686_msvc/0.48.5 \
-    crate://crates.io/windows_i686_msvc/0.52.0 \
+    crate://crates.io/windows_i686_msvc/0.52.6 \
     crate://crates.io/windows_x86_64_gnu/0.48.5 \
-    crate://crates.io/windows_x86_64_gnu/0.52.0 \
+    crate://crates.io/windows_x86_64_gnu/0.52.6 \
     crate://crates.io/windows_x86_64_gnullvm/0.48.5 \
-    crate://crates.io/windows_x86_64_gnullvm/0.52.0 \
+    crate://crates.io/windows_x86_64_gnullvm/0.52.6 \
     crate://crates.io/windows_x86_64_msvc/0.48.5 \
-    crate://crates.io/windows_x86_64_msvc/0.52.0 \
-    crate://crates.io/winnow/0.5.39 \
-    crate://crates.io/zerocopy/0.7.32 \
-    crate://crates.io/zerocopy-derive/0.7.32 \
-    crate://crates.io/zeroize/1.7.0 \
+    crate://crates.io/windows_x86_64_msvc/0.52.6 \
+    crate://crates.io/winnow/0.6.16 \
+    crate://crates.io/zerocopy/0.6.6 \
+    crate://crates.io/zerocopy/0.7.35 \
+    crate://crates.io/zerocopy-derive/0.6.6 \
+    crate://crates.io/zerocopy-derive/0.7.35 \
+    crate://crates.io/zeroize/1.8.1 \
 "
 
 SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
-SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-SRC_URI[anstream-0.6.11.sha256sum] = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
-SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-SRC_URI[anstyle-parse-0.2.3.sha256sum] = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-SRC_URI[anstyle-query-1.0.2.sha256sum] = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-SRC_URI[anstyle-wincon-3.0.2.sha256sum] = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-SRC_URI[anyhow-1.0.79.sha256sum] = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
-SRC_URI[arc-swap-1.6.0.sha256sum] = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
-SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+SRC_URI[ahash-0.8.11.sha256sum] = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+SRC_URI[allocator-api2-0.2.18.sha256sum] = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+SRC_URI[annotate-snippets-0.11.4.sha256sum] = "24e35ed54e5ea7997c14ed4c70ba043478db1112e98263b3b035907aa197d991"
+SRC_URI[anstream-0.6.15.sha256sum] = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+SRC_URI[anstyle-1.0.8.sha256sum] = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+SRC_URI[anstyle-parse-0.2.5.sha256sum] = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+SRC_URI[anstyle-query-1.1.1.sha256sum] = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+SRC_URI[anstyle-wincon-3.0.4.sha256sum] = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+SRC_URI[anyhow-1.0.86.sha256sum] = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+SRC_URI[arc-swap-1.7.1.sha256sum] = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 SRC_URI[base16ct-0.2.0.sha256sum] = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 SRC_URI[base64ct-1.6.0.sha256sum] = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 SRC_URI[bitmaps-2.1.0.sha256sum] = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2"
 SRC_URI[block-buffer-0.10.4.sha256sum] = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-SRC_URI[bstr-1.9.0.sha256sum] = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
-SRC_URI[btoi-0.4.3.sha256sum] = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
-SRC_URI[bumpalo-3.14.0.sha256sum] = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-SRC_URI[bytes-1.5.0.sha256sum] = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+SRC_URI[bstr-1.10.0.sha256sum] = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+SRC_URI[bumpalo-3.16.0.sha256sum] = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+SRC_URI[bytes-1.6.1.sha256sum] = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
 SRC_URI[bytesize-1.3.0.sha256sum] = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
-SRC_URI[cargo-0.77.0.sha256sum] = "4a399e5bde59d144aa2c7ba643765e2f8c6c3c601daa2da03202caf66f2552b3"
-SRC_URI[cargo-credential-0.4.2.sha256sum] = "ec27ad011c37339b865c765fa28096cd63d5b25fab680c04d9e410cb586c327d"
-SRC_URI[cargo-credential-libsecret-0.4.2.sha256sum] = "26b0ff7a44dd0af0fcd8d09bb1a6d7f7652847cba10aad017a6ea0a25ba7f00f"
-SRC_URI[cargo-credential-macos-keychain-0.4.2.sha256sum] = "4b7cf89a47dc2c20ae3a7c94335e151be32c20f85cc2790defdb1f5dac818de5"
-SRC_URI[cargo-credential-wincred-0.4.2.sha256sum] = "341df45dc893bdffa36e2f7cbe3da90b38c5c74e7f4c0088ac801fd055b6df5b"
-SRC_URI[cargo-platform-0.1.7.sha256sum] = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f"
-SRC_URI[cargo-util-0.2.9.sha256sum] = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342"
+SRC_URI[cargo-0.81.0.sha256sum] = "f24c9dcadcdad2f6fa2553b63d5e9c9700fa6932b75d53f3b11b8aea35ebab99"
+SRC_URI[cargo-credential-0.4.6.sha256sum] = "3a3e7c625670eacbefd48f552588c491eccc79a85a96898af13af7b312d1c4cd"
+SRC_URI[cargo-credential-libsecret-0.4.6.sha256sum] = "7133c8156697989e0d3547f886083bdcb4d7463be67699c37c206152e46925b0"
+SRC_URI[cargo-credential-macos-keychain-0.4.6.sha256sum] = "5e238786dd6bc99a94a99a108a0fedcc7e786a86c81b8e9857da88ca3caac3d0"
+SRC_URI[cargo-credential-wincred-0.4.6.sha256sum] = "cc0e24a553bb387e22fd5a18f49b72f15db22426b5a0cd37c5fc804978f5ce13"
+SRC_URI[cargo-platform-0.1.8.sha256sum] = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+SRC_URI[cargo-util-0.2.13.sha256sum] = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa"
+SRC_URI[cargo-util-schemas-0.4.0.sha256sum] = "34ddc7fc157e3dbbd88f05ef8be7c3ed3ecb05925a3f51f716d6103a607fb7c4"
 SRC_URI[cbindgen-0.26.0.sha256sum] = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49"
-SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+SRC_URI[cc-1.1.7.sha256sum] = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
 SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[clap-4.5.0.sha256sum] = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
-SRC_URI[clap_builder-4.5.0.sha256sum] = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
-SRC_URI[clap_derive-4.5.0.sha256sum] = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
-SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-SRC_URI[clru-0.6.1.sha256sum] = "b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
-SRC_URI[color-print-0.3.5.sha256sum] = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d"
-SRC_URI[color-print-proc-macro-0.3.5.sha256sum] = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f"
-SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+SRC_URI[clap-4.5.11.sha256sum] = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+SRC_URI[clap_builder-4.5.11.sha256sum] = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+SRC_URI[clap_derive-4.5.11.sha256sum] = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+SRC_URI[clap_lex-0.7.2.sha256sum] = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+SRC_URI[clru-0.6.2.sha256sum] = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59"
+SRC_URI[color-print-0.3.6.sha256sum] = "1ee543c60ff3888934877a5671f45494dd27ed4ba25c6670b9a7576b7ed7a8c0"
+SRC_URI[color-print-proc-macro-0.3.6.sha256sum] = "77ff1a80c5f3cb1ca7c06ffdd71b6a6dd6d8f896c42141fbd43f50ed28dcdb93"
+SRC_URI[colorchoice-1.0.2.sha256sum] = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 SRC_URI[const-oid-0.9.6.sha256sum] = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 SRC_URI[core-foundation-0.9.4.sha256sum] = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 SRC_URI[core-foundation-sys-0.8.6.sha256sum] = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 SRC_URI[cpufeatures-0.2.12.sha256sum] = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-SRC_URI[crates-io-0.39.2.sha256sum] = "6622f902c3c338eced1f000091f034846ae36aadaf35d0acd1ab0469a2d8ef1f"
-SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-SRC_URI[crossbeam-channel-0.5.11.sha256sum] = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+SRC_URI[crates-io-0.40.3.sha256sum] = "3b7837d3d2ea5d21a399489029609840d95608bfdf1dc5fd8604392df4b219b3"
+SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+SRC_URI[crossbeam-channel-0.5.13.sha256sum] = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 SRC_URI[crossbeam-deque-0.8.5.sha256sum] = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 SRC_URI[crossbeam-epoch-0.9.18.sha256sum] = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-SRC_URI[crossbeam-utils-0.8.19.sha256sum] = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+SRC_URI[crossbeam-utils-0.8.20.sha256sum] = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 SRC_URI[crypto-bigint-0.5.5.sha256sum] = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 SRC_URI[ct-codecs-1.1.1.sha256sum] = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
-SRC_URI[curl-0.4.45.sha256sum] = "f8e5123ab8c31200ce725939049ecd4a090b242608f24048131dedf9dd195aed"
-SRC_URI[curl-sys-0.4.72+curl-8.6.0.sha256sum] = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
-SRC_URI[der-0.7.8.sha256sum] = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+SRC_URI[curl-0.4.46.sha256sum] = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
+SRC_URI[curl-sys-0.4.73+curl-8.8.0.sha256sum] = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d"
+SRC_URI[dbus-0.9.7.sha256sum] = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
+SRC_URI[der-0.7.9.sha256sum] = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 SRC_URI[ecdsa-0.16.9.sha256sum] = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 SRC_URI[ed25519-compact-2.1.1.sha256sum] = "e9b3460f44bea8cd47f45a0c70892f1eff856d97cd55358b2f73f663789f6190"
-SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+SRC_URI[either-1.13.0.sha256sum] = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 SRC_URI[elliptic-curve-0.13.8.sha256sum] = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-SRC_URI[encoding_rs-0.8.33.sha256sum] = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+SRC_URI[encoding_rs-0.8.34.sha256sum] = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-SRC_URI[erased-serde-0.4.2.sha256sum] = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7"
-SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+SRC_URI[erased-serde-0.4.5.sha256sum] = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 SRC_URI[fallible-iterator-0.3.0.sha256sum] = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 SRC_URI[fallible-streaming-iterator-0.1.9.sha256sum] = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
 SRC_URI[faster-hex-0.9.0.sha256sum] = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
-SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 SRC_URI[ff-0.13.0.sha256sum] = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
-SRC_URI[fiat-crypto-0.2.6.sha256sum] = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
+SRC_URI[fiat-crypto-0.2.9.sha256sum] = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+SRC_URI[flate2-1.0.30.sha256sum] = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 SRC_URI[foreign-types-0.3.2.sha256sum] = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 SRC_URI[foreign-types-shared-0.1.1.sha256sum] = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 SRC_URI[generic-array-0.14.7.sha256sum] = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-SRC_URI[git2-0.18.2.sha256sum] = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
+SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+SRC_URI[git2-0.18.3.sha256sum] = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
 SRC_URI[git2-curl-0.19.0.sha256sum] = "78e26b61608c573ffd26fc79061a823aa5147449a1afe1f61679a21e2031f7c3"
-SRC_URI[gix-0.56.0.sha256sum] = "5b0dcdc9c60d66535897fa40a7ea2a635e72f99456b1d9ae86b7e170e80618cb"
-SRC_URI[gix-actor-0.28.1.sha256sum] = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417"
-SRC_URI[gix-attributes-0.20.1.sha256sum] = "0f395469d38c76ec47cd1a6c5a53fbc3f13f737b96eaf7535f4e6b367e643381"
-SRC_URI[gix-bitmap-0.2.10.sha256sum] = "78b6cd0f246180034ddafac9b00a112f19178135b21eb031b3f79355891f7325"
-SRC_URI[gix-chunk-0.4.7.sha256sum] = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78"
-SRC_URI[gix-command-0.3.4.sha256sum] = "c82b5e9494e61983e61049bbd15fe0fa6b70672dd236362bdb5b2b50fc428f10"
-SRC_URI[gix-commitgraph-0.22.1.sha256sum] = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36"
-SRC_URI[gix-config-0.32.1.sha256sum] = "0341471d55d8676e98b88e121d7065dfa4c9c5acea4b6d6ecdd2846e85cce0c3"
-SRC_URI[gix-config-value-0.14.4.sha256sum] = "5b8a1e7bfb37a46ed0b8468db37a6d8a0a61d56bdbe4603ae492cb322e5f3958"
-SRC_URI[gix-credentials-0.22.0.sha256sum] = "513dac42450b27946bd0a0535a3a5a88e473d6522e5e3439a129cab779c88f3d"
-SRC_URI[gix-date-0.8.3.sha256sum] = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e"
-SRC_URI[gix-diff-0.38.0.sha256sum] = "8119a985887cfe68f4bdf92e51bd64bc758a73882d82fcfc03ebcb164441c85d"
-SRC_URI[gix-discover-0.27.0.sha256sum] = "6fad89416ebe0b3b7df78464124e2a02417b6cd3743d48ad93df86f4d2929c07"
-SRC_URI[gix-features-0.35.0.sha256sum] = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd"
-SRC_URI[gix-features-0.36.1.sha256sum] = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2"
-SRC_URI[gix-filter-0.7.0.sha256sum] = "6d6a5c9d8e55c364e7c226919c19c9a28be1392d6208b5008059fa94ff7e2bf0"
-SRC_URI[gix-fs-0.8.1.sha256sum] = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107"
-SRC_URI[gix-glob-0.14.1.sha256sum] = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19"
-SRC_URI[gix-hash-0.13.3.sha256sum] = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0"
-SRC_URI[gix-hashtable-0.4.1.sha256sum] = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca"
-SRC_URI[gix-ignore-0.9.1.sha256sum] = "a215cc8cf21645bca131fcf6329d3ebd46299c47dbbe27df71bb1ca9e328b879"
-SRC_URI[gix-index-0.27.1.sha256sum] = "f3f308f5cd2992e96a274b0d1931e9a0e44fdcba87695ead3f6df30d8a697e9c"
-SRC_URI[gix-lock-11.0.1.sha256sum] = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37"
-SRC_URI[gix-macros-0.1.3.sha256sum] = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb"
-SRC_URI[gix-negotiate-0.10.0.sha256sum] = "979f6accd9c051b3dd018b50adf29c0a2459edddf6105cc70b767976cd6f8014"
-SRC_URI[gix-object-0.39.0.sha256sum] = "febf79c5825720c1c63fe974c7bbe695d0cb54aabad73f45671c60ce0e501e33"
-SRC_URI[gix-odb-0.55.0.sha256sum] = "1fae5f971540c99c6ecc8d4368ecc9d18a9dc8b9391025c68c4399747dc93bac"
-SRC_URI[gix-pack-0.45.0.sha256sum] = "4569491c92446fddf373456ff360aff9a9effd627b40a70f2d7914dcd75a3205"
-SRC_URI[gix-packetline-0.17.3.sha256sum] = "09ff45eef7747bde4986429a3e813478d50c2688b8f239e57bd3aa81065b285f"
-SRC_URI[gix-packetline-blocking-0.17.3.sha256sum] = "ca8ef6dd3ea50e26f3bf572e90c034d033c804d340cd1eb386392f184a9ba2f7"
-SRC_URI[gix-path-0.10.5.sha256sum] = "97e9ad649bf5e109562d6acba657ca428661ec08e77eaf3a755d8fa55485be9c"
-SRC_URI[gix-pathspec-0.4.1.sha256sum] = "1dbbb92f75a38ef043c8bb830b339b38d0698d7f3746968b5fcbade7a880494d"
-SRC_URI[gix-prompt-0.8.2.sha256sum] = "02bd89d058258e53e0fd6c57f13ee16c5673a83066a68e11f88626fc8cfda5f6"
-SRC_URI[gix-protocol-0.42.0.sha256sum] = "95736ef407db0bd15a5bdea791fbfcf523b9f13b96c852c240cd86a9ee0ef817"
-SRC_URI[gix-quote-0.4.10.sha256sum] = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f"
-SRC_URI[gix-ref-0.39.1.sha256sum] = "3b2069adc212cf7f3317ef55f6444abd06c50f28479dbbac5a86acf3b05cbbfe"
-SRC_URI[gix-refspec-0.20.0.sha256sum] = "76d9d3b82e1ee78fc0dc1c37ea5ea76c2dbc73f407db155f0dfcea285e583bee"
-SRC_URI[gix-revision-0.24.0.sha256sum] = "fe5dd51710ce5434bc315ea30394fab483c5377276494edd79222b321a5a9544"
-SRC_URI[gix-revwalk-0.10.0.sha256sum] = "69d4ed2493ca94a475fdf147138e1ef8bab3b6ebb56abf3d9bda1c05372ec1dd"
-SRC_URI[gix-sec-0.10.4.sha256sum] = "f8d9bf462feaf05f2121cba7399dbc6c34d88a9cad58fc1e95027791d6a3c6d2"
-SRC_URI[gix-submodule-0.6.0.sha256sum] = "02a3d7f60a95bdcaeb8981663c99d1c9f4de42aab1169524c949e948989809f9"
-SRC_URI[gix-tempfile-11.0.1.sha256sum] = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23"
-SRC_URI[gix-trace-0.1.7.sha256sum] = "02b202d766a7fefc596e2cc6a89cda8ad8ad733aed82da635ac120691112a9b1"
-SRC_URI[gix-transport-0.39.0.sha256sum] = "f731cfefc4d62468c6dd2053f5c6707828256a6d2f5488c1811e3f42c178b144"
-SRC_URI[gix-traverse-0.35.0.sha256sum] = "df2112088122a0206592c84fbd42020db63b2ccaed66a0293779f2e5fbf80474"
-SRC_URI[gix-url-0.25.2.sha256sum] = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005"
-SRC_URI[gix-utils-0.1.9.sha256sum] = "56e839f3d0798b296411263da6bee780a176ef8008a5dfc31287f7eda9266ab8"
-SRC_URI[gix-validate-0.8.3.sha256sum] = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854"
-SRC_URI[gix-worktree-0.28.0.sha256sum] = "7f1d0ae01dee14abe8c8117d78d7518f9a507de2dc4522546fbf4c444e9860b4"
+SRC_URI[gix-0.63.0.sha256sum] = "984c5018adfa7a4536ade67990b3ebc6e11ab57b3d6cd9968de0947ca99b4b06"
+SRC_URI[gix-actor-0.31.5.sha256sum] = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2"
+SRC_URI[gix-attributes-0.22.3.sha256sum] = "e37ce99c7e81288c28b703641b6d5d119aacc45c1a6b247156e6249afa486257"
+SRC_URI[gix-bitmap-0.2.11.sha256sum] = "a371db66cbd4e13f0ed9dc4c0fea712d7276805fccc877f77e96374d317e87ae"
+SRC_URI[gix-chunk-0.4.8.sha256sum] = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52"
+SRC_URI[gix-command-0.3.8.sha256sum] = "0d76867867da891cbe32021ad454e8cae90242f6afb06762e4dd0d357afd1d7b"
+SRC_URI[gix-commitgraph-0.24.3.sha256sum] = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78"
+SRC_URI[gix-config-0.37.0.sha256sum] = "53fafe42957e11d98e354a66b6bd70aeea00faf2f62dd11164188224a507c840"
+SRC_URI[gix-config-value-0.14.7.sha256sum] = "b328997d74dd15dc71b2773b162cb4af9a25c424105e4876e6d0686ab41c383e"
+SRC_URI[gix-credentials-0.24.4.sha256sum] = "198588f532e4d1202e04e6c3f50e4d7c060dffc66801c6f53cc246f1d234739e"
+SRC_URI[gix-date-0.8.7.sha256sum] = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0"
+SRC_URI[gix-diff-0.44.1.sha256sum] = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d"
+SRC_URI[gix-dir-0.5.0.sha256sum] = "60c99f8c545abd63abe541d20ab6cda347de406c0a3f1c80aadc12d9b0e94974"
+SRC_URI[gix-discover-0.32.0.sha256sum] = "fc27c699b63da66b50d50c00668bc0b7e90c3a382ef302865e891559935f3dbf"
+SRC_URI[gix-features-0.38.2.sha256sum] = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69"
+SRC_URI[gix-filter-0.11.3.sha256sum] = "e6547738da28275f4dff4e9f3a0f28509f53f94dd6bd822733c91cb306bca61a"
+SRC_URI[gix-fs-0.11.2.sha256sum] = "6adf99c27cdf17b1c4d77680c917e0d94d8783d4e1c73d3be0d1d63107163d7a"
+SRC_URI[gix-glob-0.16.4.sha256sum] = "fa7df15afa265cc8abe92813cd354d522f1ac06b29ec6dfa163ad320575cb447"
+SRC_URI[gix-hash-0.14.2.sha256sum] = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e"
+SRC_URI[gix-hashtable-0.5.2.sha256sum] = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242"
+SRC_URI[gix-ignore-0.11.3.sha256sum] = "5e6afb8f98e314d4e1adc822449389ada863c174b5707cedd327d67b84dba527"
+SRC_URI[gix-index-0.33.1.sha256sum] = "9a9a44eb55bd84bb48f8a44980e951968ced21e171b22d115d1cdcef82a7d73f"
+SRC_URI[gix-lock-14.0.0.sha256sum] = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d"
+SRC_URI[gix-macros-0.1.5.sha256sum] = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17"
+SRC_URI[gix-negotiate-0.13.2.sha256sum] = "9ec879fb6307bb63519ba89be0024c6f61b4b9d61f1a91fd2ce572d89fe9c224"
+SRC_URI[gix-object-0.42.3.sha256sum] = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386"
+SRC_URI[gix-odb-0.61.1.sha256sum] = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b"
+SRC_URI[gix-pack-0.51.1.sha256sum] = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229"
+SRC_URI[gix-packetline-0.17.5.sha256sum] = "b70486beda0903b6d5b65dfa6e40585098cdf4e6365ca2dff4f74c387354a515"
+SRC_URI[gix-packetline-blocking-0.17.4.sha256sum] = "c31d42378a3d284732e4d589979930d0d253360eccf7ec7a80332e5ccb77e14a"
+SRC_URI[gix-path-0.10.9.sha256sum] = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9"
+SRC_URI[gix-pathspec-0.7.6.sha256sum] = "d307d1b8f84dc8386c4aa20ce0cf09242033840e15469a3ecba92f10cfb5c046"
+SRC_URI[gix-prompt-0.8.6.sha256sum] = "7e0595d2be4b6d6a71a099e989bdd610882b882da35fb8503d91d6f81aa0936f"
+SRC_URI[gix-protocol-0.45.2.sha256sum] = "bad8da8e89f24177bd77947092199bb13dcc318bbd73530ba8a05e6d6adaaa9d"
+SRC_URI[gix-quote-0.4.12.sha256sum] = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff"
+SRC_URI[gix-ref-0.44.1.sha256sum] = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e"
+SRC_URI[gix-refspec-0.23.1.sha256sum] = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37"
+SRC_URI[gix-revision-0.27.2.sha256sum] = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce"
+SRC_URI[gix-revwalk-0.13.2.sha256sum] = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0"
+SRC_URI[gix-sec-0.10.7.sha256sum] = "1547d26fa5693a7f34f05b4a3b59a90890972922172653bcb891ab3f09f436df"
+SRC_URI[gix-submodule-0.11.0.sha256sum] = "921cd49924ac14b6611b22e5fb7bbba74d8780dc7ad26153304b64d1272460ac"
+SRC_URI[gix-tempfile-14.0.1.sha256sum] = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c"
+SRC_URI[gix-trace-0.1.9.sha256sum] = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e"
+SRC_URI[gix-transport-0.42.2.sha256sum] = "27c02b83763ffe95bcc27ce5821b2b7f843315a009c06f1cd59c9b66c508c058"
+SRC_URI[gix-traverse-0.39.2.sha256sum] = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840"
+SRC_URI[gix-url-0.27.4.sha256sum] = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156"
+SRC_URI[gix-utils-0.1.12.sha256sum] = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc"
+SRC_URI[gix-validate-0.8.5.sha256sum] = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf"
+SRC_URI[gix-worktree-0.34.1.sha256sum] = "26f7326ebe0b9172220694ea69d344c536009a9b98fb0f9de092c440f3efe7a6"
 SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 SRC_URI[globset-0.4.14.sha256sum] = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 SRC_URI[group-0.13.0.sha256sum] = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-SRC_URI[hashlink-0.8.4.sha256sum] = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+SRC_URI[hashlink-0.9.1.sha256sum] = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
 SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-SRC_URI[hermit-abi-0.3.5.sha256sum] = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
+SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 SRC_URI[hkdf-0.12.4.sha256sum] = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 SRC_URI[hmac-0.12.1.sha256sum] = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
@@ -479,176 +494,183 @@ SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6f
 SRC_URI[ignore-0.4.22.sha256sum] = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
 SRC_URI[im-rc-15.1.0.sha256sum] = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe"
 SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-SRC_URI[indexmap-2.2.2.sha256sum] = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
-SRC_URI[is-terminal-0.4.11.sha256sum] = "fe8f25ce1159c7740ff0b9b2f5cdf4a8428742ba7c112b9f20f22cd5219c7dab"
+SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+SRC_URI[is_terminal_polyfill-1.70.1.sha256sum] = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-SRC_URI[itoa-1.0.10.sha256sum] = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-SRC_URI[jobserver-0.1.28.sha256sum] = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
-SRC_URI[js-sys-0.3.68.sha256sum] = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
-SRC_URI[kstring-2.0.0.sha256sum] = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+SRC_URI[jobserver-0.1.32.sha256sum] = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+SRC_URI[js-sys-0.3.69.sha256sum] = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+SRC_URI[kstring-2.0.2.sha256sum] = "558bf9508a558512042d3095138b1f7b8fe90c5467d94f9f1da28b3731c5dbd1"
+SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+SRC_URI[libdbus-sys-0.2.5.sha256sum] = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
 SRC_URI[libgit2-sys-0.16.2+1.7.2.sha256sum] = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
-SRC_URI[libloading-0.8.1.sha256sum] = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
-SRC_URI[libnghttp2-sys-0.1.9+1.58.0.sha256sum] = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
-SRC_URI[libsqlite3-sys-0.27.0.sha256sum] = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
+SRC_URI[libloading-0.8.5.sha256sum] = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+SRC_URI[libnghttp2-sys-0.1.10+1.61.0.sha256sum] = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135"
+SRC_URI[libsqlite3-sys-0.28.0.sha256sum] = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
 SRC_URI[libssh2-sys-0.3.0.sha256sum] = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-SRC_URI[libz-sys-1.1.15.sha256sum] = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
-SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-SRC_URI[lock_api-0.4.11.sha256sum] = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+SRC_URI[libz-sys-1.1.18.sha256sum] = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
+SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+SRC_URI[lock_api-0.4.12.sha256sum] = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 SRC_URI[matchers-0.1.0.sha256sum] = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-SRC_URI[maybe-async-0.2.9.sha256sum] = "afc95a651c82daf7004c824405aa1019723644950d488571bd718e3ed84646ed"
-SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+SRC_URI[maybe-async-0.2.10.sha256sum] = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 SRC_URI[memmap2-0.9.4.sha256sum] = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+SRC_URI[miniz_oxide-0.7.4.sha256sum] = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 SRC_URI[miow-0.6.0.sha256sum] = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[normpath-1.1.1.sha256sum] = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5"
+SRC_URI[normpath-1.2.0.sha256sum] = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804"
 SRC_URI[nu-ansi-term-0.46.0.sha256sum] = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+SRC_URI[num_threads-0.1.7.sha256sum] = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-SRC_URI[opener-0.6.1.sha256sum] = "6c62dcb6174f9cb326eac248f07e955d5d559c272730b6c03e396b443b562788"
-SRC_URI[openssl-0.10.63.sha256sum] = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+SRC_URI[opener-0.7.1.sha256sum] = "f8df34be653210fbe9ffaff41d3b92721c56ce82dfee58ee684f9afb5e3a90c0"
+SRC_URI[openssl-0.10.66.sha256sum] = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 SRC_URI[openssl-macros-0.1.1.sha256sum] = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 SRC_URI[openssl-probe-0.1.5.sha256sum] = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-SRC_URI[openssl-src-300.2.2+3.2.1.sha256sum] = "8bbfad0063610ac26ee79f7484739e2b07555a75c42453b89263830b5c8103bc"
-SRC_URI[openssl-sys-0.9.99.sha256sum] = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+SRC_URI[openssl-src-300.3.1+3.3.1.sha256sum] = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+SRC_URI[openssl-sys-0.9.103.sha256sum] = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
 SRC_URI[ordered-float-2.10.1.sha256sum] = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
 SRC_URI[orion-0.17.6.sha256sum] = "7abdb10181903c8c4b016ba45d6d6d5af1a1e2a461aa4763a83b87f5df4695e5"
-SRC_URI[os_info-3.7.0.sha256sum] = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
+SRC_URI[os_info-3.8.2.sha256sum] = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
 SRC_URI[overload-0.1.1.sha256sum] = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 SRC_URI[p384-0.13.0.sha256sum] = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
-SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+SRC_URI[parking_lot-0.12.3.sha256sum] = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+SRC_URI[parking_lot_core-0.9.10.sha256sum] = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 SRC_URI[pasetors-0.6.8.sha256sum] = "6b36d47c66f2230dd1b7143d9afb2b4891879020210eddf2ccb624e529b96dba"
 SRC_URI[pathdiff-0.2.1.sha256sum] = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 SRC_URI[pem-rfc7468-0.7.0.sha256sum] = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
 SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-SRC_URI[pin-project-lite-0.2.13.sha256sum] = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+SRC_URI[pin-project-lite-0.2.14.sha256sum] = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 SRC_URI[pkcs8-0.10.2.sha256sum] = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-SRC_URI[pkg-config-0.3.29.sha256sum] = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+SRC_URI[pkg-config-0.3.30.sha256sum] = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+SRC_URI[ppv-lite86-0.2.18.sha256sum] = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
 SRC_URI[primeorder-0.13.6.sha256sum] = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
-SRC_URI[prodash-26.2.2.sha256sum] = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf"
-SRC_URI[pulldown-cmark-0.9.6.sha256sum] = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
-SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+SRC_URI[prodash-28.0.0.sha256sum] = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
+SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 SRC_URI[rand_xoshiro-0.6.0.sha256sum] = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
 SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+SRC_URI[redox_syscall-0.5.3.sha256sum] = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 SRC_URI[regex-automata-0.1.10.sha256sum] = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 SRC_URI[regex-syntax-0.6.29.sha256sum] = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 SRC_URI[rfc6979-0.4.0.sha256sum] = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-SRC_URI[rusqlite-0.30.0.sha256sum] = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d"
-SRC_URI[rustfix-0.7.0.sha256sum] = "7ec10cbeb92a2e494ef354d66126882da8c0a244ad769e2a7193efc5de625175"
-SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
-SRC_URI[ryu-1.0.16.sha256sum] = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+SRC_URI[rusqlite-0.31.0.sha256sum] = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
+SRC_URI[rustfix-0.8.4.sha256sum] = "4cef0c817217c330b3ef879e06455d726c1cffc800eaf7734d3b4ac63213636b"
+SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 SRC_URI[schannel-0.1.23.sha256sum] = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 SRC_URI[sec1-0.7.3.sha256sum] = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
-SRC_URI[security-framework-2.9.2.sha256sum] = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-SRC_URI[security-framework-sys-2.9.1.sha256sum] = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-SRC_URI[semver-1.0.21.sha256sum] = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
-SRC_URI[serde-1.0.196.sha256sum] = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
-SRC_URI[serde-untagged-0.1.5.sha256sum] = "6a160535368dfc353348e7eaa299156bd508c60c45a9249725f5f6d370d82a66"
+SRC_URI[security-framework-2.11.1.sha256sum] = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+SRC_URI[security-framework-sys-2.11.1.sha256sum] = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+SRC_URI[serde-1.0.204.sha256sum] = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+SRC_URI[serde-untagged-0.1.6.sha256sum] = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6"
 SRC_URI[serde-value-0.7.0.sha256sum] = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-SRC_URI[serde_derive-1.0.196.sha256sum] = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+SRC_URI[serde_derive-1.0.204.sha256sum] = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 SRC_URI[serde_ignored-0.1.10.sha256sum] = "a8e319a36d1b52126a0d608f24e93b2d81297091818cd70625fcf50a15d84ddf"
-SRC_URI[serde_json-1.0.113.sha256sum] = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
-SRC_URI[serde_spanned-0.6.5.sha256sum] = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+SRC_URI[serde_json-1.0.121.sha256sum] = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+SRC_URI[serde_spanned-0.6.7.sha256sum] = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-SRC_URI[sha1_smol-1.0.0.sha256sum] = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+SRC_URI[sha1_smol-1.0.1.sha256sum] = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
 SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 SRC_URI[sharded-slab-0.1.7.sha256sum] = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 SRC_URI[shell-escape-0.1.5.sha256sum] = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
 SRC_URI[shell-words-1.1.0.sha256sum] = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 SRC_URI[signature-2.2.0.sha256sum] = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 SRC_URI[sized-chunks-0.6.5.sha256sum] = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e"
-SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-SRC_URI[socket2-0.5.5.sha256sum] = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+SRC_URI[socket2-0.5.7.sha256sum] = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 SRC_URI[spki-0.7.3.sha256sum] = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-SRC_URI[subtle-2.5.0.sha256sum] = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-SRC_URI[supports-hyperlinks-2.1.0.sha256sum] = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d"
+SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+SRC_URI[subtle-2.6.1.sha256sum] = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+SRC_URI[supports-hyperlinks-3.0.0.sha256sum] = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee"
+SRC_URI[supports-unicode-3.0.0.sha256sum] = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
 SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
-SRC_URI[tar-0.4.40.sha256sum] = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+SRC_URI[syn-2.0.72.sha256sum] = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+SRC_URI[tar-0.4.41.sha256sum] = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-SRC_URI[thiserror-1.0.56.sha256sum] = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
-SRC_URI[thiserror-impl-1.0.56.sha256sum] = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
-SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-SRC_URI[time-0.3.34.sha256sum] = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+SRC_URI[thiserror-1.0.63.sha256sum] = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+SRC_URI[thiserror-impl-1.0.63.sha256sum] = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+SRC_URI[thread_local-1.1.8.sha256sum] = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+SRC_URI[time-0.3.36.sha256sum] = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-SRC_URI[time-macros-0.2.17.sha256sum] = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+SRC_URI[time-macros-0.2.18.sha256sum] = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+SRC_URI[tinyvec-1.8.0.sha256sum] = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-SRC_URI[toml-0.8.10.sha256sum] = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
-SRC_URI[toml_datetime-0.6.5.sha256sum] = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-SRC_URI[toml_edit-0.21.1.sha256sum] = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-SRC_URI[toml_edit-0.22.4.sha256sum] = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
+SRC_URI[toml-0.8.16.sha256sum] = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
+SRC_URI[toml_datetime-0.6.7.sha256sum] = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
+SRC_URI[toml_edit-0.22.17.sha256sum] = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
 SRC_URI[tracing-0.1.40.sha256sum] = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 SRC_URI[tracing-attributes-0.1.27.sha256sum] = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+SRC_URI[tracing-chrome-0.7.2.sha256sum] = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724"
 SRC_URI[tracing-core-0.1.32.sha256sum] = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 SRC_URI[tracing-log-0.2.0.sha256sum] = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 SRC_URI[tracing-subscriber-0.3.18.sha256sum] = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+SRC_URI[typeid-1.0.0.sha256sum] = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
 SRC_URI[typenum-1.17.0.sha256sum] = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 SRC_URI[unicase-2.7.0.sha256sum] = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 SRC_URI[unicode-bidi-0.3.15.sha256sum] = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 SRC_URI[unicode-bom-2.0.3.sha256sum] = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217"
 SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+SRC_URI[unicode-normalization-0.1.23.sha256sum] = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+SRC_URI[unicode-width-0.1.13.sha256sum] = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+SRC_URI[url-2.5.2.sha256sum] = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+SRC_URI[utf8parse-0.2.2.sha256sum] = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 SRC_URI[valuable-0.1.0.sha256sum] = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 SRC_URI[vcpkg-0.2.15.sha256sum] = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-SRC_URI[wasm-bindgen-0.2.91.sha256sum] = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
-SRC_URI[wasm-bindgen-backend-0.2.91.sha256sum] = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
-SRC_URI[wasm-bindgen-macro-0.2.91.sha256sum] = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
-SRC_URI[wasm-bindgen-macro-support-0.2.91.sha256sum] = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
-SRC_URI[wasm-bindgen-shared-0.2.91.sha256sum] = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+SRC_URI[wasm-bindgen-0.2.92.sha256sum] = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+SRC_URI[wasm-bindgen-backend-0.2.92.sha256sum] = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+SRC_URI[wasm-bindgen-macro-0.2.92.sha256sum] = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+SRC_URI[wasm-bindgen-macro-support-0.2.92.sha256sum] = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+SRC_URI[wasm-bindgen-shared-0.2.92.sha256sum] = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+SRC_URI[winapi-util-0.1.8.sha256sum] = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-SRC_URI[winnow-0.5.39.sha256sum] = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
-SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-SRC_URI[zeroize-1.7.0.sha256sum] = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+SRC_URI[winnow-0.6.16.sha256sum] = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
+SRC_URI[zerocopy-0.6.6.sha256sum] = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+SRC_URI[zerocopy-0.7.35.sha256sum] = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+SRC_URI[zerocopy-derive-0.6.6.sha256sum] = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+SRC_URI[zerocopy-derive-0.7.35.sha256sum] = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+SRC_URI[zeroize-1.8.1.sha256sum] = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/meta/recipes-devtools/rust/cargo-c-native_0.9.30+cargo-0.77.0.bb b/meta/recipes-devtools/rust/cargo-c-native_0.10.3+cargo-0.81.0.bb
similarity index 82%
rename from meta/recipes-devtools/rust/cargo-c-native_0.9.30+cargo-0.77.0.bb
rename to meta/recipes-devtools/rust/cargo-c-native_0.10.3+cargo-0.81.0.bb
index 8e17606b73d..145e70482a0 100644
--- a/meta/recipes-devtools/rust/cargo-c-native_0.9.30+cargo-0.77.0.bb
+++ b/meta/recipes-devtools/rust/cargo-c-native_0.10.3+cargo-0.81.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 SRC_URI = "crate://crates.io/cargo-c/${PV};name=cargo-c"
-SRC_URI[cargo-c.sha256sum] = "ec77e3635cdb0d211f88f22d0460eef0ba031eb616ded57f2ffb98a90365c445"
+SRC_URI[cargo-c.sha256sum] = "99f10fab01de791f95e81134202792e4a6975c3a3921fec2d4cbf3e9c269b709"
 S = "${CARGO_VENDORING_DIRECTORY}/cargo-c-${PV}"
 
 inherit cargo cargo-update-recipe-crates pkgconfig native
-- 
2.39.2

[PATCH 18/34] go-helloworld: update to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/go-examples/go-helloworld_0.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
index 575ee81b50a..8d4dd49ab67 100644
--- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
-SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935"
+SRCREV = "39e772fc26705bb170db248e5372a81ed5ffd67f"
 UPSTREAM_CHECK_COMMITS = "1"
 
 GO_IMPORT = "golang.org/x/example"
-- 
2.39.2

[PATCH 19/34] vulkan-samples: update to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop backports.

This has again regressed on 32 bit x86, and as no one cares upstream
and the 32 bit x86 platform really isn't relevant for vulkan,
let's just disable it there.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Deprecate-u8string_view.patch        |  59 ----------
 ...ot-use-LFS64-functions-on-linux-musl.patch |  37 -------
 .../vulkan/vulkan-samples/32bit.patch         | 101 ------------------
 .../vulkan/vulkan-samples_git.bb              |   7 +-
 4 files changed, 3 insertions(+), 201 deletions(-)
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
 delete mode 100644 meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch

diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
deleted file mode 100644
index c2304bdd48b..00000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Deprecate-u8string_view.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 93987b1ce7d6f91387202495aac61026070597df Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 15 Jan 2023 21:37:52 -0800
-Subject: [PATCH] Deprecate u8string_view
-
-Use basic_string_view instead
-
-Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/dea7fde8b7d649923dd41b0766bdf076033c62a2]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/spdlog/fmt/bundled/core.h   |  3 ++-
- include/spdlog/fmt/bundled/format.h | 15 ++-------------
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/include/spdlog/fmt/bundled/core.h b/include/spdlog/fmt/bundled/core.h
-index 50b79351..e8b029ef 100644
---- a/include/spdlog/fmt/bundled/core.h
-+++ b/include/spdlog/fmt/bundled/core.h
-@@ -1484,7 +1484,8 @@ FMT_API void vprint(wstring_view format_str, wformat_args args);
- 
- /**
-   \rst
--  Prints formatted data to ``stdout``.
-+  Formats ``args`` according to specifications in ``format_str`` and writes the
-+  output to ``stdout``.
- 
-   **Example**::
- 
-diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h
-index 1bb24a52..39426361 100644
---- a/include/spdlog/fmt/bundled/format.h
-+++ b/include/spdlog/fmt/bundled/format.h
-@@ -407,21 +407,10 @@ void basic_buffer<T>::append(const U *begin, const U *end) {
- enum char8_t: unsigned char {};
- #endif
- 
--// A UTF-8 string view.
--class u8string_view : public basic_string_view<char8_t> {
-- public:
--  typedef char8_t char_type;
--
--  u8string_view(const char *s):
--    basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s)) {}
--  u8string_view(const char *s, size_t count) FMT_NOEXCEPT:
--    basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s), count) {}
--};
--
- #if FMT_USE_USER_DEFINED_LITERALS
- inline namespace literals {
--inline u8string_view operator"" _u(const char *s, std::size_t n) {
--  return {s, n};
-+inline basic_string_view<char8_t> operator"" _u(const char* s, std::size_t n) {
-+  return {reinterpret_cast<const char8_t*>(s), n};
- }
- }
- #endif
--- 
-2.39.0
-
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
deleted file mode 100644
index f2bd7e510b8..00000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-Do-not-use-LFS64-functions-on-linux-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ce7a593e74c8e0c2ece15c73e7614d4f13a19a53 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 30 Dec 2022 13:04:08 -0800
-Subject: [PATCH] Do not use LFS64 functions on linux/musl
-
-On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using
-LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped
-providing aliases for these functions [1] which means it wont compile on
-newer musl systems. Therefore only use it on 32bit glibc/linux platforms
-and exclude musl like cygwin or OSX
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
-
-Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/spdlog/details/os.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
-index 8e8476f0..be0a67b8 100644
---- a/include/spdlog/details/os.h
-+++ b/include/spdlog/details/os.h
-@@ -227,7 +227,9 @@ inline size_t filesize(FILE *f)
- #else // unix
-     int fd = fileno(f);
- // 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
--#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
-+#if !defined(__FreeBSD__) && !defined(__APPLE__) && \
-+    (defined(__linux__) && defined(__GLIBC__)) && \
-+    (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__)
-     struct stat64 st;
-     if (::fstat64(fd, &st) == 0)
-     {
--- 
-2.39.0
-
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch b/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
deleted file mode 100644
index 644c3b61670..00000000000
--- a/meta/recipes-graphics/vulkan/vulkan-samples/32bit.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 49761ca63797014223d8e3ff6fb2c0235803c19c Mon Sep 17 00:00:00 2001
-From: asuessenbach <asuessenbach@nvidia.com>
-Date: Wed, 3 May 2023 09:50:08 +0200
-Subject: [PATCH] Resolve some Vulkan-Hpp-related issues on Win32.
-
-This patch fixes vulkan-samples compilation on 32-bit hosts.
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
----
- framework/common/hpp_vk_common.h                        | 4 ++--
- framework/core/hpp_buffer.cpp                           | 4 ++--
- framework/core/hpp_buffer.h                             | 2 +-
- framework/core/hpp_image.cpp                            | 2 +-
- samples/api/hpp_texture_loading/hpp_texture_loading.cpp | 2 +-
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/framework/common/hpp_vk_common.h b/framework/common/hpp_vk_common.h
-index 39ed3dcde..0cbbe479e 100644
---- a/framework/common/hpp_vk_common.h
-+++ b/framework/common/hpp_vk_common.h
-@@ -92,7 +92,7 @@ inline bool is_dynamic_buffer_descriptor_type(vk::DescriptorType descriptor_type
- 
- inline vk::ShaderModule load_shader(const std::string &filename, vk::Device device, vk::ShaderStageFlagBits stage)
- {
--	return vkb::load_shader(filename, device, static_cast<VkShaderStageFlagBits>(stage));
-+	return static_cast<vk::ShaderModule>(vkb::load_shader(filename, device, static_cast<VkShaderStageFlagBits>(stage)));
- }
- 
- inline void set_image_layout(vk::CommandBuffer         command_buffer,
-@@ -104,7 +104,7 @@ inline void set_image_layout(vk::CommandBuffer         command_buffer,
-                              vk::PipelineStageFlags    dst_mask = vk::PipelineStageFlagBits::eAllCommands)
- {
- 	vkb::set_image_layout(command_buffer,
--	                      image,
-+	                      static_cast<VkImage>(image),
- 	                      static_cast<VkImageLayout>(old_layout),
- 	                      static_cast<VkImageLayout>(new_layout),
- 	                      static_cast<VkImageSubresourceRange>(subresource_range),
-diff --git a/framework/core/hpp_buffer.cpp b/framework/core/hpp_buffer.cpp
-index 8da265acb..e6509b9f4 100644
---- a/framework/core/hpp_buffer.cpp
-+++ b/framework/core/hpp_buffer.cpp
-@@ -84,7 +84,7 @@ HPPBuffer::~HPPBuffer()
- 	if (get_handle() && (allocation != VK_NULL_HANDLE))
- 	{
- 		unmap();
--		vmaDestroyBuffer(get_device().get_memory_allocator(), get_handle(), allocation);
-+		vmaDestroyBuffer(get_device().get_memory_allocator(), static_cast<VkBuffer>(get_handle()), allocation);
- 	}
- }
- 
-@@ -93,7 +93,7 @@ VmaAllocation HPPBuffer::get_allocation() const
- 	return allocation;
- }
- 
--VkDeviceMemory HPPBuffer::get_memory() const
-+vk::DeviceMemory HPPBuffer::get_memory() const
- {
- 	return memory;
- }
-diff --git a/framework/core/hpp_buffer.h b/framework/core/hpp_buffer.h
-index 7a243c265..bad47406d 100644
---- a/framework/core/hpp_buffer.h
-+++ b/framework/core/hpp_buffer.h
-@@ -55,7 +55,7 @@ class HPPBuffer : public vkb::core::HPPVulkanResource<vk::Buffer>
- 
- 	VmaAllocation  get_allocation() const;
- 	const uint8_t *get_data() const;
--	VkDeviceMemory get_memory() const;
-+	vk::DeviceMemory get_memory() const;
- 
- 	/**
- 	 * @return Return the buffer's device address (note: requires that the buffer has been created with the VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT usage fla)
-diff --git a/framework/core/hpp_image.cpp b/framework/core/hpp_image.cpp
-index 00fa89ba7..5e6f27363 100644
---- a/framework/core/hpp_image.cpp
-+++ b/framework/core/hpp_image.cpp
-@@ -138,7 +138,7 @@ HPPImage::~HPPImage()
- 	if (get_handle() && memory)
- 	{
- 		unmap();
--		vmaDestroyImage(get_device().get_memory_allocator(), get_handle(), memory);
-+		vmaDestroyImage(get_device().get_memory_allocator(), static_cast<VkImage>(get_handle()), memory);
- 	}
- }
- 
-diff --git a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-index 11a1f24c1..cbdd22773 100644
---- a/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-+++ b/samples/api/hpp_texture_loading/hpp_texture_loading.cpp
-@@ -170,7 +170,7 @@ void HPPTextureLoading::load_texture()
- 		memory_allocate_info  = {memory_requirements.size,
- 		                         get_device()->get_gpu().get_memory_type(memory_requirements.memoryTypeBits, vk::MemoryPropertyFlagBits::eDeviceLocal)};
- 		texture.device_memory = get_device()->get_handle().allocateMemory(memory_allocate_info);
--		VK_CHECK(vkBindImageMemory(get_device()->get_handle(), texture.image, texture.device_memory, 0));
-+		get_device()->get_handle().bindImageMemory(texture.image, texture.device_memory, 0);
- 
- 		vk::CommandBuffer copy_command = get_device()->create_command_buffer(vk::CommandBufferLevel::ePrimary, true);
- 
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
index 4e688e44a72..93d4cdfdd9e 100644
--- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb
@@ -7,14 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a"
 
 SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \
            file://0001-vulkan-samples-Fix-reproducibility-issue.patch \
-           file://0001-Do-not-use-LFS64-functions-on-linux-musl.patch;patchdir=third_party/spdlog \
-           file://0001-Deprecate-u8string_view.patch;patchdir=third_party/spdlog \
-           file://32bit.patch \
            file://0001-zstd.c-replace-FORCE_INLINE_TEMPLATE-with-inline.patch;patchdir=third_party/ktx \
            "
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "2307c3eb5608cb1205fa3514b3a31dbfb857d00c"
+SRCREV = "fdce530c029514e2f66296288f9ee26a05058ec1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
 S = "${WORKDIR}/git"
@@ -38,3 +35,5 @@ EXTRA_OECMAKE += "-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON"
 
 # This needs to be specified explicitly to avoid xcb/xlib dependencies
 EXTRA_OECMAKE += "-DVKB_WSI_SELECTION=D2D"
+
+COMPATIBLE_HOST:x86 = "null"
-- 
2.39.2

[PATCH 20/34] ffmpeg: update 6.1.1 -> 7.0.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...lpdsp_armv5te-fix-label-format-to-wo.patch |    2 +-
 .../ffmpeg/ffmpeg/av1_ordering_info.patch     |   91 --
 .../ffmpeg/ffmpeg/vulkan_av1_stable_API.patch | 1382 -----------------
 .../ffmpeg/ffmpeg/vulkan_fix_gcc14.patch      |  102 --
 .../{ffmpeg_6.1.1.bb => ffmpeg_7.0.2.bb}      |    5 +-
 5 files changed, 2 insertions(+), 1580 deletions(-)
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
 delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_6.1.1.bb => ffmpeg_7.0.2.bb} (97%)

diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
index 2551eb17d7e..b7cd048165c 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
@@ -1,4 +1,4 @@
-From 0b541aa54b9573d8eef7401a0cc58c422fe60a9a Mon Sep 17 00:00:00 2001
+From e52fc2c11c3935085ccf1a5707ce50223ad62b58 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Thu, 8 Aug 2024 18:04:17 +0100
 Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch
deleted file mode 100644
index bfc894563cb..00000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/av1_ordering_info.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From cafb4c554845332eeb33284cf6498049997dc67e Mon Sep 17 00:00:00 2001
-From: Mark Thompson <sw@jkqxz.net>
-Date: Wed, 20 Mar 2024 20:35:28 +0000
-Subject: [PATCH] lavc/cbs_av1: Save more frame ordering information
-
-This is wanted by the Vulkan decoder.
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295]
----
- libavcodec/cbs_av1.h                 |  5 +++++
- libavcodec/cbs_av1_syntax_template.c | 25 +++++++++++++++++++++----
- 2 files changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h
-index a5402f069d..a027013bc7 100644
---- a/libavcodec/cbs_av1.h
-+++ b/libavcodec/cbs_av1.h
-@@ -427,6 +427,8 @@ typedef struct AV1ReferenceFrameState {
-     int bit_depth;      // RefBitDepth
-     int order_hint;     // RefOrderHint
- 
-+    int saved_order_hints[AV1_TOTAL_REFS_PER_FRAME]; // SavedOrderHints[ref]
-+
-     int8_t  loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME];
-     int8_t  loop_filter_mode_deltas[2];
-     uint8_t feature_enabled[AV1_MAX_SEGMENTS][AV1_SEG_LVL_MAX];
-@@ -464,6 +466,9 @@ typedef struct CodedBitstreamAV1Context {
-     int tile_rows;
-     int tile_num;
- 
-+    int order_hints[AV1_TOTAL_REFS_PER_FRAME];         // OrderHints
-+    int ref_frame_sign_bias[AV1_TOTAL_REFS_PER_FRAME]; // RefFrameSignBias
-+
-     AV1ReferenceFrameState ref[AV1_NUM_REF_FRAMES];
- 
-     // AVOptions
-diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
-index 3be1f2d30f..2979c5d98f 100644
---- a/libavcodec/cbs_av1_syntax_template.c
-+++ b/libavcodec/cbs_av1_syntax_template.c
-@@ -1414,6 +1414,8 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
-             priv->ref[i].valid = 0;
-             priv->ref[i].order_hint = 0;
-         }
-+        for (i = 0; i < AV1_REFS_PER_FRAME; i++)
-+            priv->order_hints[i + AV1_REF_FRAME_LAST] = 0;
-     }
- 
-     flag(disable_cdf_update);
-@@ -1568,11 +1570,20 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw,
-         else
-             flag(use_ref_frame_mvs);
- 
--        infer(allow_intrabc, 0);
--    }
-+        for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
-+            int ref_frame = AV1_REF_FRAME_LAST + i;
-+            int hint = priv->ref[current->ref_frame_idx[i]].order_hint;
-+            priv->order_hints[ref_frame] = hint;
-+            if (!seq->enable_order_hint) {
-+                priv->ref_frame_sign_bias[ref_frame] = 0;
-+            } else {
-+                priv->ref_frame_sign_bias[ref_frame] =
-+                    cbs_av1_get_relative_dist(seq, hint,
-+                                              current->order_hint) > 0;
-+            }
-+        }
- 
--    if (!frame_is_intra) {
--        // Derive reference frame sign biases.
-+        infer(allow_intrabc, 0);
-     }
- 
-     if (seq->reduced_still_picture_header || current->disable_cdf_update)
-@@ -1674,6 +1685,12 @@ update_refs:
-                 .bit_depth      = priv->bit_depth,
-                 .order_hint     = priv->order_hint,
-             };
-+
-+            for (int j = 0; j < AV1_REFS_PER_FRAME; j++) {
-+                priv->ref[i].saved_order_hints[j + AV1_REF_FRAME_LAST] =
-+                    priv->order_hints[j + AV1_REF_FRAME_LAST];
-+            }
-+
-             memcpy(priv->ref[i].loop_filter_ref_deltas, current->loop_filter_ref_deltas,
-                    sizeof(current->loop_filter_ref_deltas));
-             memcpy(priv->ref[i].loop_filter_mode_deltas, current->loop_filter_mode_deltas,
--- 
-2.25.1
-
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
deleted file mode 100644
index 74db148b3b3..00000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
+++ /dev/null
@@ -1,1382 +0,0 @@
-From ecdc94b97f809d5f2b88640842fd0541951ad295 Mon Sep 17 00:00:00 2001
-From: Lynne <dev@lynne.ee>
-Date: Fri, 19 Jan 2024 10:49:02 +1000
-Subject: [PATCH] vulkan_av1: port to the new stable API
-
-Co-Authored-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295]
----
- configure                                     |   4 +-
- libavcodec/Makefile                           |   5 +-
- libavcodec/vulkan_av1.c                       | 514 ++++++++++--------
- libavcodec/vulkan_decode.c                    |  31 +-
- libavcodec/vulkan_decode.h                    |   2 +-
- libavcodec/vulkan_video.h                     |   2 -
- .../vulkan_video_codec_av1std_decode_mesa.h   |  36 --
- libavcodec/vulkan_video_codec_av1std_mesa.h   | 403 --------------
- libavutil/hwcontext_vulkan.c                  |   2 +-
- libavutil/vulkan_functions.h                  |   2 +-
- libavutil/vulkan_loader.h                     |   2 +-
- 11 files changed, 306 insertions(+), 697 deletions(-)
- delete mode 100644 libavcodec/vulkan_video_codec_av1std_decode_mesa.h
- delete mode 100644 libavcodec/vulkan_video_codec_av1std_mesa.h
-
-diff --git a/configure b/configure
-index e853deb51d..9fa639fca6 100755
---- a/configure
-+++ b/configure
-@@ -7300,8 +7300,8 @@ enabled vdpau &&
-          "in maintaining it."
- 
- if enabled vulkan; then
--    check_pkg_config_header_only vulkan "vulkan >= 1.3.255" "vulkan/vulkan.h" "defined VK_VERSION_1_3" ||
--        check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 255)"
-+    check_pkg_config_header_only vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" ||
-+        check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)"
- fi
- 
- if disabled vulkan; then
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 7ef2e03ca6..9ce6d445c1 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -1258,8 +1258,7 @@ SKIPHEADERS                            += %_tablegen.h                  \
-                                           aacenc_quantization.h         \
-                                           aacenc_quantization_misc.h    \
-                                           bitstream_template.h          \
--                                          vulkan_video_codec_av1std.h   \
--                                          $(ARCH)/vpx_arith.h          \
-+                                          $(ARCH)/vpx_arith.h           \
- 
- SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
- SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
-@@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h
- SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
- SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
- SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
--SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
-+SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h
- SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
- SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
- 
-diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c
-index 5afd5353cc..c9e398eaec 100644
---- a/libavcodec/vulkan_av1.c
-+++ b/libavcodec/vulkan_av1.c
-@@ -36,33 +36,47 @@ const FFVulkanDecodeDescriptor ff_vk_dec_av1_desc = {
- typedef struct AV1VulkanDecodePicture {
-     FFVulkanDecodePicture           vp;
- 
--    /* Workaround for a spec issue.
--     *Can be removed once no longer needed, and threading can be enabled. */
-+    /* TODO: investigate if this can be removed to make decoding completely
-+     * independent. */
-     FFVulkanDecodeContext          *dec;
- 
--    StdVideoAV1MESATile            tiles[MAX_TILES];
--    StdVideoAV1MESATileList        tile_list;
--    const uint32_t                *tile_offsets;
-+    uint32_t tile_sizes[MAX_TILES];
- 
-     /* Current picture */
--    VkVideoDecodeAV1DpbSlotInfoMESA    vkav1_ref;
--    StdVideoAV1MESAFrameHeader         av1_frame_header;
--    VkVideoDecodeAV1PictureInfoMESA    av1_pic_info;
-+    StdVideoDecodeAV1ReferenceInfo     std_ref;
-+    VkVideoDecodeAV1DpbSlotInfoKHR     vkav1_ref;
-+    uint16_t width_in_sbs_minus1[64];
-+    uint16_t height_in_sbs_minus1[64];
-+    uint16_t mi_col_starts[64];
-+    uint16_t mi_row_starts[64];
-+    StdVideoAV1TileInfo tile_info;
-+    StdVideoAV1Quantization quantization;
-+    StdVideoAV1Segmentation segmentation;
-+    StdVideoAV1LoopFilter loop_filter;
-+    StdVideoAV1CDEF cdef;
-+    StdVideoAV1LoopRestoration loop_restoration;
-+    StdVideoAV1GlobalMotion global_motion;
-+    StdVideoAV1FilmGrain film_grain;
-+    StdVideoDecodeAV1PictureInfo    std_pic_info;
-+    VkVideoDecodeAV1PictureInfoKHR     av1_pic_info;
- 
-     /* Picture refs */
-     const AV1Frame                     *ref_src   [AV1_NUM_REF_FRAMES];
--    VkVideoDecodeAV1DpbSlotInfoMESA     vkav1_refs[AV1_NUM_REF_FRAMES];
-+    StdVideoDecodeAV1ReferenceInfo      std_refs  [AV1_NUM_REF_FRAMES];
-+    VkVideoDecodeAV1DpbSlotInfoKHR      vkav1_refs[AV1_NUM_REF_FRAMES];
- 
-     uint8_t frame_id_set;
-     uint8_t frame_id;
-+    uint8_t ref_frame_sign_bias_mask;
- } AV1VulkanDecodePicture;
- 
- static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src,
-                             VkVideoReferenceSlotInfoKHR *ref_slot,      /* Main structure */
-                             VkVideoPictureResourceInfoKHR *ref,         /* Goes in ^ */
--                            VkVideoDecodeAV1DpbSlotInfoMESA *vkav1_ref, /* Goes in ^ */
-+                            StdVideoDecodeAV1ReferenceInfo *vkav1_std_ref,
-+                            VkVideoDecodeAV1DpbSlotInfoKHR *vkav1_ref, /* Goes in ^ */
-                             const AV1Frame *pic, int is_current, int has_grain,
--                            int dpb_slot_index)
-+                            int *saved_order_hints)
- {
-     FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
-     AV1VulkanDecodePicture *hp = pic->hwaccel_picture_private;
-@@ -73,31 +87,42 @@ static int vk_av1_fill_pict(AVCodecContext *avctx, const AV1Frame **ref_src,
-     if (err < 0)
-         return err;
- 
--    *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoMESA) {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA,
--        .frameIdx = hp->frame_id,
-+    *vkav1_std_ref = (StdVideoDecodeAV1ReferenceInfo) {
-+        .flags = (StdVideoDecodeAV1ReferenceInfoFlags) {
-+            .disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf,
-+            .segmentation_enabled = pic->raw_frame_header->segmentation_enabled,
-+        },
-+        .frame_type = pic->raw_frame_header->frame_type,
-+        .OrderHint = pic->raw_frame_header->order_hint,
-+        .RefFrameSignBias = hp->ref_frame_sign_bias_mask,
-     };
- 
--    for (unsigned i = 0; i < 7; i++) {
--        const int idx = pic->raw_frame_header->ref_frame_idx[i];
--        vkav1_ref->ref_order_hint[i] = pic->raw_frame_header->ref_order_hint[idx];
--    }
-+    if (saved_order_hints)
-+        for (int i = 0; i < AV1_TOTAL_REFS_PER_FRAME; i++)
-+            vkav1_std_ref->SavedOrderHints[i] = saved_order_hints[i];
-+
-+    *vkav1_ref = (VkVideoDecodeAV1DpbSlotInfoKHR) {
-+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_KHR,
-+        .pStdReferenceInfo = vkav1_std_ref,
-+    };
- 
--    vkav1_ref->disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf;
-+    vkav1_std_ref->flags.disable_frame_end_update_cdf = pic->raw_frame_header->disable_frame_end_update_cdf;
-+    vkav1_std_ref->flags.segmentation_enabled = pic->raw_frame_header->segmentation_enabled;
-+    vkav1_std_ref->frame_type = pic->raw_frame_header->frame_type;
- 
-     *ref = (VkVideoPictureResourceInfoKHR) {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_PICTURE_RESOURCE_INFO_KHR,
-         .codedOffset = (VkOffset2D){ 0, 0 },
-         .codedExtent = (VkExtent2D){ pic->f->width, pic->f->height },
-         .baseArrayLayer = ((has_grain || dec->dedicated_dpb) && dec->layered_dpb) ?
--                          dpb_slot_index : 0,
-+                          hp->frame_id : 0,
-         .imageViewBinding = vkpic->img_view_ref,
-     };
- 
-     *ref_slot = (VkVideoReferenceSlotInfoKHR) {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_REFERENCE_SLOT_INFO_KHR,
-         .pNext = vkav1_ref,
--        .slotIndex = dpb_slot_index,
-+        .slotIndex = hp->frame_id,
-         .pPictureResource = ref,
-     };
- 
-@@ -115,15 +140,40 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
- 
-     const AV1RawSequenceHeader *seq = s->raw_seq;
- 
--    StdVideoAV1MESASequenceHeader av1_sequence_header;
--    VkVideoDecodeAV1SessionParametersAddInfoMESA av1_params_info;
--    VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params;
-+    StdVideoAV1SequenceHeader av1_sequence_header;
-+    StdVideoAV1TimingInfo av1_timing_info;
-+    StdVideoAV1ColorConfig av1_color_config;
-+    VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params;
-     VkVideoSessionParametersCreateInfoKHR session_params_create;
- 
-     int err;
- 
--    av1_sequence_header = (StdVideoAV1MESASequenceHeader) {
--        .flags = (StdVideoAV1MESASequenceHeaderFlags) {
-+    av1_timing_info = (StdVideoAV1TimingInfo) {
-+        .flags = (StdVideoAV1TimingInfoFlags) {
-+            .equal_picture_interval = seq->timing_info.equal_picture_interval,
-+        },
-+        .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick,
-+        .time_scale = seq->timing_info.time_scale,
-+        .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1,
-+    };
-+
-+    av1_color_config = (StdVideoAV1ColorConfig) {
-+        .flags = (StdVideoAV1ColorConfigFlags) {
-+            .mono_chrome = seq->color_config.mono_chrome,
-+            .color_range = seq->color_config.color_range,
-+            .separate_uv_delta_q = seq->color_config.separate_uv_delta_q,
-+        },
-+        .BitDepth = seq->color_config.twelve_bit    ? 12 :
-+                    seq->color_config.high_bitdepth ? 10 : 8,
-+        .subsampling_x = seq->color_config.subsampling_x,
-+        .subsampling_y = seq->color_config.subsampling_y,
-+        .color_primaries = seq->color_config.color_primaries,
-+        .transfer_characteristics = seq->color_config.transfer_characteristics,
-+        .matrix_coefficients = seq->color_config.matrix_coefficients,
-+    };
-+
-+    av1_sequence_header = (StdVideoAV1SequenceHeader) {
-+        .flags = (StdVideoAV1SequenceHeaderFlags) {
-             .still_picture = seq->still_picture,
-             .reduced_still_picture_header = seq->reduced_still_picture_header,
-             .use_128x128_superblock = seq->use_128x128_superblock,
-@@ -152,34 +202,15 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
-         .delta_frame_id_length_minus_2 = seq->delta_frame_id_length_minus_2,
-         .additional_frame_id_length_minus_1 = seq->additional_frame_id_length_minus_1,
-         .order_hint_bits_minus_1 = seq->order_hint_bits_minus_1,
--        .timing_info = (StdVideoAV1MESATimingInfo) {
--            .flags = (StdVideoAV1MESATimingInfoFlags) {
--                .equal_picture_interval = seq->timing_info.equal_picture_interval,
--            },
--            .num_units_in_display_tick = seq->timing_info.num_units_in_display_tick,
--            .time_scale = seq->timing_info.time_scale,
--            .num_ticks_per_picture_minus_1 = seq->timing_info.num_ticks_per_picture_minus_1,
--        },
--        .color_config = (StdVideoAV1MESAColorConfig) {
--            .flags = (StdVideoAV1MESAColorConfigFlags) {
--                .mono_chrome = seq->color_config.mono_chrome,
--                .color_range = seq->color_config.color_range,
--                .separate_uv_delta_q = seq->color_config.separate_uv_delta_q,
--            },
--            .bit_depth = seq->color_config.twelve_bit ? 12 :
--                         seq->color_config.high_bitdepth ? 10 : 8,
--            .subsampling_x = seq->color_config.subsampling_x,
--            .subsampling_y = seq->color_config.subsampling_y,
--        },
-+        .seq_force_integer_mv = seq->seq_force_integer_mv,
-+        .seq_force_screen_content_tools = seq->seq_force_screen_content_tools,
-+        .pTimingInfo = &av1_timing_info,
-+        .pColorConfig = &av1_color_config,
-     };
- 
--    av1_params_info = (VkVideoDecodeAV1SessionParametersAddInfoMESA) {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA,
--        .sequence_header = &av1_sequence_header,
--    };
--    av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoMESA) {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA,
--        .pParametersAddInfo = &av1_params_info,
-+    av1_params = (VkVideoDecodeAV1SessionParametersCreateInfoKHR) {
-+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
-+        .pStdSequenceHeader = &av1_sequence_header,
-     };
-     session_params_create = (VkVideoSessionParametersCreateInfoKHR) {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
-@@ -211,8 +242,14 @@ static int vk_av1_start_frame(AVCodecContext          *avctx,
- 
-     const AV1RawFrameHeader *frame_header = s->raw_frame_header;
-     const AV1RawFilmGrainParams *film_grain = &s->cur_frame.film_grain;
-+    CodedBitstreamAV1Context *cbs_ctx = (CodedBitstreamAV1Context *)(s->cbc->priv_data);
-+
-     const int apply_grain = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) &&
-                             film_grain->apply_grain;
-+    StdVideoAV1FrameRestorationType remap_lr_type[4] = { STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_NONE,
-+                                                         STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SWITCHABLE,
-+                                                         STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_WIENER,
-+                                                         STD_VIDEO_AV1_FRAME_RESTORATION_TYPE_SGRPROJ };
- 
-     if (!dec->session_params) {
-         err = vk_av1_create_params(avctx, &dec->session_params);
-@@ -233,15 +270,31 @@ static int vk_av1_start_frame(AVCodecContext          *avctx,
-         dec->frame_id_alloc_mask |= (1 << slot_idx);
-     }
- 
--    /* Fill in references */
--    for (int i = 0; i < AV1_NUM_REF_FRAMES; i++) {
--        const AV1Frame *ref_frame = &s->ref[i];
--        if (s->ref[i].f->pict_type == AV_PICTURE_TYPE_NONE)
-+    ap->ref_frame_sign_bias_mask = 0x0;
-+    for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++)
-+        ap->ref_frame_sign_bias_mask |= cbs_ctx->ref_frame_sign_bias[i] << i;
-+
-+    for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) {
-+        const int idx = pic->raw_frame_header->ref_frame_idx[i];
-+        const AV1Frame *ref_frame = &s->ref[idx];
-+        AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private;
-+        int found = 0;
-+
-+        if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE)
-+            continue;
-+
-+        for (int j = 0; j < ref_count; j++) {
-+            if (vp->ref_slots[j].slotIndex == hp->frame_id) {
-+                found = 1;
-+                break;
-+            }
-+        }
-+        if (found)
-             continue;
- 
--        err = vk_av1_fill_pict(avctx, &ap->ref_src[i], &vp->ref_slots[i],
--                               &vp->refs[i], &ap->vkav1_refs[i],
--                               ref_frame, 0, 0, i);
-+        err = vk_av1_fill_pict(avctx, &ap->ref_src[ref_count], &vp->ref_slots[ref_count],
-+                               &vp->refs[ref_count], &ap->std_refs[ref_count], &ap->vkav1_refs[ref_count],
-+                               ref_frame, 0, 0, cbs_ctx->ref[idx].saved_order_hints);
-         if (err < 0)
-             return err;
- 
-@@ -249,20 +302,32 @@ static int vk_av1_start_frame(AVCodecContext          *avctx,
-     }
- 
-     err = vk_av1_fill_pict(avctx, NULL, &vp->ref_slot, &vp->ref,
-+                           &ap->std_ref,
-                            &ap->vkav1_ref,
--                           pic, 1, apply_grain, 8);
-+                           pic, 1, apply_grain, NULL);
-     if (err < 0)
-         return err;
- 
--    ap->tile_list.nb_tiles = 0;
--    ap->tile_list.tile_list = ap->tiles;
--
--    ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoMESA) {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA,
--        .frame_header = &ap->av1_frame_header,
--        .tile_list = &ap->tile_list,
-+    ap->av1_pic_info = (VkVideoDecodeAV1PictureInfoKHR) {
-+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_KHR,
-+        .pStdPictureInfo = &ap->std_pic_info,
-+        .frameHeaderOffset = 0,
-+        .tileCount = 0,
-+        .pTileOffsets = NULL,
-+        .pTileSizes = ap->tile_sizes,
-     };
- 
-+    for (int i = 0; i < STD_VIDEO_AV1_REFS_PER_FRAME; i++) {
-+        const int idx = pic->raw_frame_header->ref_frame_idx[i];
-+        const AV1Frame *ref_frame = &s->ref[idx];
-+        AV1VulkanDecodePicture *hp = ref_frame->hwaccel_picture_private;
-+
-+        if (ref_frame->f->pict_type == AV_PICTURE_TYPE_NONE)
-+            ap->av1_pic_info.referenceNameSlotIndices[i] = -1;
-+        else
-+            ap->av1_pic_info.referenceNameSlotIndices[i] = hp->frame_id;
-+    }
-+
-     vp->decode_info = (VkVideoDecodeInfoKHR) {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_INFO_KHR,
-         .pNext = &ap->av1_pic_info,
-@@ -279,9 +344,87 @@ static int vk_av1_start_frame(AVCodecContext          *avctx,
-         },
-     };
- 
-+    ap->tile_info = (StdVideoAV1TileInfo) {
-+        .flags = (StdVideoAV1TileInfoFlags) {
-+            .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag,
-+        },
-+        .TileCols = frame_header->tile_cols,
-+        .TileRows = frame_header->tile_rows,
-+        .context_update_tile_id = frame_header->context_update_tile_id,
-+        .tile_size_bytes_minus_1 = frame_header->tile_size_bytes_minus1,
-+        .pWidthInSbsMinus1 = ap->width_in_sbs_minus1,
-+        .pHeightInSbsMinus1 = ap->height_in_sbs_minus1,
-+        .pMiColStarts = ap->mi_col_starts,
-+        .pMiRowStarts = ap->mi_row_starts,
-+    };
-+
-+    ap->quantization = (StdVideoAV1Quantization) {
-+        .flags.using_qmatrix = frame_header->using_qmatrix,
-+        .flags.diff_uv_delta = frame_header->diff_uv_delta,
-+        .base_q_idx = frame_header->base_q_idx,
-+        .DeltaQYDc = frame_header->delta_q_y_dc,
-+        .DeltaQUDc = frame_header->delta_q_u_dc,
-+        .DeltaQUAc = frame_header->delta_q_u_ac,
-+        .DeltaQVDc = frame_header->delta_q_v_dc,
-+        .DeltaQVAc = frame_header->delta_q_v_ac,
-+        .qm_y = frame_header->qm_y,
-+        .qm_u = frame_header->qm_u,
-+        .qm_v = frame_header->qm_v,
-+    };
-+
-+    ap->loop_filter = (StdVideoAV1LoopFilter) {
-+        .flags = (StdVideoAV1LoopFilterFlags) {
-+            .loop_filter_delta_enabled = frame_header->loop_filter_delta_enabled,
-+            .loop_filter_delta_update = frame_header->loop_filter_delta_update,
-+        },
-+        .loop_filter_sharpness = frame_header->loop_filter_sharpness,
-+    };
-+
-+    for (int i = 0; i < STD_VIDEO_AV1_MAX_LOOP_FILTER_STRENGTHS; i++)
-+        ap->loop_filter.loop_filter_level[i] = frame_header->loop_filter_level[i];
-+    for (int i = 0; i < STD_VIDEO_AV1_LOOP_FILTER_ADJUSTMENTS; i++)
-+        ap->loop_filter.loop_filter_mode_deltas[i] = frame_header->loop_filter_mode_deltas[i];
-+
-+    ap->cdef = (StdVideoAV1CDEF) {
-+        .cdef_damping_minus_3 = frame_header->cdef_damping_minus_3,
-+        .cdef_bits = frame_header->cdef_bits,
-+    };
-+
-+    ap->loop_restoration = (StdVideoAV1LoopRestoration) {
-+        .FrameRestorationType[0] = remap_lr_type[frame_header->lr_type[0]],
-+        .FrameRestorationType[1] = remap_lr_type[frame_header->lr_type[1]],
-+        .FrameRestorationType[2] = remap_lr_type[frame_header->lr_type[2]],
-+        .LoopRestorationSize[0] = 1 + frame_header->lr_unit_shift,
-+        .LoopRestorationSize[1] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift,
-+        .LoopRestorationSize[2] = 1 + frame_header->lr_unit_shift - frame_header->lr_uv_shift,
-+    };
-+
-+    ap->film_grain = (StdVideoAV1FilmGrain) {
-+        .flags = (StdVideoAV1FilmGrainFlags) {
-+            .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma,
-+            .overlap_flag = film_grain->overlap_flag,
-+            .clip_to_restricted_range = film_grain->clip_to_restricted_range,
-+        },
-+        .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8,
-+        .ar_coeff_lag = film_grain->ar_coeff_lag,
-+        .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6,
-+        .grain_scale_shift = film_grain->grain_scale_shift,
-+        .grain_seed = film_grain->grain_seed,
-+        .film_grain_params_ref_idx = film_grain->film_grain_params_ref_idx,
-+        .num_y_points = film_grain->num_y_points,
-+        .num_cb_points = film_grain->num_cb_points,
-+        .num_cr_points = film_grain->num_cr_points,
-+        .cb_mult = film_grain->cb_mult,
-+        .cb_luma_mult = film_grain->cb_luma_mult,
-+        .cb_offset = film_grain->cb_offset,
-+        .cr_mult = film_grain->cr_mult,
-+        .cr_luma_mult = film_grain->cr_luma_mult,
-+        .cr_offset = film_grain->cr_offset,
-+    };
-+
-     /* Setup frame header */
--    ap->av1_frame_header = (StdVideoAV1MESAFrameHeader) {
--        .flags = (StdVideoAV1MESAFrameHeaderFlags) {
-+    ap->std_pic_info = (StdVideoDecodeAV1PictureInfo) {
-+        .flags = (StdVideoDecodeAV1PictureInfoFlags) {
-             .error_resilient_mode = frame_header->error_resilient_mode,
-             .disable_cdf_update = frame_header->disable_cdf_update,
-             .use_superres = frame_header->use_superres,
-@@ -302,174 +445,92 @@ static int vk_av1_start_frame(AVCodecContext          *avctx,
-             .reference_select = frame_header->reference_select,
-             .skip_mode_present = frame_header->skip_mode_present,
-             .delta_q_present = frame_header->delta_q_present,
-+            .delta_lf_present = frame_header->delta_lf_present,
-+            .delta_lf_multi = frame_header->delta_lf_multi,
-+            .segmentation_enabled = frame_header->segmentation_enabled,
-+            .segmentation_update_map = frame_header->segmentation_update_map,
-+            .segmentation_temporal_update = frame_header->segmentation_temporal_update,
-+            .segmentation_update_data = frame_header->segmentation_update_data,
-+            .UsesLr = frame_header->lr_type[0] || frame_header->lr_type[1] || frame_header->lr_type[2],
-+            .apply_grain = apply_grain,
-         },
--        .frame_to_show_map_idx = frame_header->frame_to_show_map_idx,
--        .frame_presentation_time = frame_header->frame_presentation_time,
--        .display_frame_id = frame_header->display_frame_id,
-         .frame_type = frame_header->frame_type,
-         .current_frame_id = frame_header->current_frame_id,
--        .order_hint = frame_header->order_hint,
-+        .OrderHint = frame_header->order_hint,
-         .primary_ref_frame = frame_header->primary_ref_frame,
--        .frame_width_minus_1 = frame_header->frame_width_minus_1,
--        .frame_height_minus_1 = frame_header->frame_height_minus_1,
--        .coded_denom = frame_header->coded_denom,
--        .render_width_minus_1 = frame_header->render_width_minus_1,
--        .render_height_minus_1 = frame_header->render_height_minus_1,
-         .refresh_frame_flags = frame_header->refresh_frame_flags,
-         .interpolation_filter = frame_header->interpolation_filter,
--        .tx_mode = frame_header->tx_mode,
--        .tiling = (StdVideoAV1MESATileInfo) {
--            .flags = (StdVideoAV1MESATileInfoFlags) {
--                .uniform_tile_spacing_flag = frame_header->uniform_tile_spacing_flag,
--            },
--            .tile_cols = frame_header->tile_cols,
--            .tile_rows = frame_header->tile_rows,
--            .context_update_tile_id = frame_header->context_update_tile_id,
--            .tile_size_bytes_minus1 = frame_header->tile_size_bytes_minus1,
--        },
--        .quantization = (StdVideoAV1MESAQuantization) {
--            .flags.using_qmatrix = frame_header->using_qmatrix,
--            .base_q_idx = frame_header->base_q_idx,
--            .delta_q_y_dc = frame_header->delta_q_y_dc,
--            .diff_uv_delta = frame_header->diff_uv_delta,
--            .delta_q_u_dc = frame_header->delta_q_u_dc,
--            .delta_q_u_ac = frame_header->delta_q_u_ac,
--            .delta_q_v_dc = frame_header->delta_q_v_dc,
--            .delta_q_v_ac = frame_header->delta_q_v_ac,
--            .qm_y = frame_header->qm_y,
--            .qm_u = frame_header->qm_u,
--            .qm_v = frame_header->qm_v,
--        },
--        .delta_q = (StdVideoAV1MESADeltaQ) {
--            .flags = (StdVideoAV1MESADeltaQFlags) {
--                .delta_lf_present = frame_header->delta_lf_present,
--                .delta_lf_multi = frame_header->delta_lf_multi,
--            },
--            .delta_q_res = frame_header->delta_q_res,
--            .delta_lf_res = frame_header->delta_lf_res,
--        },
--        .loop_filter = (StdVideoAV1MESALoopFilter) {
--            .flags = (StdVideoAV1MESALoopFilterFlags) {
--                .delta_enabled = frame_header->loop_filter_delta_enabled,
--                .delta_update = frame_header->loop_filter_delta_update,
--            },
--            .level = {
--                frame_header->loop_filter_level[0], frame_header->loop_filter_level[1],
--                frame_header->loop_filter_level[2], frame_header->loop_filter_level[3],
--            },
--            .sharpness = frame_header->loop_filter_sharpness,
--            .mode_deltas = {
--                frame_header->loop_filter_mode_deltas[0], frame_header->loop_filter_mode_deltas[1],
--            },
--        },
--        .cdef = (StdVideoAV1MESACDEF) {
--            .damping_minus_3 = frame_header->cdef_damping_minus_3,
--            .bits = frame_header->cdef_bits,
--        },
--        .lr = (StdVideoAV1MESALoopRestoration) {
--            .lr_unit_shift = frame_header->lr_unit_shift,
--            .lr_uv_shift = frame_header->lr_uv_shift,
--            .lr_type = { frame_header->lr_type[0], frame_header->lr_type[1], frame_header->lr_type[2] },
--        },
--        .segmentation = (StdVideoAV1MESASegmentation) {
--            .flags = (StdVideoAV1MESASegmentationFlags) {
--                .enabled = frame_header->segmentation_enabled,
--                .update_map = frame_header->segmentation_update_map,
--                .temporal_update = frame_header->segmentation_temporal_update,
--                .update_data = frame_header->segmentation_update_data,
--            },
--        },
--        .film_grain = (StdVideoAV1MESAFilmGrainParameters) {
--            .flags = (StdVideoAV1MESAFilmGrainFlags) {
--                .apply_grain = apply_grain,
--                .chroma_scaling_from_luma = film_grain->chroma_scaling_from_luma,
--                .overlap_flag = film_grain->overlap_flag,
--                .clip_to_restricted_range = film_grain->clip_to_restricted_range,
--            },
--            .grain_scaling_minus_8 = film_grain->grain_scaling_minus_8,
--            .ar_coeff_lag = film_grain->ar_coeff_lag,
--            .ar_coeff_shift_minus_6 = film_grain->ar_coeff_shift_minus_6,
--            .grain_scale_shift = film_grain->grain_scale_shift,
--            .grain_seed = film_grain->grain_seed,
--            .num_y_points = film_grain->num_y_points,
--            .num_cb_points = film_grain->num_cb_points,
--            .num_cr_points = film_grain->num_cr_points,
--            .cb_mult = film_grain->cb_mult,
--            .cb_luma_mult = film_grain->cb_luma_mult,
--            .cb_offset = film_grain->cb_offset,
--            .cr_mult = film_grain->cr_mult,
--            .cr_luma_mult = film_grain->cr_luma_mult,
--            .cr_offset = film_grain->cr_offset,
--        },
-+        .TxMode = frame_header->tx_mode,
-+        .delta_q_res = frame_header->delta_q_res,
-+        .delta_lf_res = frame_header->delta_lf_res,
-+        .SkipModeFrame[0] = s->cur_frame.skip_mode_frame_idx[0],
-+        .SkipModeFrame[1] = s->cur_frame.skip_mode_frame_idx[1],
-+        .coded_denom = frame_header->coded_denom,
-+        .pTileInfo = &ap->tile_info,
-+        .pQuantization = &ap->quantization,
-+        .pSegmentation = &ap->segmentation,
-+        .pLoopFilter = &ap->loop_filter,
-+        .pCDEF = &ap->cdef,
-+        .pLoopRestoration = &ap->loop_restoration,
-+        .pGlobalMotion = &ap->global_motion,
-+        .pFilmGrain = apply_grain ? &ap->film_grain : NULL,
-     };
- 
-     for (int i = 0; i < 64; i++) {
--        ap->av1_frame_header.tiling.width_in_sbs_minus_1[i] = frame_header->width_in_sbs_minus_1[i];
--        ap->av1_frame_header.tiling.height_in_sbs_minus_1[i] = frame_header->height_in_sbs_minus_1[i];
--        ap->av1_frame_header.tiling.tile_start_col_sb[i] = frame_header->tile_start_col_sb[i];
--        ap->av1_frame_header.tiling.tile_start_row_sb[i] = frame_header->tile_start_row_sb[i];
-+        ap->width_in_sbs_minus1[i] = frame_header->width_in_sbs_minus_1[i];
-+        ap->height_in_sbs_minus1[i] = frame_header->height_in_sbs_minus_1[i];
-+        ap->mi_col_starts[i] = frame_header->tile_start_col_sb[i];
-+        ap->mi_row_starts[i] = frame_header->tile_start_row_sb[i];
-     }
- 
--    for (int i = 0; i < 8; i++) {
--        ap->av1_frame_header.segmentation.feature_enabled_bits[i] = 0;
--        for (int j = 0; j < 8; j++) {
--            ap->av1_frame_header.segmentation.feature_enabled_bits[i] |= (frame_header->feature_enabled[i][j] << j);
--            ap->av1_frame_header.segmentation.feature_data[i][j] = frame_header->feature_value[i][j];
-+    for (int i = 0; i < STD_VIDEO_AV1_MAX_SEGMENTS; i++) {
-+        ap->segmentation.FeatureEnabled[i] = 0x0;
-+        for (int j = 0; j < STD_VIDEO_AV1_SEG_LVL_MAX; j++) {
-+            ap->segmentation.FeatureEnabled[i] |= (frame_header->feature_enabled[i][j] << j);
-+            ap->segmentation.FeatureData[i][j] = frame_header->feature_value[i][j];
-         }
--
--        ap->av1_frame_header.loop_filter.ref_deltas[i] = frame_header->loop_filter_ref_deltas[i];
--
--        ap->av1_frame_header.cdef.y_pri_strength[i] = frame_header->cdef_y_pri_strength[i];
--        ap->av1_frame_header.cdef.y_sec_strength[i] = frame_header->cdef_y_sec_strength[i];
--        ap->av1_frame_header.cdef.uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i];
--        ap->av1_frame_header.cdef.uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i];
--
--        ap->av1_frame_header.ref_order_hint[i] = frame_header->ref_order_hint[i];
--        ap->av1_frame_header.global_motion[i] = (StdVideoAV1MESAGlobalMotion) {
--            .flags = (StdVideoAV1MESAGlobalMotionFlags) {
--                .gm_invalid = s->cur_frame.gm_invalid[i],
--            },
--            .gm_type = s->cur_frame.gm_type[i],
--            .gm_params = {
--                s->cur_frame.gm_params[i][0], s->cur_frame.gm_params[i][1],
--                s->cur_frame.gm_params[i][2], s->cur_frame.gm_params[i][3],
--                s->cur_frame.gm_params[i][4], s->cur_frame.gm_params[i][5],
--            },
--        };
-     }
- 
--    for (int i = 0; i < 7; i++) {
--        ap->av1_frame_header.ref_frame_idx[i] = frame_header->ref_frame_idx[i];
--        ap->av1_frame_header.delta_frame_id_minus1[i] = frame_header->delta_frame_id_minus1[i];
-+    for (int i = 0; i < STD_VIDEO_AV1_TOTAL_REFS_PER_FRAME; i++)
-+        ap->loop_filter.loop_filter_ref_deltas[i] = frame_header->loop_filter_ref_deltas[i];
-+
-+    for (int i = 0; i < STD_VIDEO_AV1_MAX_CDEF_FILTER_STRENGTHS; i++) {
-+        ap->cdef.cdef_y_pri_strength[i] = frame_header->cdef_y_pri_strength[i];
-+        ap->cdef.cdef_y_sec_strength[i] = frame_header->cdef_y_sec_strength[i];
-+        ap->cdef.cdef_uv_pri_strength[i] = frame_header->cdef_uv_pri_strength[i];
-+        ap->cdef.cdef_uv_sec_strength[i] = frame_header->cdef_uv_sec_strength[i];
-     }
- 
--    ap->av1_pic_info.skip_mode_frame_idx[0] = s->cur_frame.skip_mode_frame_idx[0];
--    ap->av1_pic_info.skip_mode_frame_idx[1] = s->cur_frame.skip_mode_frame_idx[1];
-+    for (int i = 0; i < STD_VIDEO_AV1_NUM_REF_FRAMES; i++) {
-+        ap->std_pic_info.OrderHints[i] = frame_header->ref_order_hint[i];
-+        ap->global_motion.GmType[i] = s->cur_frame.gm_type[i];
-+        for (int j = 0; j < STD_VIDEO_AV1_GLOBAL_MOTION_PARAMS; j++) {
-+            ap->global_motion.gm_params[i][j] = s->cur_frame.gm_params[i][j];
-+        }
-+    }
- 
-     if (apply_grain) {
--        for (int i = 0; i < 14; i++) {
--            ap->av1_frame_header.film_grain.point_y_value[i] = film_grain->point_y_value[i];
--            ap->av1_frame_header.film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i];
-+        for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_Y_POINTS; i++) {
-+            ap->film_grain.point_y_value[i] = film_grain->point_y_value[i];
-+            ap->film_grain.point_y_scaling[i] = film_grain->point_y_scaling[i];
-         }
- 
--        for (int i = 0; i < 10; i++) {
--            ap->av1_frame_header.film_grain.point_cb_value[i] = film_grain->point_cb_value[i];
--            ap->av1_frame_header.film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i];
--            ap->av1_frame_header.film_grain.point_cr_value[i] = film_grain->point_cr_value[i];
--            ap->av1_frame_header.film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i];
-+        for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_CB_POINTS; i++) {
-+            ap->film_grain.point_cb_value[i] = film_grain->point_cb_value[i];
-+            ap->film_grain.point_cb_scaling[i] = film_grain->point_cb_scaling[i];
-+            ap->film_grain.point_cr_value[i] = film_grain->point_cr_value[i];
-+            ap->film_grain.point_cr_scaling[i] = film_grain->point_cr_scaling[i];
-         }
- 
--        for (int i = 0; i < 24; i++) {
--            ap->av1_frame_header.film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i];
--            ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i];
--            ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i];
--        }
-+        for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_LUMA; i++)
-+            ap->film_grain.ar_coeffs_y_plus_128[i] = film_grain->ar_coeffs_y_plus_128[i];
- 
--        ap->av1_frame_header.film_grain.ar_coeffs_cb_plus_128[24] = film_grain->ar_coeffs_cb_plus_128[24];
--        ap->av1_frame_header.film_grain.ar_coeffs_cr_plus_128[24] = film_grain->ar_coeffs_cr_plus_128[24];
-+        for (int i = 0; i < STD_VIDEO_AV1_MAX_NUM_POS_CHROMA; i++) {
-+            ap->film_grain.ar_coeffs_cb_plus_128[i] = film_grain->ar_coeffs_cb_plus_128[i];
-+            ap->film_grain.ar_coeffs_cr_plus_128[i] = film_grain->ar_coeffs_cr_plus_128[i];
-+        }
-     }
- 
--    /* Workaround for a spec issue. */
-     ap->dec = dec;
- 
-     return 0;
-@@ -484,25 +545,20 @@ static int vk_av1_decode_slice(AVCodecContext *avctx,
-     AV1VulkanDecodePicture *ap = s->cur_frame.hwaccel_picture_private;
-     FFVulkanDecodePicture *vp = &ap->vp;
- 
-+    /* Too many tiles, exceeding all defined levels in the AV1 spec */
-+    if (ap->av1_pic_info.tileCount > MAX_TILES)
-+        return AVERROR(ENOSYS);
-+
-     for (int i = s->tg_start; i <= s->tg_end; i++) {
--        ap->tiles[ap->tile_list.nb_tiles] = (StdVideoAV1MESATile) {
--            .size     = s->tile_group_info[i].tile_size,
--            .offset   = s->tile_group_info[i].tile_offset,
--            .row      = s->tile_group_info[i].tile_row,
--            .column   = s->tile_group_info[i].tile_column,
--            .tg_start = s->tg_start,
--            .tg_end   = s->tg_end,
--        };
-+        ap->tile_sizes[ap->av1_pic_info.tileCount] = s->tile_group_info[i].tile_size;
- 
-         err = ff_vk_decode_add_slice(avctx, vp,
-                                      data + s->tile_group_info[i].tile_offset,
-                                      s->tile_group_info[i].tile_size, 0,
--                                     &ap->tile_list.nb_tiles,
--                                     &ap->tile_offsets);
-+                                     &ap->av1_pic_info.tileCount,
-+                                     &ap->av1_pic_info.pTileOffsets);
-         if (err < 0)
-             return err;
--
--        ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1];
-     }
- 
-     return 0;
-@@ -518,7 +574,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx)
-     FFVulkanDecodePicture *rvp[AV1_NUM_REF_FRAMES] = { 0 };
-     AVFrame *rav[AV1_NUM_REF_FRAMES] = { 0 };
- 
--    if (!ap->tile_list.nb_tiles)
-+    if (!ap->av1_pic_info.tileCount)
-         return 0;
- 
-     if (!dec->session_params) {
-@@ -536,7 +592,7 @@ static int vk_av1_end_frame(AVCodecContext *avctx)
-     }
- 
-     av_log(avctx, AV_LOG_VERBOSE, "Decoding frame, %"SIZE_SPECIFIER" bytes, %i tiles\n",
--           vp->slices_size, ap->tile_list.nb_tiles);
-+           vp->slices_size, ap->av1_pic_info.tileCount);
- 
-     return ff_vk_decode_frame(avctx, pic->f, vp, rav, rvp);
- }
-@@ -580,8 +636,6 @@ const FFHWAccel ff_av1_vulkan_hwaccel = {
-      * flexibility, this index cannot be present anywhere.
-      * The current implementation tracks the index for the driver and submits it
-      * as necessary information. Due to needing to modify the decoding context,
--     * which is not thread-safe, on frame free, threading is disabled.
--     * In the future, once this is fixed in the spec, the workarounds may be removed
--     * and threading enabled. */
-+     * which is not thread-safe, on frame free, threading is disabled. */
-     .caps_internal         = HWACCEL_CAP_ASYNC_SAFE,
- };
-diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
-index 91929d165f..4561f26b62 100644
---- a/libavcodec/vulkan_decode.c
-+++ b/libavcodec/vulkan_decode.c
-@@ -61,7 +61,7 @@ static const VkVideoProfileInfoKHR *get_video_profile(FFVulkanDecodeShared *ctx,
-     VkStructureType profile_struct_type =
-         codec_id == AV_CODEC_ID_H264 ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H264_PROFILE_INFO_KHR :
-         codec_id == AV_CODEC_ID_HEVC ? VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_PROFILE_INFO_KHR :
--        codec_id == AV_CODEC_ID_AV1  ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA :
-+        codec_id == AV_CODEC_ID_AV1  ? VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR :
-         0;
- 
-     profile_list = ff_vk_find_struct(ctx->s.hwfc->create_pnext,
-@@ -674,7 +674,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx,
-                                      const struct FFVkCodecMap *vk_codec,
-                                      VkVideoDecodeH264CapabilitiesKHR *h264_caps,
-                                      VkVideoDecodeH265CapabilitiesKHR *h265_caps,
--                                     VkVideoDecodeAV1CapabilitiesMESA *av1_caps,
-+                                     VkVideoDecodeAV1CapabilitiesKHR *av1_caps,
-                                      VkVideoCapabilitiesKHR *caps,
-                                      VkVideoDecodeCapabilitiesKHR *dec_caps,
-                                      int cur_profile)
-@@ -685,7 +685,7 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx,
- 
-     VkVideoDecodeH264ProfileInfoKHR *h264_profile = &prof->h264_profile;
-     VkVideoDecodeH265ProfileInfoKHR *h265_profile = &prof->h265_profile;
--    VkVideoDecodeAV1ProfileInfoMESA *av1_profile  = &prof->av1_profile;
-+    VkVideoDecodeAV1ProfileInfoKHR *av1_profile  = &prof->av1_profile;
- 
-     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
-     if (!desc)
-@@ -713,8 +713,9 @@ static VkResult vulkan_setup_profile(AVCodecContext *avctx,
-     } else if (avctx->codec_id == AV_CODEC_ID_AV1) {
-         dec_caps->pNext = av1_caps;
-         usage->pNext = av1_profile;
--        av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA;
--        av1_profile->stdProfileIdc = cur_profile;
-+        av1_profile->sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_KHR;
-+        av1_profile->stdProfile = cur_profile;
-+        av1_profile->filmGrainSupport = !(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN);
-     }
- 
-     usage->sType           = VK_STRUCTURE_TYPE_VIDEO_DECODE_USAGE_INFO_KHR;
-@@ -769,8 +770,8 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_
-     VkVideoDecodeH265CapabilitiesKHR h265_caps = {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_CAPABILITIES_KHR,
-     };
--    VkVideoDecodeAV1CapabilitiesMESA av1_caps = {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA,
-+    VkVideoDecodeAV1CapabilitiesKHR av1_caps = {
-+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_KHR,
-     };
- 
-     VkPhysicalDeviceVideoFormatInfoKHR fmt_info = {
-@@ -789,7 +790,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_
-     cur_profile = avctx->profile;
-     base_profile = avctx->codec_id == AV_CODEC_ID_H264 ? AV_PROFILE_H264_CONSTRAINED_BASELINE :
-                    avctx->codec_id == AV_CODEC_ID_H265 ? AV_PROFILE_HEVC_MAIN :
--                   avctx->codec_id == AV_CODEC_ID_AV1  ? STD_VIDEO_AV1_MESA_PROFILE_MAIN :
-+                   avctx->codec_id == AV_CODEC_ID_AV1  ? STD_VIDEO_AV1_PROFILE_MAIN :
-                    0;
- 
-     ret = vulkan_setup_profile(avctx, prof, hwctx, vk, vk_codec,
-@@ -837,7 +838,7 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_
- 
-     max_level = avctx->codec_id == AV_CODEC_ID_H264 ? ff_vk_h264_level_to_av(h264_caps.maxLevelIdc) :
-                 avctx->codec_id == AV_CODEC_ID_H265 ? ff_vk_h265_level_to_av(h265_caps.maxLevelIdc) :
--                avctx->codec_id == AV_CODEC_ID_AV1  ? av1_caps.maxLevelIdc  :
-+                avctx->codec_id == AV_CODEC_ID_AV1  ? av1_caps.maxLevel :
-                 0;
- 
-     av_log(avctx, AV_LOG_VERBOSE, "Decoder capabilities for %s profile \"%s\":\n",
-@@ -908,17 +909,11 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_
-                "VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR set "
-                "but VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR is unset!\n");
-         return AVERROR_EXTERNAL;
--    } else if (!(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR) &&
--               avctx->codec_id == AV_CODEC_ID_AV1) {
--        av_log(avctx, AV_LOG_ERROR, "Cannot initialize Vulkan decoding session, buggy driver: "
--               "codec is AV1, but VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_DISTINCT_BIT_KHR isn't set!\n");
--        return AVERROR_EXTERNAL;
-     }
- 
-     /* TODO: make dedicated_dpb tunable */
-     dec->dedicated_dpb = !(dec_caps->flags & VK_VIDEO_DECODE_CAPABILITY_DPB_AND_OUTPUT_COINCIDE_BIT_KHR);
-     dec->layered_dpb = !(caps->flags & VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR);
--    dec->external_fg = av1_caps.flags & VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA;
- 
-     if (dec->dedicated_dpb) {
-         fmt_info.imageUsage = VK_IMAGE_USAGE_VIDEO_DECODE_DPB_BIT_KHR;
-@@ -1126,8 +1121,10 @@ int ff_vk_decode_init(AVCodecContext *avctx)
-     VkVideoDecodeH265SessionParametersCreateInfoKHR h265_params = {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_H265_SESSION_PARAMETERS_CREATE_INFO_KHR,
-     };
--    VkVideoDecodeAV1SessionParametersCreateInfoMESA av1_params = {
--        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA,
-+    StdVideoAV1SequenceHeader av1_empty_seq = { 0 };
-+    VkVideoDecodeAV1SessionParametersCreateInfoKHR av1_params = {
-+        .sType = VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_KHR,
-+        .pStdSequenceHeader = &av1_empty_seq,
-     };
-     VkVideoSessionParametersCreateInfoKHR session_params_create = {
-         .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
-diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h
-index a43e328d73..7ba8b239cb 100644
---- a/libavcodec/vulkan_decode.h
-+++ b/libavcodec/vulkan_decode.h
-@@ -37,7 +37,7 @@ typedef struct FFVulkanDecodeDescriptor {
- typedef struct FFVulkanDecodeProfileData {
-     VkVideoDecodeH264ProfileInfoKHR h264_profile;
-     VkVideoDecodeH265ProfileInfoKHR h265_profile;
--    VkVideoDecodeAV1ProfileInfoMESA av1_profile;
-+    VkVideoDecodeAV1ProfileInfoKHR av1_profile;
-     VkVideoDecodeUsageInfoKHR usage;
-     VkVideoProfileInfoKHR profile;
-     VkVideoProfileListInfoKHR profile_list;
-diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
-index bb69e920bb..01a1de7d9d 100644
---- a/libavcodec/vulkan_video.h
-+++ b/libavcodec/vulkan_video.h
-@@ -22,8 +22,6 @@
- #include "vulkan.h"
- 
- #include <vk_video/vulkan_video_codecs_common.h>
--#include "vulkan_video_codec_av1std.h"
--#include "vulkan_video_codec_av1std_decode.h"
- 
- #define CODEC_VER_MAJ(ver) (ver >> 22)
- #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
-diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h
-deleted file mode 100644
-index e2f37b4e6e..0000000000
---- a/libavcodec/vulkan_video_codec_av1std_decode.h
-+++ /dev/null
-@@ -1,36 +0,0 @@
--/* Copyright 2023 Lynne
-- * Copyright 2023 Dave Airlie
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
--
--/*
--** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
--**
--*/
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--#define vulkan_video_codec_av1std_decode 1
--
--
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif
-diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h
-deleted file mode 100644
-index c91589eee2..0000000000
---- a/libavcodec/vulkan_video_codec_av1std.h
-+++ /dev/null
-@@ -1,403 +0,0 @@
--/* Copyright 2023 Lynne
-- * Copyright 2023 Dave Airlie
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
--
--/*
--** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
--**
--*/
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--#define vulkan_video_codec_av1std 1
--
--#define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \
--   ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch)))
--#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0 VK_MAKE_VIDEO_STD_VERSION(0, 1, 0)
--#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_API_VERSION_0_1_0
--#define VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_EXTENSION_NAME "VK_STD_vulkan_video_codec_av1_decode"
--
--typedef enum StdVideoAV1MESAProfile {
--   STD_VIDEO_AV1_MESA_PROFILE_MAIN = 0,
--   STD_VIDEO_AV1_MESA_PROFILE_HIGH = 1,
--   STD_VIDEO_AV1_MESA_PROFILE_PROFESSIONAL = 2,
--} StdVideoAV1MESAProfile;
--
--typedef enum StdVideoAV1MESALevel {
--    STD_VIDEO_AV1_MESA_LEVEL_2_0 = 0,
--    STD_VIDEO_AV1_MESA_LEVEL_2_1 = 1,
--    STD_VIDEO_AV1_MESA_LEVEL_2_2 = 2,
--    STD_VIDEO_AV1_MESA_LEVEL_2_3 = 3,
--    STD_VIDEO_AV1_MESA_LEVEL_3_0 = 4,
--    STD_VIDEO_AV1_MESA_LEVEL_3_1 = 5,
--    STD_VIDEO_AV1_MESA_LEVEL_3_2 = 6,
--    STD_VIDEO_AV1_MESA_LEVEL_3_3 = 7,
--    STD_VIDEO_AV1_MESA_LEVEL_4_0 = 8,
--    STD_VIDEO_AV1_MESA_LEVEL_4_1 = 9,
--    STD_VIDEO_AV1_MESA_LEVEL_4_2 = 10,
--    STD_VIDEO_AV1_MESA_LEVEL_4_3 = 11,
--    STD_VIDEO_AV1_MESA_LEVEL_5_0 = 12,
--    STD_VIDEO_AV1_MESA_LEVEL_5_1 = 13,
--    STD_VIDEO_AV1_MESA_LEVEL_5_2 = 14,
--    STD_VIDEO_AV1_MESA_LEVEL_5_3 = 15,
--    STD_VIDEO_AV1_MESA_LEVEL_6_0 = 16,
--    STD_VIDEO_AV1_MESA_LEVEL_6_1 = 17,
--    STD_VIDEO_AV1_MESA_LEVEL_6_2 = 18,
--    STD_VIDEO_AV1_MESA_LEVEL_6_3 = 19,
--    STD_VIDEO_AV1_MESA_LEVEL_7_0 = 20,
--    STD_VIDEO_AV1_MESA_LEVEL_7_1 = 21,
--    STD_VIDEO_AV1_MESA_LEVEL_7_2 = 22,
--    STD_VIDEO_AV1_MESA_LEVEL_7_3 = 23,
--    STD_VIDEO_AV1_MESA_LEVEL_MAX = 31,
--} StdVideoAV1MESALevel;
--
--typedef struct StdVideoAV1MESAFilmGrainFlags {
--   uint8_t apply_grain;
--   uint8_t chroma_scaling_from_luma;
--   uint8_t overlap_flag;
--   uint8_t clip_to_restricted_range;
--} StdVideoAV1MESAFilmGrainFlags;
--
--typedef struct StdVideoAV1MESAFilmGrainParameters {
--   StdVideoAV1MESAFilmGrainFlags flags;
--   uint32_t grain_scaling_minus_8;
--   uint32_t ar_coeff_lag;
--   uint32_t ar_coeff_shift_minus_6;
--   uint32_t grain_scale_shift;
--
--   uint16_t grain_seed;
--   uint8_t num_y_points;
--   uint8_t point_y_value[14];
--   uint8_t point_y_scaling[14];
--
--   uint8_t num_cb_points;
--   uint8_t point_cb_value[10];
--   uint8_t point_cb_scaling[10];
--
--   uint8_t num_cr_points;
--   uint8_t point_cr_value[10];
--   uint8_t point_cr_scaling[10];
--
--   int8_t ar_coeffs_y_plus_128[24];
--   int8_t ar_coeffs_cb_plus_128[25];
--   int8_t ar_coeffs_cr_plus_128[25];
--   uint8_t cb_mult;
--   uint8_t cb_luma_mult;
--   uint16_t cb_offset;
--   uint8_t cr_mult;
--   uint8_t cr_luma_mult;
--   uint16_t cr_offset;
--} StdVideoAV1MESAFilmGrainParameters;
--
--typedef struct StdVideoAV1MESAGlobalMotionFlags {
--    uint8_t gm_invalid;
--} StdVideoAV1MESAGlobalMotionFlags;
--
--typedef struct StdVideoAV1MESAGlobalMotion {
--    StdVideoAV1MESAGlobalMotionFlags flags;
--    uint8_t gm_type;
--    uint32_t gm_params[6];
--} StdVideoAV1MESAGlobalMotion;
--
--typedef struct StdVideoAV1MESALoopRestoration {
--    uint8_t lr_type[3];
--    uint8_t lr_unit_shift;
--    uint8_t lr_uv_shift;
--} StdVideoAV1MESALoopRestoration;
--
--typedef struct StdVideoAV1MESATileInfoFlags {
--    uint8_t uniform_tile_spacing_flag;
--} StdVideoAV1MESATileInfoFlags;
--
--typedef struct StdVideoAV1MESATileInfo {
--    StdVideoAV1MESATileInfoFlags flags;
--    uint8_t tile_cols;
--    uint8_t tile_rows;
--    uint8_t tile_start_col_sb[64];
--    uint8_t tile_start_row_sb[64];
--    uint8_t width_in_sbs_minus_1[64];
--    uint8_t height_in_sbs_minus_1[64];
--    uint16_t context_update_tile_id;
--    uint8_t tile_size_bytes_minus1;
--} StdVideoAV1MESATileInfo;
--
--typedef struct StdVideoAV1MESAQuantizationFlags {
--    uint8_t using_qmatrix;
--} StdVideoAV1MESAQuantizationFlags;
--
--typedef struct StdVideoAV1MESAQuantization {
--    StdVideoAV1MESAQuantizationFlags flags;
--    uint8_t base_q_idx;
--    int8_t  delta_q_y_dc;
--    uint8_t diff_uv_delta;
--    int8_t  delta_q_u_dc;
--    int8_t  delta_q_u_ac;
--    int8_t  delta_q_v_dc;
--    int8_t  delta_q_v_ac;
--    uint8_t qm_y;
--    uint8_t qm_u;
--    uint8_t qm_v;
--} StdVideoAV1MESAQuantization;
--
--typedef struct StdVideoAV1MESACDEF {
--    uint8_t damping_minus_3;
--    uint8_t bits;
--    uint8_t y_pri_strength[8];
--    uint8_t y_sec_strength[8];
--    uint8_t uv_pri_strength[8];
--    uint8_t uv_sec_strength[8];
--} StdVideoAV1MESACDEF;
--
--typedef struct StdVideoAV1MESADeltaQFlags {
--    uint8_t delta_lf_present;
--    uint8_t delta_lf_multi;
--} StdVideoAV1MESADeltaQFlags;
--
--typedef struct StdVideoAV1MESADeltaQ {
--    StdVideoAV1MESADeltaQFlags flags;
--    uint8_t delta_q_res;
--    uint8_t delta_lf_res;
--} StdVideoAV1MESADeltaQ;
--
--typedef struct StdVideoAV1MESASegmentationFlags {
--    uint8_t enabled;
--    uint8_t update_map;
--    uint8_t temporal_update;
--    uint8_t update_data;
--} StdVideoAV1MESASegmentationFlags;
--
--typedef struct StdVideoAV1MESASegmentation {
--    StdVideoAV1MESASegmentationFlags flags;
--    uint8_t                      feature_enabled_bits[8];
--    int16_t                      feature_data[8][8];
--} StdVideoAV1MESASegmentation;
--
--typedef struct StdVideoAV1MESALoopFilterFlags {
--    uint8_t delta_enabled;
--    uint8_t delta_update;
--} StdVideoAV1MESALoopFilterFlags;
--
--typedef struct StdVideoAV1MESALoopFilter {
--    StdVideoAV1MESALoopFilterFlags flags;
--    uint8_t level[4];
--    uint8_t sharpness;
--    int8_t  ref_deltas[8];
--    int8_t  mode_deltas[2];
--} StdVideoAV1MESALoopFilter;
--
--typedef struct StdVideoAV1MESAFrameHeaderFlags {
--    uint8_t error_resilient_mode;
--    uint8_t disable_cdf_update;
--    uint8_t use_superres;
--    uint8_t render_and_frame_size_different;
--    uint8_t allow_screen_content_tools;
--    uint8_t is_filter_switchable;
--    uint8_t force_integer_mv;
--    uint8_t frame_size_override_flag;
--    uint8_t buffer_removal_time_present_flag;
--    uint8_t allow_intrabc;
--    uint8_t frame_refs_short_signaling;
--    uint8_t allow_high_precision_mv;
--    uint8_t is_motion_mode_switchable;
--    uint8_t use_ref_frame_mvs;
--    uint8_t disable_frame_end_update_cdf;
--    uint8_t allow_warped_motion;
--    uint8_t reduced_tx_set;
--    uint8_t reference_select;
--    uint8_t skip_mode_present;
--    uint8_t delta_q_present;
--    uint8_t UsesLr;
--} StdVideoAV1MESAFrameHeaderFlags;
--
--typedef struct StdVideoAV1MESAFrameHeader {
--    StdVideoAV1MESAFrameHeaderFlags flags;
--
--    uint32_t frame_presentation_time;
--    uint32_t display_frame_id;
--    uint32_t current_frame_id;
--    uint8_t  frame_to_show_map_idx;
--    uint8_t  frame_type;
--    uint8_t  order_hint;
--    uint8_t  primary_ref_frame;
--    uint16_t frame_width_minus_1;
--    uint16_t frame_height_minus_1;
--    uint16_t render_width_minus_1;
--    uint16_t render_height_minus_1;
--    uint8_t  coded_denom;
--
--    uint8_t refresh_frame_flags;
--    uint8_t ref_order_hint[8];
--    int8_t  ref_frame_idx[7];
--    uint32_t delta_frame_id_minus1[7];
--
--    uint8_t interpolation_filter;
--    uint8_t tx_mode;
--
--    StdVideoAV1MESATileInfo                   tiling;
--    StdVideoAV1MESAQuantization               quantization;
--    StdVideoAV1MESASegmentation               segmentation;
--    StdVideoAV1MESADeltaQ                     delta_q;
--    StdVideoAV1MESALoopFilter                 loop_filter;
--    StdVideoAV1MESACDEF                       cdef;
--    StdVideoAV1MESALoopRestoration            lr;
--    StdVideoAV1MESAGlobalMotion               global_motion[8]; // One per ref frame
--    StdVideoAV1MESAFilmGrainParameters        film_grain;
--} StdVideoAV1MESAFrameHeader;
--
--typedef struct StdVideoAV1MESAScreenCoding {
--    uint8_t seq_force_screen_content_tools;
--} StdVideoAV1MESAScreenCoding;
--
--typedef struct StdVideoAV1MESATimingInfoFlags {
--    uint8_t equal_picture_interval;
--} StdVideoAV1MESATimingInfoFlags;
--
--typedef struct StdVideoAV1MESATimingInfo {
--    StdVideoAV1MESATimingInfoFlags flags;
--    uint32_t num_units_in_display_tick;
--    uint32_t time_scale;
--    uint32_t num_ticks_per_picture_minus_1;
--} StdVideoAV1MESATimingInfo;
--
--typedef struct StdVideoAV1MESAColorConfigFlags {
--    uint8_t mono_chrome;
--    uint8_t color_range;
--    uint8_t separate_uv_delta_q;
--} StdVideoAV1MESAColorConfigFlags;
--
--typedef struct StdVideoAV1MESAColorConfig {
--    StdVideoAV1MESAColorConfigFlags flags;
--    uint8_t bit_depth;
--    uint8_t subsampling_x;
--    uint8_t subsampling_y;
--} StdVideoAV1MESAColorConfig;
--
--typedef struct StdVideoAV1MESASequenceHeaderFlags {
--    uint8_t still_picture;
--    uint8_t reduced_still_picture_header;
--    uint8_t use_128x128_superblock;
--    uint8_t enable_filter_intra;
--    uint8_t enable_intra_edge_filter;
--    uint8_t enable_interintra_compound;
--    uint8_t enable_masked_compound;
--    uint8_t enable_warped_motion;
--    uint8_t enable_dual_filter;
--    uint8_t enable_order_hint;
--    uint8_t enable_jnt_comp;
--    uint8_t enable_ref_frame_mvs;
--    uint8_t frame_id_numbers_present_flag;
--    uint8_t enable_superres;
--    uint8_t enable_cdef;
--    uint8_t enable_restoration;
--    uint8_t film_grain_params_present;
--    uint8_t timing_info_present_flag;
--    uint8_t initial_display_delay_present_flag;
--} StdVideoAV1MESASequenceHeaderFlags;
--
--typedef struct StdVideoAV1MESASequenceHeader {
--    StdVideoAV1MESASequenceHeaderFlags flags;
--
--    StdVideoAV1MESAProfile seq_profile;
--    uint8_t  frame_width_bits_minus_1;
--    uint8_t  frame_height_bits_minus_1;
--    uint16_t max_frame_width_minus_1;
--    uint16_t max_frame_height_minus_1;
--    uint8_t  delta_frame_id_length_minus_2;
--    uint8_t  additional_frame_id_length_minus_1;
--    uint8_t  order_hint_bits_minus_1;
--    uint8_t  seq_choose_integer_mv;
--    uint8_t  seq_force_integer_mv;
--
--    StdVideoAV1MESATimingInfo       timing_info;
--    StdVideoAV1MESAColorConfig      color_config;
--} StdVideoAV1MESASequenceHeader;
--
--typedef struct StdVideoAV1MESATile {
--    uint16_t tg_start;
--    uint16_t tg_end;
--    uint16_t row;
--    uint16_t column;
--    uint32_t size;
--    uint32_t offset;
--} StdVideoAV1MESATile;
--
--typedef struct StdVideoAV1MESATileList {
--    StdVideoAV1MESATile *tile_list;
--    uint32_t nb_tiles;
--} StdVideoAV1MESATileList;
--
--typedef struct VkVideoDecodeAV1PictureInfoMESA {
--    VkStructureType sType;
--    const void *pNext;
--    StdVideoAV1MESAFrameHeader *frame_header;
--    StdVideoAV1MESATileList *tile_list;
--    uint8_t skip_mode_frame_idx[2];
--} VkVideoDecodeAV1PictureInfoMESA;
--
--typedef struct VkVideoDecodeAV1DpbSlotInfoMESA {
--    VkStructureType sType;
--    const void *pNext;
--    uint8_t frameIdx;
--    uint8_t ref_order_hint[7];
--    uint8_t disable_frame_end_update_cdf;
--} VkVideoDecodeAV1DpbSlotInfoMESA;
--
--typedef struct VkVideoDecodeAV1SessionParametersAddInfoMESA {
--    VkStructureType sType;
--    const void *pNext;
--    StdVideoAV1MESASequenceHeader *sequence_header;
--} VkVideoDecodeAV1SessionParametersAddInfoMESA;
--
--typedef struct VkVideoDecodeAV1SessionParametersCreateInfoMESA {
--    VkStructureType sType;
--    const void *pNext;
--    const VkVideoDecodeAV1SessionParametersAddInfoMESA *pParametersAddInfo;
--} VkVideoDecodeAV1SessionParametersCreateInfoMESA;
--
--typedef struct VkVideoDecodeAV1ProfileInfoMESA {
--    VkStructureType sType;
--    const void *pNext;
--    StdVideoAV1MESAProfile stdProfileIdc;
--} VkVideoDecodeAV1ProfileInfoMESA;
--
--typedef enum VkVideoDecodeAV1CapabilityFlagBitsMESA {
--    VK_VIDEO_DECODE_AV1_CAPABILITY_EXTERNAL_FILM_GRAIN_MESA = 0x00000001,
--    VK_VIDEO_DECODE_AV1_CAPABILITY_FLAG_BITS_MAX_ENUM_MESA = 0x7FFFFFFF
--} VkVideoDecodeAV1CapabilityFlagBitsMESA;
--typedef VkFlags VkVideoDecodeAV1CapabilityFlagsMESA;
--
--typedef struct VkVideoDecodeAV1CapabilitiesMESA {
--    VkStructureType sType;
--    const void *pNext;
--    VkVideoDecodeAV1CapabilityFlagsMESA flags;
--    StdVideoAV1MESALevel maxLevelIdc;
--} VkVideoDecodeAV1CapabilitiesMESA;
--
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PICTURE_INFO_MESA 1000509000
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_CREATE_INFO_MESA 1000509001
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_SESSION_PARAMETERS_ADD_INFO_MESA 1000509002
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_DPB_SLOT_INFO_MESA 1000509003
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_CAPABILITIES_MESA 1000509004
--#define VK_STRUCTURE_TYPE_VIDEO_DECODE_AV1_PROFILE_INFO_MESA 1000509005
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif
-diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
-index 91b9f96ccf..6e3b96b73a 100644
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -446,7 +446,7 @@ static const VulkanOptExtension optional_device_exts[] = {
-     { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,               FF_VK_EXT_VIDEO_DECODE_QUEUE     },
-     { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME,                FF_VK_EXT_VIDEO_DECODE_H264      },
-     { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME,                FF_VK_EXT_VIDEO_DECODE_H265      },
--    { "VK_MESA_video_decode_av1",                             FF_VK_EXT_VIDEO_DECODE_AV1       },
-+    { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME,                 FF_VK_EXT_VIDEO_DECODE_AV1       },
- };
- 
- static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
-diff --git a/libavutil/vulkan_functions.h b/libavutil/vulkan_functions.h
-index 65021b04b1..6b379acf93 100644
---- a/libavutil/vulkan_functions.h
-+++ b/libavutil/vulkan_functions.h
-@@ -43,7 +43,7 @@ typedef enum FFVulkanExtensions {
-     FF_VK_EXT_VIDEO_DECODE_QUEUE     = 1ULL << 11, /* VK_KHR_video_decode_queue */
-     FF_VK_EXT_VIDEO_DECODE_H264      = 1ULL << 12, /* VK_EXT_video_decode_h264 */
-     FF_VK_EXT_VIDEO_DECODE_H265      = 1ULL << 13, /* VK_EXT_video_decode_h265 */
--    FF_VK_EXT_VIDEO_DECODE_AV1       = 1ULL << 14, /* VK_MESA_video_decode_av1 */
-+    FF_VK_EXT_VIDEO_DECODE_AV1       = 1ULL << 14, /* VK_KHR_video_decode_av1 */
-     FF_VK_EXT_ATOMIC_FLOAT           = 1ULL << 15, /* VK_EXT_shader_atomic_float */
-     FF_VK_EXT_COOP_MATRIX            = 1ULL << 16, /* VK_KHR_cooperative_matrix */
- 
-diff --git a/libavutil/vulkan_loader.h b/libavutil/vulkan_loader.h
-index f9e739e1e3..73cf03935d 100644
---- a/libavutil/vulkan_loader.h
-+++ b/libavutil/vulkan_loader.h
-@@ -58,7 +58,7 @@ static inline uint64_t ff_vk_extensions_to_mask(const char * const *extensions,
-         { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME,        FF_VK_EXT_VIDEO_DECODE_QUEUE     },
-         { VK_KHR_VIDEO_DECODE_H264_EXTENSION_NAME,         FF_VK_EXT_VIDEO_DECODE_H264      },
-         { VK_KHR_VIDEO_DECODE_H265_EXTENSION_NAME,         FF_VK_EXT_VIDEO_DECODE_H265      },
--        { "VK_MESA_video_decode_av1",                      FF_VK_EXT_VIDEO_DECODE_AV1       },
-+        { VK_KHR_VIDEO_DECODE_AV1_EXTENSION_NAME,          FF_VK_EXT_VIDEO_DECODE_AV1       },
-     };
- 
-     FFVulkanExtensions mask = 0x0;
-diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
---- ffmpeg-6.1.1.orig/libavcodec/vulkan_video.c
-+++ ffmpeg-6.1.1/libavcodec/vulkan_video.c
-@@ -37,7 +37,7 @@ const FFVkCodecMap ff_vk_codec_map[AV_CO
-                            0,
-                            0,
-                            FF_VK_EXT_VIDEO_DECODE_AV1,
--                           0x01000000 /* TODO fix this */
-+			   VK_VIDEO_CODEC_OPERATION_DECODE_AV1_BIT_KHR
-     },
- };
- 
--- 
-2.25.1
-
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch
deleted file mode 100644
index 960d34943ef..00000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_fix_gcc14.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 2f24f10d9cf34ddce274496c4daa73f732d370c1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 20 Dec 2023 12:32:43 +0000
-Subject: [PATCH] libavcodec: fix -Wint-conversion in vulkan
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-FIx warnings (soon to be errors in GCC 14, already so in Clang 15):
-```
-src/libavcodec/vulkan_av1.c: In function ‘vk_av1_create_params’:
-src/libavcodec/vulkan_av1.c:183:43: error: initialization of ‘long long unsigned int’ from ‘void *’ makes integer from pointer without a cast [-Wint-conversion]
-  183 |         .videoSessionParametersTemplate = NULL,
-      |                                           ^~~~
-src/libavcodec/vulkan_av1.c:183:43: note: (near initialization for ‘(anonymous).videoSessionParametersTemplate’)
-```
-
-Use Vulkan's VK_NULL_HANDLE instead of bare NULL.
-
-Fix Trac ticket #10724.
-
-Was reported downstream in Gentoo at https://bugs.gentoo.org/919067.
-
-Signed-off-by: Sam James <sam@gentoo.org>
-Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/2f24f10d9cf34ddce274496c4daa73f732d370c1]
----
- libavcodec/vulkan_av1.c    | 2 +-
- libavcodec/vulkan_decode.c | 6 +++---
- libavcodec/vulkan_h264.c   | 2 +-
- libavcodec/vulkan_hevc.c   | 2 +-
- libavcodec/vulkan_video.c  | 2 +-
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c
-index 4998bf7ebc55f..9730e4b08dd40 100644
---- a/libavcodec/vulkan_av1.c
-+++ b/libavcodec/vulkan_av1.c
-@@ -180,7 +180,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
-         .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
-         .pNext = &av1_params,
-         .videoSession = ctx->common.session,
--        .videoSessionParametersTemplate = NULL,
-+        .videoSessionParametersTemplate = VK_NULL_HANDLE,
-     };
- 
-     err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create);
-diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
-index a89d84fcaa972..fdbcbb450a1e0 100644
---- a/libavcodec/vulkan_decode.c
-+++ b/libavcodec/vulkan_decode.c
-@@ -188,9 +188,9 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic,
-         return 0;
- 
-     vkpic->dpb_frame     = NULL;
--    vkpic->img_view_ref  = NULL;
--    vkpic->img_view_out  = NULL;
--    vkpic->img_view_dest = NULL;
-+    vkpic->img_view_ref  = VK_NULL_HANDLE;
-+    vkpic->img_view_out  = VK_NULL_HANDLE;
-+    vkpic->img_view_dest = VK_NULL_HANDLE;
- 
-     vkpic->destroy_image_view = vk->DestroyImageView;
-     vkpic->wait_semaphores = vk->WaitSemaphores;
-diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c
-index e727aafb162d3..39c123ddca57e 100644
---- a/libavcodec/vulkan_h264.c
-+++ b/libavcodec/vulkan_h264.c
-@@ -315,7 +315,7 @@ static int vk_h264_create_params(AVCodecContext *avctx, AVBufferRef **buf)
-         .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
-         .pNext = &h264_params,
-         .videoSession = ctx->common.session,
--        .videoSessionParametersTemplate = NULL,
-+        .videoSessionParametersTemplate = VK_NULL_HANDLE,
-     };
- 
-     /* SPS list */
-diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c
-index 99fdcf3b45839..033172cbd6958 100644
---- a/libavcodec/vulkan_hevc.c
-+++ b/libavcodec/vulkan_hevc.c
-@@ -653,7 +653,7 @@ static int vk_hevc_create_params(AVCodecContext *avctx, AVBufferRef **buf)
-         .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
-         .pNext = &h265_params,
-         .videoSession = ctx->common.session,
--        .videoSessionParametersTemplate = NULL,
-+        .videoSessionParametersTemplate = VK_NULL_HANDLE,
-     };
- 
-     HEVCHeaderSet *hdr;
-diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
-index 5fa8292b28eaf..fb20315db4bbf 100644
---- a/libavcodec/vulkan_video.c
-+++ b/libavcodec/vulkan_video.c
-@@ -287,7 +287,7 @@ av_cold void ff_vk_video_common_uninit(FFVulkanContext *s,
-     if (common->session) {
-         vk->DestroyVideoSessionKHR(s->hwctx->act_dev, common->session,
-                                    s->hwctx->alloc);
--        common->session = NULL;
-+        common->session = VK_NULL_HANDLE;
-     }
- 
-     if (common->nb_mem && common->mem)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
similarity index 97%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
index fe34b87ccf5..ce8956578e3 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb
@@ -24,13 +24,10 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SRC_URI = " \
     https://www.ffmpeg.org/releases/${BP}.tar.xz \
-    file://av1_ordering_info.patch \
-    file://vulkan_av1_stable_API.patch \
-    file://vulkan_fix_gcc14.patch \
     file://0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch \
 "
 
-SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
+SRC_URI[sha256sum] = "8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389"
 
 # https://nvd.nist.gov/vuln/detail/CVE-2023-39018
 # https://github.com/bramp/ffmpeg-cli-wrapper/issues/291
-- 
2.39.2

[PATCH 21/34] libksba: update 1.6.6 -> 1.6.7

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libksba/ksba-add-pkgconfig-support.patch  | 22 ++++++++++---------
 .../{libksba_1.6.6.bb => libksba_1.6.7.bb}    |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename meta/recipes-support/libksba/{libksba_1.6.6.bb => libksba_1.6.7.bb} (94%)

diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index bdb80ff34d0..468fbd76f89 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -1,4 +1,4 @@
-From ca8174aa81d7bf364b33f7254a9e887735c4996d Mon Sep 17 00:00:00 2001
+From 46c0582d1087220e9404a14a851085b8f29773c4 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 3 Dec 2012 18:17:31 +0800
 Subject: [PATCH] libksba: add pkgconfig support
@@ -10,19 +10,20 @@ This patch is rejected by upstream for the reason below:
 They think pkgconfig adds no portability and maintaining them is not worthwhile.
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
 ---
- src/ksba.m4 | 90 +++--------------------------------------------------
- 1 file changed, 4 insertions(+), 86 deletions(-)
+ src/ksba.m4 | 93 +++--------------------------------------------------
+ 1 file changed, 5 insertions(+), 88 deletions(-)
 
 diff --git a/src/ksba.m4 b/src/ksba.m4
-index 452c245..aa96255 100644
+index 80f0d38..8f8761a 100644
 --- a/src/ksba.m4
 +++ b/src/ksba.m4
-@@ -23,37 +23,6 @@ dnl with a changed API.
+@@ -107,39 +107,7 @@ dnl this features allows to prevent build against newer versions of libksba
+ dnl with a changed API.
  dnl
  AC_DEFUN([AM_PATH_KSBA],
- [ AC_REQUIRE([AC_CANONICAL_HOST])
+-[ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-  AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
 -  dnl --with-libksba-prefix=PFX is the preferred name for this option,
 -  dnl since that is consistent with how our three siblings use the directory/
 -  dnl package name in --with-$dir_name-prefix=PFX.
@@ -54,10 +55,11 @@ index 452c245..aa96255 100644
 -  if test -z "$use_gpgrt_config"; then
 -    AC_PATH_PROG(KSBA_CONFIG, ksba-config, no)
 -  fi
++[ AC_REQUIRE([AC_CANONICAL_HOST])
  
    tmp=ifelse([$1], ,1:1.0.0,$1)
    if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-@@ -64,56 +33,13 @@ AC_DEFUN([AM_PATH_KSBA],
+@@ -150,56 +118,13 @@ AC_DEFUN([AM_PATH_KSBA],
       min_ksba_version="$tmp"
    fi
  
@@ -117,7 +119,7 @@ index 452c245..aa96255 100644
          if test "$tmp" -gt 0 ; then
             AC_MSG_CHECKING([KSBA API version])
             if test "$req_ksba_api" -eq "$tmp" ; then
-@@ -126,14 +52,8 @@ AC_DEFUN([AM_PATH_KSBA],
+@@ -212,14 +137,8 @@ AC_DEFUN([AM_PATH_KSBA],
       fi
    fi
    if test $ok = yes; then
@@ -133,7 +135,7 @@ index 452c245..aa96255 100644
      if test x"$libksba_config_host" != xnone ; then
        if test x"$libksba_config_host" != x"$host" ; then
    AC_MSG_WARN([[
-@@ -147,8 +67,6 @@ AC_DEFUN([AM_PATH_KSBA],
+@@ -233,8 +152,6 @@ AC_DEFUN([AM_PATH_KSBA],
        fi
      fi
    else
diff --git a/meta/recipes-support/libksba/libksba_1.6.6.bb b/meta/recipes-support/libksba/libksba_1.6.7.bb
similarity index 94%
rename from meta/recipes-support/libksba/libksba_1.6.6.bb
rename to meta/recipes-support/libksba/libksba_1.6.7.bb
index 2230a032f6b..b7a9fc40502 100644
--- a/meta/recipes-support/libksba/libksba_1.6.6.bb
+++ b/meta/recipes-support/libksba/libksba_1.6.7.bb
@@ -24,7 +24,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://ksba-add-pkgconfig-support.patch"
 
-SRC_URI[sha256sum] = "5dec033d211559338838c0c4957c73dfdc3ee86f73977d6279640c9cd08ce6a4"
+SRC_URI[sha256sum] = "cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763"
 
 do_configure:prepend () {
 	# Else these could be used in preference to those in aclocal-copy
-- 
2.39.2

[PATCH 22/34] p11-kit: update 0.25.3 -> 0.25.5

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../files/fix-parallel-build-failures.patch   | 33 -------------------
 .../{p11-kit_0.25.3.bb => p11-kit_0.25.5.bb}  |  3 +-
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
 rename meta/recipes-support/p11-kit/{p11-kit_0.25.3.bb => p11-kit_0.25.5.bb} (95%)

diff --git a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch b/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
deleted file mode 100644
index 47df0271064..00000000000
--- a/meta/recipes-support/p11-kit/files/fix-parallel-build-failures.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-It fails occasionally with missing generated header files:
-
-| ../git/common/asn1.c:42:10: fatal error: openssl.asn.h: No such file or directory
-|    42 | #include "openssl.asn.h"
-|       |          ^~~~~~~~~~~~~~~
-| compilation terminated.
-
-According to meson manual page:
-
-https://mesonbuild.com/Wrap-best-practices-and-tips.html#declare-generated-headers-explicitly
-
-'asn_h_dep' should be a dependency of static_library target 'libp11_asn1' to
-make sure that required header files generated before compile common/asn1.c.
-
-Upstream-Status: Submitted [https://github.com/p11-glue/p11-kit/pull/619]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- common/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/common/meson.build b/common/meson.build
-index dc86d7b..cc3ec48 100644
---- a/common/meson.build
-+++ b/common/meson.build
-@@ -113,6 +113,7 @@ if with_asn1
-     'p11-asn1', libp11_asn1_sources,
-     gnu_symbol_visibility: 'hidden',
-     include_directories: configinc,
-+    dependencies: asn_h_dep,
-   )
- 
-   libp11_asn1_dep = declare_dependency(
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
similarity index 95%
rename from meta/recipes-support/p11-kit/p11-kit_0.25.3.bb
rename to meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
index 2ede38deba2..8c2f56be44d 100644
--- a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb
+++ b/meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
@@ -11,9 +11,8 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
 DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
 
 SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
-           file://fix-parallel-build-failures.patch \
            "
-SRCREV = "917e02a3211dabbdea4b079cb598581dce84fda1"
+SRCREV = "0dd113361057e477f40ff4d8788f3e7e400af5f9"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
-- 
2.39.2

[PATCH 23/34] iproute2: upgrade 6.9.0 -> 6.10.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...nk.h-add-missing-include-for-htobe64.patch | 24 +++++++++++++++++++
 .../{iproute2_6.9.0.bb => iproute2_6.10.0.bb} |  6 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_6.9.0.bb => iproute2_6.10.0.bb} (94%)

diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
new file mode 100644
index 00000000000..555d63b2403
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-include-libnetlink.h-add-missing-include-for-htobe64.patch
@@ -0,0 +1,24 @@
+From f3c574b27000fd887cee84ab47adf23f767cbea1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Sat, 24 Aug 2024 15:32:25 +0200
+Subject: [PATCH] include/libnetlink.h: add missing include for htobe64
+ definitions
+
+Upstream-Status: Submitted [by email to stephen@networkplumber.org netdev@vger.kernel.org]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ include/libnetlink.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/libnetlink.h b/include/libnetlink.h
+index 30f0c2d..77e8181 100644
+--- a/include/libnetlink.h
++++ b/include/libnetlink.h
+@@ -12,6 +12,7 @@
+ #include <linux/neighbour.h>
+ #include <linux/netconf.h>
+ #include <arpa/inet.h>
++#include <endian.h>
+ 
+ struct rtnl_handle {
+ 	int			fd;
diff --git a/meta/recipes-connectivity/iproute2/iproute2_6.9.0.bb b/meta/recipes-connectivity/iproute2/iproute2_6.10.0.bb
similarity index 94%
rename from meta/recipes-connectivity/iproute2/iproute2_6.9.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_6.10.0.bb
index d21885cd73a..9f0c9aab59e 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_6.9.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_6.10.0.bb
@@ -11,9 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 DEPENDS = "flex-native bison-native iptables libcap"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
+           file://0001-include-libnetlink.h-add-missing-include-for-htobe64.patch \
+           "
 
-SRC_URI[sha256sum] = "2f643d09ea11a4a2a043c92e2b469b5f73228cbf241ae806760296ed0ec413d0"
+SRC_URI[sha256sum] = "91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce"
 
 inherit update-alternatives bash-completion pkgconfig
 
-- 
2.39.2

[PATCH 24/34] ifupdown: upgrade 0.8.41 -> 0.8.43

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Do not force CFLAGS (no longer necessary).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch | 3 +--
 ...-Makefile-do-not-use-dpkg-for-determining-OS-type.patch | 7 +++----
 .../files/0001-ifupdown-skip-wrong-test-case.patch         | 3 +--
 ...n2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch | 3 +--
 meta/recipes-core/ifupdown/files/tweak-ptest-script.patch  | 3 +--
 .../ifupdown/{ifupdown_0.8.41.bb => ifupdown_0.8.43.bb}    | 4 ++--
 6 files changed, 9 insertions(+), 14 deletions(-)
 rename meta/recipes-core/ifupdown/{ifupdown_0.8.41.bb => ifupdown_0.8.43.bb} (94%)

diff --git a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
index 6c4ed526bfa..83fb706be07 100644
--- a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
+++ b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
@@ -1,4 +1,4 @@
-From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001
+From 97b196efe9671d0185d22710371acb52bb7130e2 Mon Sep 17 00:00:00 2001
 From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
 Date: Tue, 2 Jul 2019 20:10:42 +0200
 Subject: [PATCH] Define FNM_EXTMATCH for musl
@@ -24,7 +24,6 @@ function); did you mean 'FNM_NOMATCH'?
 Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5]
 
 Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
-
 ---
  archcommon.h | 4 ++++
  1 file changed, 4 insertions(+)
diff --git a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
index 6e15a25224d..f84a0a1311a 100644
--- a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
+++ b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
@@ -1,17 +1,16 @@
-From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001
+From 4922e2011a0132c122df4f0cf4d66d565c749060 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 9 Jan 2020 15:38:06 +0100
 Subject: [PATCH] Makefile: do not use dpkg for determining OS type
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 0ce2fa3..739aef2 100644
+index 9cd758b..58b4173 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,6 @@
@@ -21,4 +20,4 @@ index 0ce2fa3..739aef2 100644
 +ARCH := linux
  
  BASEDIR ?= $(DESTDIR)
- 
+ PKGLIBDIR ?= /lib/ifupdown
diff --git a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
index 9ae24da51ee..8aa227c8ecb 100644
--- a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
+++ b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
@@ -1,4 +1,4 @@
-From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001
+From ea48a9816643482d438e4bb276c90cd6f02847e4 Mon Sep 17 00:00:00 2001
 From: Zqiang <qiang.zhang@windriver.com>
 Date: Mon, 19 Apr 2021 14:15:45 +0800
 Subject: [PATCH] ifupdown: skip wrong test case
@@ -10,7 +10,6 @@ and are skipped directly.
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Zqiang <qiang.zhang@windriver.com>
-
 ---
  tests/testbuild-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
index 7b4b761e6a6..24e3ba0d9de 100644
--- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
+++ b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
@@ -1,4 +1,4 @@
-From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001
+From 68b64a5c9d466352b0c161019bd7255e31db9a4c Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <paul.gortmaker@windriver.com>
 Date: Wed, 6 Aug 2014 14:54:12 -0400
 Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch
@@ -13,7 +13,6 @@ like the loopback device not being configured/enabled.
 
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 Upstream-Status: Pending
-
 ---
  defn2c.pl   | 6 +++---
  defn2man.pl | 6 +++---
diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
index fa6bb84df30..c1953f0691b 100644
--- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
+++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
@@ -1,4 +1,4 @@
-From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001
+From 5eede8950e35404b109cc3cf6a53bf3c84b31cfb Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Mon, 3 Feb 2020 17:33:11 +0800
 Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest
@@ -7,7 +7,6 @@ Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
 ---
  tests/testbuild-linux | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.43.bb
similarity index 94%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.43.bb
index c7004ab41df..1557551d454 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.43.bb
@@ -16,7 +16,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast
            file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
            file://tweak-ptest-script.patch \
            "
-SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270"
+SRCREV = "cf86ad5819aba8f9b020a95257c9a8c4911b1c85"
 
 S = "${WORKDIR}/git"
 
@@ -25,7 +25,7 @@ inherit ptest update-alternatives
 
 do_compile () {
 	chmod a+rx *.pl *.sh
-	oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'"
+	oe_runmake 'CC=${CC}' "-Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'"
 }
 
 do_install () {
-- 
2.39.2

[PATCH 25/34] libdnf: upgrade 0.73.2 -> 0.73.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch | 2 +-
 ...Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 4 ++--
 .../libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch     | 2 +-
 ...Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 4 ++--
 meta/recipes-devtools/libdnf/libdnf/armarch.patch             | 2 +-
 .../libdnf/libdnf/enable_test_data_dir_set.patch              | 4 ++--
 .../libdnf/{libdnf_0.73.2.bb => libdnf_0.73.3.bb}             | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename meta/recipes-devtools/libdnf/{libdnf_0.73.2.bb => libdnf_0.73.3.bb} (97%)

diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
index 046e09eab21..52e74263719 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
@@ -1,4 +1,4 @@
-From 5d6db56791d326e6b486dca54fe2335af0225229 Mon Sep 17 00:00:00 2001
+From 09ff4670e0717ea1a79430c14e108f93fb6f5f34 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 24 Nov 2016 14:33:07 +0200
 Subject: [PATCH] FindGtkDoc.cmake: drop the requirement for
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 223c1be2188..3f70b855c82 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,4 +1,4 @@
-From bf9bde4af952b67cc357d25b9863889099ea9665 Mon Sep 17 00:00:00 2001
+From 15de1b4266b85ffdf17fad374a43e0ed315b9f22 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 7 Feb 2017 12:16:03 +0200
 Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e99b28d0..548a9137 100644
+index a6f14318..60c66e94 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -51,7 +51,7 @@ endif()
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
index 27f76077d74..5d77bcb41a1 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-drop-FindPythonInstDir.cmake.patch
@@ -1,4 +1,4 @@
-From a6b3bc4fb3db996cd6c5616a99c16d085704dae0 Mon Sep 17 00:00:00 2001
+From 2a4a5f2da7d1b578619a8d0886f6db00bacefdc2 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 1 Jun 2021 10:23:59 +0800
 Subject: [PATCH] drop FindPythonInstDir.cmake
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
index ecab47e5afa..25d61095252 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
@@ -1,4 +1,4 @@
-From e40def862bdeb10da295b15c5904fe2829d391c7 Mon Sep 17 00:00:00 2001
+From 9fb0e6130ef5d9fa68240c279d235eee8658c0fa Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 30 Dec 2016 18:24:50 +0200
 Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6444c374..e99b28d0 100644
+index c6bd46a6..a6f14318 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -51,7 +51,8 @@ endif()
diff --git a/meta/recipes-devtools/libdnf/libdnf/armarch.patch b/meta/recipes-devtools/libdnf/libdnf/armarch.patch
index 63debdb58f5..54df0aab99d 100644
--- a/meta/recipes-devtools/libdnf/libdnf/armarch.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/armarch.patch
@@ -1,4 +1,4 @@
-From aa0f8b65feec64420a9b7b61cfcc8bcce161e14b Mon Sep 17 00:00:00 2001
+From 8159808516543237fb110d0883e702385a1a866c Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Thu, 9 Nov 2023 10:29:31 +0000
 Subject: [PATCH] libdnf: Fix arm arch mapping issues for qemuarmv5
diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
index e4f6d447f17..986b71c4e6a 100644
--- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch
@@ -1,4 +1,4 @@
-From 25229773a9d4472235278bb45f75439e56630cee Mon Sep 17 00:00:00 2001
+From 3d77c2ff41b1a65d0f4852ed21d7a8ec41b368a8 Mon Sep 17 00:00:00 2001
 From: Joe Slater <joe.slater@windriver.com>
 Date: Wed, 22 Jul 2020 13:31:11 -0700
 Subject: [PATCH] libdnf: allow reproducible binary builds
@@ -14,7 +14,7 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 548a9137..c378e7d9 100644
+index 60c66e94..1459dfbf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -132,7 +132,12 @@ add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\")
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.73.2.bb b/meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
similarity index 97%
rename from meta/recipes-devtools/libdnf/libdnf_0.73.2.bb
rename to meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
index ed433d4a9fb..e4a34f8ff6a 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.73.2.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.73.3.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
            file://armarch.patch \
            "
 
-SRCREV = "86bbb159732e43dd6dff98c96e99382843f7c63b"
+SRCREV = "fbd34472e5edea0a3ed88ae14a47666e23538e4a"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
-- 
2.39.2

[PATCH 26/34] mmc-utils: upgrade to latest revision

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Add sphinx as a build dependency and set C= to avoid needing the 'sparse' utility.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 0bfd5c1cc8c..94015d6f839 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -5,13 +5,16 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d"
 
 SRCBRANCH ?= "master"
-SRCREV = "f757f413dea4a143ad7c3b48b8264176f0499a82"
+SRCREV = "123fd8b2ac3933be1319486fb1f32236a4a86a7c"
 
 PV = "0.1+git"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;branch=${SRCBRANCH};protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
+DEPENDS = "python3-sphinx-native"
+EXTRA_OEMAKE = "C="
+
 S = "${WORKDIR}/git"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-- 
2.39.2

[PATCH 27/34] adwaita-icon-theme: upgrade 46.0 -> 46.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{adwaita-icon-theme_46.0.bb => adwaita-icon-theme_46.2.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-gnome/gnome/{adwaita-icon-theme_46.0.bb => adwaita-icon-theme_46.2.bb} (91%)

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.2.bb
similarity index 91%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_46.2.bb
index 2f3e4e7b85f..14d26ebd19a 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_46.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_46.2.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
 
 inherit gnomebase allarch gtk-icon-cache
 
-SRC_URI[archive.sha256sum] = "4bcb539bd75d64da385d6fa08cbaa9ddeaceb6ac8e82b85ba6c41117bf5ba64e"
+SRC_URI[archive.sha256sum] = "beb126b9429339ba762e0818d5e73b2c46f444975bf80076366eae2d0f96b5cb"
 
 DEPENDS += "librsvg-native"
 
-- 
2.39.2

[PATCH 28/34] hicolor-icon-theme: upgrade 0.17 -> 0.18

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/selftest/cases/buildoptions.py                 | 4 ++--
 ...hicolor-icon-theme_0.17.bb => hicolor-icon-theme_0.18.bb} | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename meta/recipes-gnome/hicolor-icon-theme/{hicolor-icon-theme_0.17.bb => hicolor-icon-theme_0.18.bb} (77%)

diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 4b6f89d8cb6..423c31e1892 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -173,8 +173,8 @@ class BuildhistoryTests(BuildhistoryBase):
 
         data = load_bh(os.path.join(history_dir, 'hicolor-icon-theme-dev', 'latest'))
         if 'FILELIST' in data:
-            self.assertEqual(data['FILELIST'], '')
-        self.assertEqual(int(data['PKGSIZE']), 0)
+            self.assertEqual(data['FILELIST'], '/usr/share/pkgconfig/default-icon-theme.pc')
+        self.assertGreater(int(data['PKGSIZE']), 0)
 
 class ArchiverTest(OESelftestTestCase):
     def test_arch_work_dir_and_export_source(self):
diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.18.bb
similarity index 77%
rename from meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb
rename to meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.18.bb
index bb6cb000ab3..283264675c9 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.18.bb
@@ -8,10 +8,9 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
 
 SRC_URI = "https://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "84eec8d6f810240a069c731f1870b474"
-SRC_URI[sha256sum] = "317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8"
+SRC_URI[sha256sum] = "db0e50a80aa3bf64bb45cbca5cf9f75efd9348cf2ac690b907435238c3cf81d7"
 
-inherit allarch autotools
+inherit allarch meson
 
 FILES:${PN} += "${datadir}/icons"
 
-- 
2.39.2

[PATCH 29/34] waffle: upgrade 1.8.0 -> 1.8.1

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop the patch: the build is correctly using everything from sysroots
now.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-make-core-protocol-into-the-library.patch | 40 -------------------
 .../{waffle_1.8.0.bb => waffle_1.8.1.bb}      |  5 +--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
 rename meta/recipes-graphics/waffle/{waffle_1.8.0.bb => waffle_1.8.1.bb} (93%)

diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
deleted file mode 100644
index 31ac3e0dd19..00000000000
--- a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 26 Oct 2021 08:52:17 +0200
-Subject: [PATCH] waffle: do not make core protocol into the library
-
-None of the consumers (which is just piglit) use it, and
-this avoids host contamination from pkg-config suggesting
-wayland.xml from the host.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/waffle/meson.build | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/waffle/meson.build b/src/waffle/meson.build
-index 1cc99f6..022745a 100644
---- a/src/waffle/meson.build
-+++ b/src/waffle/meson.build
-@@ -89,12 +89,6 @@ if build_surfaceless
- endif
- 
- if build_wayland
--  wl_core_proto_c = custom_target(
--    'wl-core-proto.c',
--    input: wayland_core_xml,
--    output: 'wl-core-proto.c',
--    command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'],
--  )
-   wl_xdg_shell_proto_c = custom_target(
-     'wl-xdg-shell-proto.c',
-     input: wayland_xdg_shell_xml,
-@@ -115,7 +109,6 @@ if build_wayland
-     'wayland/wayland_wrapper.c',
-   )
-   files_libwaffle += [
--    wl_core_proto_c,
-     wl_xdg_shell_proto_c,
-     wl_xdg_shell_proto_h,
-   ]
diff --git a/meta/recipes-graphics/waffle/waffle_1.8.0.bb b/meta/recipes-graphics/waffle/waffle_1.8.1.bb
similarity index 93%
rename from meta/recipes-graphics/waffle/waffle_1.8.0.bb
rename to meta/recipes-graphics/waffle/waffle_1.8.1.bb
index ad8649b40ef..684124bc4d2 100644
--- a/meta/recipes-graphics/waffle/waffle_1.8.0.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.8.1.bb
@@ -9,10 +9,9 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
                     file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
 
-SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \
-           file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8 \
            "
-SRCREV = "580b912a30085528886603942c100c7b309b3bdb"
+SRCREV = "49abc7cb5f73cc6852136c91da49ea3a338960e4"
 S = "${WORKDIR}/git"
 
 inherit meson features_check lib_package bash-completion pkgconfig
-- 
2.39.2

[PATCH 30/34] libtraceevent: upgrade 1.8.2 -> 1.8.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop backport.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libtraceevent/libtraceevent/meson.patch   | 45 -------------------
 ...eevent_1.8.2.bb => libtraceevent_1.8.3.bb} |  4 +-
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
 rename meta/recipes-kernel/libtraceevent/{libtraceevent_1.8.2.bb => libtraceevent_1.8.3.bb} (89%)

diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
deleted file mode 100644
index c723c236c06..00000000000
--- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Sun, 27 Aug 2023 20:57:44 +0100
-Subject: [PATCH] Fixes for the Meson build of libtraceevent:
-
-- Make the plugin directory the same as the Makefiles
-- Install the plugins as modules not static and versioned shared libraries
-
-Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- meson.build         | 2 +-
- plugins/meson.build | 3 +--
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 40ce38c..1eb7912 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir'))
- libdir = join_paths(prefixdir, get_option('libdir'))
- plugindir = get_option('plugindir')
- if plugindir == ''
--    plugindir = join_paths(libdir, 'libtraceevent/plugins')
-+    plugindir = join_paths(libdir, 'traceevent/plugins')
- endif
- 
- add_project_arguments(
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 74ad664..4919be4 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -19,11 +19,10 @@ plugins = [
- 
- pdeps = []
- foreach plugin : plugins
--    pdeps += library(
-+    pdeps += shared_module(
-         plugin.replace('.c', ''),
-         plugin,
-         name_prefix: '',
--        version: library_version,
-         dependencies: [libtraceevent_dep],
-         include_directories: [incdir],
-         install: true,
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb
similarity index 89%
rename from meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb
rename to meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb
index d4ace548840..68174305f25 100644
--- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.2.bb
+++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.3.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
                     file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
 SECTION = "libs"
 
-SRCREV = "6f6d5802f31992e7527a4c32b43a32fda6bf6bdf"
+SRCREV = "645a883516e343ee970ebb80398cfd7b7dbd227e"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
-           file://meson.patch"
+          "
 
 S = "${WORKDIR}/git"
 
-- 
2.39.2

[PATCH 31/34] alsa-utils: upgrade 1.2.11 -> 1.2.12

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../alsa/{alsa-utils_1.2.11.bb => alsa-utils_1.2.12.bb}       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename meta/recipes-multimedia/alsa/{alsa-utils_1.2.11.bb => alsa-utils_1.2.12.bb} (97%)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.12.bb
similarity index 97%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.2.12.bb
index e598fac9f88..380140861c7 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.12.bb
@@ -26,7 +26,7 @@ PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook
 # alsa-utils specified in SRC_URI due to alsa-utils-scripts recipe
 SRC_URI = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2 \
            "
-SRC_URI[sha256sum] = "9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7"
+SRC_URI[sha256sum] = "98bc6677d0c0074006679051822324a0ab0879aea558a8f68b511780d30cd924"
 
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with
@@ -51,6 +51,7 @@ ALSA_UTILS_PKGS = "\
              alsa-utils-speakertest \
              alsa-utils-aseqnet \
              alsa-utils-aseqdump \
+             alsa-utils-aseqsend \
              alsa-utils-alsactl \
              alsa-utils-alsaloop \
              alsa-utils-alsaucm \
@@ -72,6 +73,7 @@ FILES:alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ $
 FILES:alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
 FILES:alsa-utils-aconnect    = "${bindir}/aconnect"
 FILES:alsa-utils-aseqnet     = "${bindir}/aseqnet"
+FILES:alsa-utils-aseqsend    = "${bindir}/aseqsend"
 FILES:alsa-utils-iecset      = "${bindir}/iecset"
 FILES:alsa-utils-alsactl     = "${sbindir}/alsactl */udev/rules.d/90-alsa-restore.rules */*/udev/rules.d/90-alsa-restore.rules ${systemd_unitdir} ${localstatedir}/lib/alsa ${datadir}/alsa/init/"
 FILES:alsa-utils-aseqdump    = "${bindir}/aseqdump"
-- 
2.39.2

[PATCH 32/34] lz4: upgrade 1.9.4 -> 1.10.0

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop most EXTRA_OEMAKE settings as no longer necessary.
(makefiles use weak assignments and shell variables then
take precedence).

License-Update: clarification that it's gpl2-or-later.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lz4/{lz4_1.9.4.bb => lz4_1.10.0.bb}                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-support/lz4/{lz4_1.9.4.bb => lz4_1.10.0.bb} (74%)

diff --git a/meta/recipes-support/lz4/lz4_1.9.4.bb b/meta/recipes-support/lz4/lz4_1.10.0.bb
similarity index 74%
rename from meta/recipes-support/lz4/lz4_1.9.4.bb
rename to meta/recipes-support/lz4/lz4_1.10.0.bb
index 51a854d44a4..40768fb2925 100644
--- a/meta/recipes-support/lz4/lz4_1.9.4.bb
+++ b/meta/recipes-support/lz4/lz4_1.10.0.bb
@@ -2,15 +2,15 @@ SUMMARY = "Extremely Fast Compression algorithm"
 DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems."
 HOMEPAGE = "https://github.com/lz4/lz4"
 
-LICENSE = "BSD-2-Clause | GPL-2.0-only"
+LICENSE = "BSD-2-Clause | GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \
-                    file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \
+                    file://programs/COPYING;md5=492daf447d6db0e5eb344a7922e7ec25 \
+                    file://LICENSE;md5=c111c47e301c2ffe8776729b40b44477 \
                     "
 
 PE = "1"
 
-SRCREV = "5ff839680134437dbf4678f3d0c7b371d84f4964"
+SRCREV = "ebb370ca83af193212df4dcbadcc5d87bc0de2f0"
 
 SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \
 	   file://run-ptest \
@@ -23,7 +23,7 @@ inherit ptest
 
 CVE_STATUS[CVE-2014-4715] = "fixed-version: Fixed in r118, which is larger than the current version."
 
-EXTRA_OEMAKE = "PREFIX=${prefix} CC='${CC}' CFLAGS='${CFLAGS}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} BUILD_STATIC=no"
+EXTRA_OEMAKE = "DESTDIR=${D}"
 
 do_install() {
 	oe_runmake install
-- 
2.39.2

[PATCH 33/34] vte: upgrade 0.74.2 -> 0.76.3

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

lz4 is a new required dependency.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 11 ++++-------
 .../vte/{vte_0.74.2.bb => vte_0.76.3.bb}              |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename meta/recipes-support/vte/{vte_0.74.2.bb => vte_0.76.3.bb} (95%)

diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
index 8934d5f80a6..e2cff6cf764 100644
--- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
+++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
@@ -1,4 +1,4 @@
-From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00 2001
+From b8795dda629614cd842fcba1c4b50be759c20da4 Mon Sep 17 00:00:00 2001
 From: Danilo Spinella <danyspin97@protonmail.com>
 Date: Thu, 21 Mar 2019 14:19:26 +0100
 Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems
@@ -12,11 +12,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 
 [1] https://gitlab.gnome.org/GNOME/vte/issues/72
 ---
- src/widget.cc  | 4 +++
- 1 files changed, 4 insertions(+)
+ src/widget.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/src/widget.cc b/src/widget.cc
-index 07f7cabf..31a77f68 100644
+index b8daa5c..c357960 100644
 --- a/src/widget.cc
 +++ b/src/widget.cc
 @@ -16,6 +16,10 @@
@@ -30,6 +30,3 @@ index 07f7cabf..31a77f68 100644
  #include "config.h"
  
  #include "widget.hh"
--- 
-2.42.0
-
diff --git a/meta/recipes-support/vte/vte_0.74.2.bb b/meta/recipes-support/vte/vte_0.76.3.bb
similarity index 95%
rename from meta/recipes-support/vte/vte_0.74.2.bb
rename to meta/recipes-support/vte/vte_0.76.3.bb
index d8eafde2fb0..515ff228fd4 100644
--- a/meta/recipes-support/vte/vte_0.74.2.bb
+++ b/meta/recipes-support/vte/vte_0.76.3.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \
 "
 
-DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu"
+DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu lz4"
 
 GIR_MESON_OPTION = 'gir'
 GIDOCGEN_MESON_OPTION = "docs"
@@ -19,7 +19,7 @@ GIDOCGEN_MESON_OPTION = "docs"
 inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala
 
 SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
-SRC_URI[archive.sha256sum] = "a535fb2a98fea8a2449cd1a02cccf5190131dddff52e715afdace3feb536eae7"
+SRC_URI[archive.sha256sum] = "f678e94c056f377fd0021214adff5450cb172e9a08b160911181ddff7b7d5d60"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-- 
2.39.2

[PATCH 34/34] cracklib: update 2.9.11 -> 2.10.2

[Alexander Kanavin]

From: Alexander Kanavin <alex@linutronix.de>

Drop endianness patch; upstream resolved the issue via:
https://github.com/cracklib/cracklib/pull/86
https://github.com/cracklib/cracklib/issues/74

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...port-dictionary-byte-order-dependent.patch | 339 ------------------
 ...{cracklib_2.9.11.bb => cracklib_2.10.2.bb} |   3 +-
 2 files changed, 1 insertion(+), 341 deletions(-)
 delete mode 100644 meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
 rename meta/recipes-extended/cracklib/{cracklib_2.9.11.bb => cracklib_2.10.2.bb} (85%)

diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
deleted file mode 100644
index 35229ae8900..00000000000
--- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From aae03b7e626d5f62ab929d51d11352a5a2ff6b2d Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui@cn.fujitsu.com>
-Date: Tue, 9 Jun 2015 11:11:48 +0900
-Subject: [PATCH 1/2] packlib.c: support dictionary byte order dependent
-
-The previous dict files are NOT byte-order independent, in fact they are
-probably ARCHITECTURE SPECIFIC.
-Create the dict files in big endian, and convert to host endian while
-load them. This could fix the endian issue on multiple platform.
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/41]
-
-We can't use the endian.h, htobe* and be*toh functions because they are
-not available on older versions of glibc, such as that found in RHEL
-5.9.
-
-Change to checking endian and directly calling bswap_* as defined in
-byteswap.h.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
----
- lib/packlib.c | 214 +++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 210 insertions(+), 4 deletions(-)
-
-diff --git a/lib/packlib.c b/lib/packlib.c
-index 9396e1d..d0bb181 100644
---- a/lib/packlib.c
-+++ b/lib/packlib.c
-@@ -16,6 +16,12 @@
- #ifdef HAVE_STDINT_H
- #include <stdint.h>
- #endif
-+
-+#ifndef _BSD_SOURCE
-+#define _BSD_SOURCE             /* See feature_test_macros(7) */
-+#endif
-+#include <endian.h>
-+#include <byteswap.h>
- #include "packer.h"
- 
- #define DEBUG 0
-@@ -43,6 +49,185 @@ typedef struct
-     char data_get[NUMWORDS][MAXWORDLEN];
- } PWDICT64;
- 
-+enum{
-+    en_is32,
-+    en_is64
-+};
-+
-+static int
-+IheaderHostToBigEndian(char *pHeader, int nBitType)
-+{
-+    if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader;
-+
-+        pHeader64->pih_magic = bswap_64(pHeader64->pih_magic);
-+        pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords);
-+        pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen);
-+        pHeader64->pih_pad = bswap_16(pHeader64->pih_pad);
-+
-+#if DEBUG
-+        printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n",
-+          pHeader64->pih_magic, pHeader64->pih_numwords,
-+          pHeader64->pih_blocklen, pHeader64->pih_pad);
-+#endif
-+    }
-+    else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        struct pi_header *pHeader32 = (struct pi_header*)pHeader;
-+
-+        pHeader32->pih_magic = bswap_32(pHeader32->pih_magic);
-+        pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords);
-+        pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen);
-+        pHeader32->pih_pad = bswap_16(pHeader32->pih_pad);
-+
-+#if DEBUG
-+        printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n",
-+          pHeader32->pih_magic, pHeader32->pih_numwords,
-+          pHeader32->pih_blocklen, pHeader32->pih_pad);
-+#endif
-+    }
-+    else if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
-+        return (-1);
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+IheaderBigEndianToHost(char *pHeader, int nBitType)
-+{
-+    if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        struct pi_header64 *pHeader64 = (struct pi_header64*)pHeader;
-+
-+        pHeader64->pih_magic = bswap_64(pHeader64->pih_magic);
-+        pHeader64->pih_numwords = bswap_64(pHeader64->pih_numwords);
-+        pHeader64->pih_blocklen = bswap_16(pHeader64->pih_blocklen);
-+        pHeader64->pih_pad = bswap_16(pHeader64->pih_pad);
-+
-+#if DEBUG
-+        printf("Header64: magic %x, numwords %x, blocklen %x, pad %x\n",
-+          pHeader64->pih_magic, pHeader64->pih_numwords,
-+          pHeader64->pih_blocklen, pHeader64->pih_pad);
-+#endif
-+    }
-+    else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        struct pi_header *pHeader32 = (struct pi_header*)pHeader;
-+
-+        pHeader32->pih_magic = bswap_32(pHeader32->pih_magic);
-+        pHeader32->pih_numwords = bswap_32(pHeader32->pih_numwords);
-+        pHeader32->pih_blocklen = bswap_16(pHeader32->pih_blocklen);
-+        pHeader32->pih_pad = bswap_16(pHeader32->pih_pad);
-+
-+#if DEBUG
-+        printf("Header32: magic %x, numwords %x, blocklen %x, pad %x\n",
-+            pHeader32->pih_magic, pHeader32->pih_numwords,
-+            pHeader32->pih_blocklen, pHeader32->pih_pad);
-+#endif
-+    }
-+    else if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
-+        return (-1);
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+HwmsHostToBigEndian(char *pHwms, int nLen,int nBitType)
-+{
-+    int i = 0;
-+
-+    if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        uint64_t *pHwms64 = (uint64_t*)pHwms;
-+
-+        for (i = 0; i < nLen / sizeof(uint64_t); i++)
-+        {
-+            *pHwms64 = bswap_64(*pHwms64);
-+            *pHwms64++;
-+        }
-+
-+    }
-+    else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        uint32_t *pHwms32 = (uint32_t*)pHwms;
-+
-+        for (i = 0; i < nLen / sizeof(uint32_t); i++)
-+        {
-+            *pHwms32 = bswap_32(*pHwms32);
-+            *pHwms32++;
-+        }
-+
-+    }
-+    else if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
-+        return (-1);
-+    }
-+
-+#if DEBUG
-+    for (i = 0; i < nLen; i+=8)
-+    {
-+        printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n",
-+            nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF,
-+            pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF,
-+            pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF);
-+    }
-+#endif
-+
-+    return 0;
-+}
-+
-+static int
-+HwmsBigEndianToHost(char *pHwms, int nLen, int nBitType)
-+{
-+    int i = 0;
-+
-+    if (nBitType == en_is64 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        uint64_t *pHwms64 = (uint64_t*)pHwms;
-+
-+        for (i = 0; i < nLen / sizeof(uint64_t); i++)
-+        {
-+            *pHwms64++ = bswap_64(*pHwms64);
-+        }
-+
-+    }
-+    else if (nBitType == en_is32 && __BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        uint32_t *pHwms32 = (uint32_t*)pHwms;
-+
-+        for (i = 0; i < nLen / sizeof(uint32_t); i++)
-+        {
-+            *pHwms32 = bswap_32(*pHwms32);
-+            *pHwms32++;
-+        }
-+
-+    }
-+    else if (__BYTE_ORDER == __LITTLE_ENDIAN)
-+    {
-+        fprintf(stderr, "Neither 32 or 64: %d\n", nBitType);
-+        return (-1);
-+    }
-+
-+#if DEBUG
-+    for (i = 0; i < nLen; i+=8)
-+    {
-+        printf("hwms%s: %02X %02X %02X %02X %02X %02X %02X %02X\n",
-+            nBitType==en_is64?"64":"32", pHwms[i+0]&0xFF, pHwms[i+1]&0xFF,
-+            pHwms[i+2]&0xFF, pHwms[i+3]&0xFF, pHwms[i+4]&0xFF,
-+            pHwms[i+5]&0xFF, pHwms[i+6]&0xFF, pHwms[i+7]&0xFF);
-+    }
-+#endif
-+
-+    return 0;
-+}
- 
- static int
- _PWIsBroken64(FILE *ifp)
-@@ -55,6 +240,7 @@ _PWIsBroken64(FILE *ifp)
-        return 0;
-     }
- 
-+    IheaderBigEndianToHost((char *) &pdesc64.header, en_is64);
-     return (pdesc64.header.pih_magic == PIH_MAGIC);
- }
- 
-@@ -147,7 +333,11 @@ PWOpen(prefix, mode)
- 	pdesc.header.pih_blocklen = NUMWORDS;
- 	pdesc.header.pih_numwords = 0;
- 
--	fwrite((char *) &pdesc.header, sizeof(pdesc.header), 1, ifp);
-+	struct pi_header tmpheader32;
-+
-+	memcpy(&tmpheader32,  &pdesc.header, sizeof(pdesc.header));
-+	IheaderHostToBigEndian((char *) &tmpheader32, en_is32);
-+	fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, ifp);
-     } else
-     {
- 	pdesc.flags &= ~PFOR_WRITE;
-@@ -171,6 +361,7 @@ PWOpen(prefix, mode)
- 	    return NULL;
- 	}
- 
-+        IheaderBigEndianToHost((char *) &pdesc.header, en_is32);
-         if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0))
-         {
-             /* uh-oh. either a broken "64-bit" file or a garbage file. */
-@@ -193,6 +384,7 @@ PWOpen(prefix, mode)
- 		}
-                 return NULL;
-             }
-+            IheaderBigEndianToHost((char *) &pdesc64.header, en_is64);
-             if (pdesc64.header.pih_magic != PIH_MAGIC)
-             {
-                 /* nope, not "64-bit" after all */
-@@ -288,6 +480,7 @@ PWOpen(prefix, mode)
-                 {
-                     pdesc.flags &= ~PFOR_USEHWMS;
-                 }
-+                HwmsBigEndianToHost((char*)pdesc64.hwms, sizeof(pdesc64.hwms), en_is64);
-                 for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++)
-                 {
-                     pdesc.hwms[i] = pdesc64.hwms[i];
-@@ -297,6 +490,7 @@ PWOpen(prefix, mode)
- 	    {
- 		pdesc.flags &= ~PFOR_USEHWMS;
- 	    }
-+	    HwmsBigEndianToHost((char*)pdesc.hwms, sizeof(pdesc.hwms), en_is32);
- #if DEBUG
-             for (i=1; i<=0xff; i++)
-             {
-@@ -330,7 +524,11 @@ PWClose(pwp)
- 	    return (-1);
- 	}
- 
--	if (!fwrite((char *) &pwp->header, sizeof(pwp->header), 1, pwp->ifp))
-+	struct pi_header tmpheader32;
-+
-+	memcpy(&tmpheader32,  &pwp->header, sizeof(pwp->header));
-+	IheaderHostToBigEndian((char *) &tmpheader32, en_is32);
-+	if (!fwrite((char *) &tmpheader32, sizeof(tmpheader32), 1, pwp->ifp))
- 	{
- 	    fprintf(stderr, "index magic fwrite failed\n");
- 	    return (-1);
-@@ -349,7 +547,12 @@ PWClose(pwp)
- 	    	printf("hwm[%02x] = %d\n", i, pwp->hwms[i]);
- #endif
- 	    }
--	    fwrite(pwp->hwms, 1, sizeof(pwp->hwms), pwp->wfp);
-+
-+	    PWDICT tmp_pwp;
-+
-+	    memcpy(&tmp_pwp, pwp, sizeof(PWDICT));
-+	    HwmsHostToBigEndian((char *)tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32);
-+	    fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp);
- 	}
-     }
- 
-@@ -403,7 +606,8 @@ PutPW(pwp, string)
- 
- 	datum = (uint32_t) ftell(pwp->dfp);
- 
--	fwrite((char *) &datum, sizeof(datum), 1, pwp->ifp);
-+	uint32_t tmpdatum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum;
-+	fwrite((char *) &tmpdatum, sizeof(tmpdatum), 1, pwp->ifp);
- 
- 	fputs(pwp->data_put[0], pwp->dfp);
- 	putc(0, (FILE*) pwp->dfp);
-@@ -462,6 +666,7 @@ GetPW(pwp, number)
-            perror("(index fread failed)");
-            return NULL;
-        }
-+       datum64 = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_64(datum64) : datum64;
-        datum = datum64;
-     } else {
-        if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
-@@ -475,6 +680,7 @@ GetPW(pwp, number)
-            perror("(index fread failed)");
-            return NULL;
-        }
-+       datum = (__BYTE_ORDER == __LITTLE_ENDIAN) ? bswap_32(datum) : datum;
-     }
- 
- 	int r = 1;
--- 
-2.20.1
-
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb b/meta/recipes-extended/cracklib/cracklib_2.10.2.bb
similarity index 85%
rename from meta/recipes-extended/cracklib/cracklib_2.9.11.bb
rename to meta/recipes-extended/cracklib/cracklib_2.10.2.bb
index 34ef2b65a11..2c913da1527 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.11.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.10.2.bb
@@ -10,10 +10,9 @@ DEPENDS = "cracklib-native zlib"
 EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
 
 SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \
-           file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
            "
 
-SRCREV = "4cf5125250c6325ef0a2dc085eabff875227edc3"
+SRCREV = "e5211fc1d2b435884a2bb77001e107489285296d"
 S = "${WORKDIR}/git/src"
 
 inherit autotools gettext
-- 
2.39.2