74 files changed, 1618 insertions, 1264 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch
deleted file mode 100644
index 30aeef5817..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001
-From: Michael Opdenacker <michael.opdenacker@bootlin.com>
-Date: Tue, 30 Jan 2024 14:24:25 +0100
-Subject: [PATCH] topology: correct version script path
-From: Jan Palus <jpalus@fastmail.com>
-contrary to libasound, version script for libatopology is a regular
-source file. while it's often the case that $(builddir) and $(srcdir)
-point to the same directory, they don't always have to. therefore path
-needs to point explicitly to $(srcdir) for Versions script in topology
-Closes: https://github.com/alsa-project/alsa-lib/pull/383
-Fixes: GH-382
-Fixes: dc7da761f3a2 ("topology: separate Versions linker script")
-Signed-off-by: Jan Palus <jpalus@fastmail.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917]
---
- src/topology/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
-index 04299588..e0b78373 100644
--- a/src/topology/Makefile.am
-+++ b/src/topology/Makefile.am
-@@ -2,7 +2,7 @@ EXTRA_DIST = Versions
- COMPATNUM=@LIBTOOL_VERSION_INFO@
- 
- if VERSIONED_SYMBOLS
-VSYMS = -Wl,--version-script=Versions
-+VSYMS = -Wl,--version-script=$(srcdir)/Versions
- else
- VSYMS =
- endif
-- 
-2.34.1
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
index c212b17aa3..41a42f9ecc 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.14.bb
@@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
                    file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \
                    "
-SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-           file://0001-topology-correct-version-script-path.patch \
+SRC_URI[sha256sum] = "be9c88a0b3604367dd74167a2b754a35e142f670292ae47a2fdef27a2ee97a32"
-           "
-SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d"
 inherit autotools pkgconfig
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch
deleted file mode 100644
index ff7745d637..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam_av.c-Include-missing-string.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b01b176a665ba65979d74922955f51dc4888a713 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 23 Aug 2022 15:21:16 -0700
-Subject: [PATCH] arcam_av.c: Include missing string.h
-bzero() function needs this header to be included
-Upstream-Status: Submitted [https://github.com/alsa-project/alsa-plugins/pull/47]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- arcam-av/arcam_av.c | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c
-index 63f9b4e..29fc537 100644
--- a/arcam-av/arcam_av.c
-+++ b/arcam-av/arcam_av.c
-@@ -27,6 +27,7 @@
- #include <signal.h>
- #include <stddef.h>
- #include <stdio.h>
-+#include <string.h>
- #include <termios.h>
- #include <unistd.h>
- 
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.12.bb
index 9500462d5c..7db0c4d677 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.2.7.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.2.12.bb
@@ -5,6 +5,7 @@ They are used while configuring ALSA in the .asoundrc file."
 HOMEPAGE = "http://alsa-project.org"
 BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking"
 SECTION = "multimedia"
+CVE_PRODUCT = "alsa"
 # The primary license of alsa-plugins is LGPL-2.1-only.
 #
@@ -19,13 +20,11 @@ LICENSE = "LGPL-2.1-only & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
                    file://COPYING.GPL;md5=59530bdf33659b29e73d4adb9f9f6552 \
                    file://m4/attributes.m4;endline=33;md5=bb8c6b2a67ac15156961e242fec33e50 \
-                    file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
+                    file://rate/rate_samplerate.c;endline=35;md5=07fcfc9e83a7159ad14a7196ecdc7d48 \
                    "
-SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2 \
+SRC_URI = "https://www.alsa-project.org/files/pub/plugins/${BP}.tar.bz2"
-           file://0001-arcam_av.c-Include-missing-string.h.patch \
+SRC_URI[sha256sum] = "7bd8a83d304e8e2d86a25895d8dcb0ef0245a8df32e271959cdbdc6af39b66f2"
-           "
-SRC_URI[sha256sum] = "8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511"
 DEPENDS += "alsa-lib"
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb
index 53868041c0..751d9e8a76 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f65
 SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9"
+SRC_URI[sha256sum] = "faef6fdd39ec79c9a5473dc63aa1b6331bf7664a9d452a0a8198cec7016cbc6f"
 inherit autotools-brokensep pkgconfig
 # brokensep as as10k1 (and probably more) fail out of tree
diff --git a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb
index ce1a42c9b8..d9ef831937 100644
--- a/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-ucm-conf_1.2.14.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=20d74d74db9741697903372ad001d3b4"
 SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "387c01cf30e2a1676d7b8f72b2681cf219abca70dd1ec2a9e33add5bf3feae81"
+SRC_URI[sha256sum] = "32e9809f592d92b978aa1032e35293c33b8d0f1ec475f937022c3ee9a3069c21"
 # Something went wrong at upstream tarballing
 inherit allarch
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
index e598fac9f8..3cbb9b464b 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.2.11.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.2.14.bb
@@ -24,9 +24,8 @@ PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev
 PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 # 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 = "https://www.alsa-project.org/files/pub/utils/alsa-utils-${PV}.tar.bz2"
-           "
+SRC_URI[sha256sum] = "0794c74d33fed943e7c50609c13089e409312b6c403d6ae8984fc429c0960741"
-SRC_URI[sha256sum] = "9ac6ca3a883f151e568dcf979b8d2e5cbecc51b819bb0e6bb8a2e9b34cc428a7"
 # On build machines with python-docutils (not python3-docutils !!) installed
 # rst2man (not rst2man.py) is detected and compile fails with
@@ -51,6 +50,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 \
@@ -69,9 +69,10 @@ FILES:alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord ${bindir}/axfe
 FILES:alsa-utils-amixer      = "${bindir}/amixer"
 FILES:alsa-utils-alsamixer   = "${bindir}/alsamixer"
 FILES:alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/speaker-test/"
-FILES:alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+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"
@@ -118,7 +119,6 @@ do_install() {
        rm -rf ${D}/unwanted
 }
 PROVIDES = "alsa-utils-alsaconf alsa-utils-scripts"
 RDEPENDS:${PN}-scripts += "bash"
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb
index aa59755034..4314ab9f31 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.1.1.bb
@@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz"
-SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
+SRC_URI[sha256sum] = "733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1"
 # https://nvd.nist.gov/vuln/detail/CVE-2023-39018
 # https://github.com/bramp/ffmpeg-cli-wrapper/issues/291
@@ -42,7 +42,8 @@ ARM_INSTRUCTION_SET:armv6 = "arm"
 # libpostproc was previously packaged from a separate recipe
 PROVIDES = "libav libpostproc"
-DEPENDS = "nasm-native"
+DEPENDS:append:x86 = " nasm-native"
+DEPENDS:append:x86-64 = " nasm-native"
 inherit autotools pkgconfig
@@ -124,6 +125,8 @@ EXTRA_OECONF = " \
 "
 EXTRA_OECONF:append:linux-gnux32 = " --disable-asm"
+# --enable-pic is used and x86 assembly is not PIC on x86
+EXTRA_OECONF:append:x86 = " --disable-asm"
 EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r6', '--disable-mips64r2 --disable-mips32r2', '', d)}"
 EXTRA_OECONF += "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa64r2', '--disable-mips64r6 --disable-mips32r6', '', d)}"
@@ -137,10 +140,6 @@ EXTRA_OECONF:append:powerpc = " --extra-libs=-latomic"
 EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
 EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
-# gold crashes on x86, another solution is to --disable-asm but thats more hacky
-# ld.gold: internal error in relocate_section, at ../../gold/i386.cc:3684
-LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd ', '', d)}"
 EXTRA_OEMAKE = "V=1"
@@ -164,7 +163,8 @@ PACKAGES =+ "libavcodec \
             libavutil \
             libpostproc \
             libswresample \
-             libswscale"
+             libswscale \
+             ${PN}-examples"
 FILES:libavcodec = "${libdir}/libavcodec${SOLIBS}"
 FILES:libavdevice = "${libdir}/libavdevice${SOLIBS}"
@@ -174,13 +174,6 @@ FILES:libavutil = "${libdir}/libavutil${SOLIBS}"
 FILES:libpostproc = "${libdir}/libpostproc${SOLIBS}"
 FILES:libswresample = "${libdir}/libswresample${SOLIBS}"
 FILES:libswscale = "${libdir}/libswscale${SOLIBS}"
+FILES:${PN}-examples = "${datadir}/${BPN}/examples"
-# ffmpeg disables PIC on some platforms (e.g. x86-32)
+CVE_PRODUCT = "ffmpeg libswresample libavcodec"
-INSANE_SKIP:${MLPREFIX}libavcodec = "textrel"
-INSANE_SKIP:${MLPREFIX}libavdevice = "textrel"
-INSANE_SKIP:${MLPREFIX}libavfilter = "textrel"
-INSANE_SKIP:${MLPREFIX}libavformat = "textrel"
-INSANE_SKIP:${MLPREFIX}libavutil = "textrel"
-INSANE_SKIP:${MLPREFIX}libswscale = "textrel"
-INSANE_SKIP:${MLPREFIX}libswresample = "textrel"
-INSANE_SKIP:${MLPREFIX}libpostproc = "textrel"
diff --git a/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch b/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch
new file mode 100644
index 0000000000..0e6be8c8d2
--- /dev/null
+++ b/meta/recipes-multimedia/flac/flac/0001-API-documentation-replace-modules.html-by-topics.htm.patch
@@ -0,0 +1,45 @@
+From 6ad5b6a9ce81383ef75e6f7b88f54d3c29294e63 Mon Sep 17 00:00:00 2001
+From: Michael Opdenacker <michael.opdenacker@rootcommit.com>
+Date: Sat, 15 Mar 2025 11:50:08 +0100
+Subject: [PATCH] API documentation: replace modules.html by topics.html
+This fixes the issue reported on
+https://lists.xiph.org/pipermail/flac-dev/2025-February/006696.html
+Newer Doxygen versions call what was previously api/modules.html
+api/topics.html instead.
+Signed-off-by: Michael Opdenacker <michael.opdenacker@rootcommit.com>
+Suggested-by: Christian Weisgerber <naddy@mips.inka.de>
+Upstream-Status: Submitted [https://github.com/xiph/flac/pull/824]
+---
+ configure.ac       | 2 +-
+ include/FLAC/all.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index 8eb82320..74295eec 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -296,7 +296,7 @@ if test "x$enable_doxygen_docs" != xfalse ; then
+ fi
+ AM_CONDITIONAL(FLaC__HAS_DOXYGEN, test -n "$DOXYGEN")
+ 
+-if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/modules.html" ; then
+if test ! -n "$DOXYGEN" && test -f "$srcdir/doc/FLAC.tag" && test -f "$srcdir/doc/api/topics.html" ; then
+        HAS_PREBUILT_DOXYGEN=yes
+ fi
+ AM_CONDITIONAL(FLaC__HAS_PREBUILT_DOXYGEN, test "x$HAS_PREBUILT_DOXYGEN" = xyes)
+diff --git a/include/FLAC/all.h b/include/FLAC/all.h
+index f29aa010..0be26fd7 100644
+--- a/include/FLAC/all.h
+++ b/include/FLAC/all.h
+@@ -102,7 +102,7 @@
+  * \section getting_started Getting Started
+  *
+  * A good starting point for learning the API is to browse through
+- * the <A HREF="modules.html">modules</A>.  Modules are logical
+ * the <A HREF="topics.html">modules</A>.  Modules are logical
+  * groupings of related functions or classes, which correspond roughly
+  * to header files or sections of header files.  Each module includes a
+  * detailed description of the general usage of its functions or
diff --git a/meta/recipes-multimedia/flac/flac_1.4.3.bb b/meta/recipes-multimedia/flac/flac_1.5.0.bb
index d4e463cda5..d6df801aec 100644
--- a/meta/recipes-multimedia/flac/flac_1.4.3.bb
+++ b/meta/recipes-multimedia/flac/flac_1.5.0.bb
@@ -3,17 +3,20 @@ DESCRIPTION = "FLAC stands for Free Lossless Audio Codec, a lossless audio compr
 HOMEPAGE = "https://xiph.org/flac/"
 BUGTRACKER = "https://github.com/xiph/flac/issues"
 SECTION = "libs"
-LICENSE = "GFDL-1.2 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
+LICENSE = "GFDL-1.3 & GPL-2.0-or-later & LGPL-2.1-or-later & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=ad1419ecc56e060eccf8184a87c4285f \
+LIC_FILES_CHKSUM = "file://COPYING.FDL;md5=802e79e394e372d01e863e3f4058cf40 \
-                    file://src/Makefile.am;beginline=1;endline=17;md5=b1dab2704be7f01bfbd9b7f6d5f000a9 \
+                    file://src/Makefile.am;beginline=1;endline=17;md5=9c882153132df8f3a1cb1a8ca1f2350f \
                    file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://src/flac/main.c;beginline=1;endline=18;md5=23099119c034d894bd1bf7ef5bd22101 \
+                    file://src/flac/main.c;beginline=1;endline=18;md5=1e826b5083ba1e028852fe7ceec6a8ad \
                    file://COPYING.LGPL;md5=fbc093901857fcd118f065f900982c24 \
-                    file://COPYING.Xiph;md5=0c90e41ab2fa7e69ca9391330d870221 \
+                    file://COPYING.Xiph;md5=78a131b2ea50675d245d280ccc34f8b6 \
-                    file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea"
+                    file://include/FLAC/all.h;beginline=65;endline=70;md5=39aaf5e03c7364363884c8b8ddda8eea \
+                    "
-SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz"
+SRC_URI = "http://downloads.xiph.org/releases/flac/${BP}.tar.xz \
-SRC_URI[sha256sum] = "6c58e69cd22348f441b861092b825e591d0b822e106de6eb0ee4d05d27205b70"
+           file://0001-API-documentation-replace-modules.html-by-topics.htm.patch"
+SRC_URI[sha256sum] = "f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920"
 CVE_PRODUCT = "libflac flac"
@@ -21,7 +24,6 @@ inherit autotools gettext
 EXTRA_OECONF = "--disable-oggtest \
                --without-libiconv-prefix \
-                ac_cv_prog_NASM="" \
                "
 PACKAGECONFIG ??= " \
@@ -34,3 +36,10 @@ PACKAGES += "libflac libflac++"
 FILES:${PN} = "${bindir}/*"
 FILES:libflac = "${libdir}/libFLAC.so.*"
 FILES:libflac++ = "${libdir}/libFLAC++.so.*"
+do_install:append() {
+    # make the links in documentation relative to avoid buildpaths reproducibility problem
+    sed -i "s#${S}/include#${includedir}#g" ${D}${docdir}/flac/FLAC.tag ${D}${docdir}/flac/api/*.html
+    # there is also one root path without trailing slash
+    sed -i "s#${S}#/#g" ${D}${docdir}/flac/api/*.html
+}
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
index 21e30d6d46..aeb296aa96 100644
--- a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch
@@ -1,4 +1,4 @@
-From 0c73b8131efba63c5cd37ea8c7551434c3b57304 Mon Sep 17 00:00:00 2001
+From 9ed608c901955b0906aac102d5d7ab06accee60e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 9 Sep 2018 17:38:10 -0700
 Subject: [PATCH] connect has a different signature on musl
@@ -8,10 +8,9 @@ API has a different signature, this patch fixes this so it can compile
 on musl, the functionality should remain same as it is immediately
 typcasted to struct sockaddr_in* type inside the function before use
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8767]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 validate/plugins/fault_injection/socket_interposer.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.26.3.bb
index 2be406192f..f107af110b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.26.3.bb
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}
           file://0001-connect-has-a-different-signature-on-musl.patch \
           "
-SRC_URI[sha256sum] = "07766425ecb5bf857ab5ad3962321c55cd89f9386b720843f9df71c0a455eb9b"
+SRC_URI[sha256sum] = "4fde19c3c144834f8cb05c2ca3f14b3a50d395bad203d17f98a6e70c1672f2ba"
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
@@ -37,6 +37,7 @@ EXTRA_OEMESON += " \
    -Ddoc=disabled \
    -Ddebug_viewer=disabled \
    -Dtests=disabled \
+    -Ddots_viewer=disabled \
    -Dvalidate=enabled \
    ${@gettext_oemeson(d)} \
 "
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
index ab93c13244..828c87dc9a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
@@ -13,25 +13,25 @@ https://bugzilla.gnome.org/show_bug.cgi?id=777827
 playback/player/gtk/meson.build      | 1 +
 2 files changed, 2 insertions(+)
-diff --git a/playback/player/gst-play/meson.build b/playback/player/gst-play/meson.build
+Index: gst-examples/playback/player/gst-play/meson.build
-index 8ec021d..977cc5c 100644
+===================================================================
--- a/playback/player/gst-play/meson.build
+--- gst-examples.orig/playback/player/gst-play/meson.build
-+++ b/playback/player/gst-play/meson.build
+++ gst-examples/playback/player/gst-play/meson.build
 @@ -2,5 +2,6 @@ executable('gst-play',
     ['gst-play.c',
      'gst-play-kb.c',
      'gst-play-kb.h'],
 +    install: true,
-     dependencies : [gst_dep, gstplayer_dep, m_dep])
+     dependencies : [gst_dep, dependency('gstreamer-play-1.0'), m_dep])
 
-diff --git a/playback/player/gtk/meson.build b/playback/player/gtk/meson.build
+Index: gst-examples/playback/player/gtk/meson.build
-index f7a7419..6281130 100644
+===================================================================
--- a/playback/player/gtk/meson.build
+--- gst-examples.orig/playback/player/gtk/meson.build
-+++ b/playback/player/gtk/meson.build
+++ gst-examples/playback/player/gtk/meson.build
-@@ -13,5 +13,6 @@ if gtk_dep.found()
+@@ -20,5 +20,6 @@ if gtk_dep.found()
-         gtk_play_resources,
        'gtk-video-renderer.h',
        'gtk-video-renderer.c'],
-+    install: true,
+       c_args :  extra_c_args,
-       dependencies : [glib_dep, gobject_dep, gmodule_dep, gst_dep, gsttag_dep, gstplayer_dep, gtk_dep, x11_dep])
+      install: true,
+       dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep])
 endif
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb
index 02282ac5d9..8835b7d97b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.26.3.bb
@@ -5,25 +5,25 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-examples/-/issues"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://playback/player/gtk/gtk-play.c;beginline=1;endline=20;md5=f8c72dae3d36823ec716a9ebcae593b9"
-DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 libsoup-2.4 json-glib glib-2.0-native"
+DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gtk+3 json-glib glib-2.0-native"
-SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gst-examples.git;protocol=https;branch=1.18 \
+SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.26;tag=${PV} \
           file://0001-Make-player-examples-installable.patch \
           file://gst-player.desktop \
           "
-SRCREV = "70e4fcf4fc8ae19641aa990de5f37d758cdfcea4"
+SRCREV = "87bc0c6e949e3dcc440658f78ef52aa8088cb62f"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 inherit meson pkgconfig features_check
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 do_install:append() {
-        install -m 0644 -D ${WORKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
+        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
 }
 RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.3.bb
index f3287efa96..4125fdf31f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.3.bb
@@ -12,9 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                    "
 SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6b13dcc9332ef27a7c1e7005c0196883874f91622f8aa6e52f218b05b15d2bf5"
+SRC_URI[sha256sum] = "3ada7e50a3b9b8ba3e405b14c4021e25fbb10379f77d2ce490aa16523ed2724d"
-S = "${WORKDIR}/gst-libav-${PV}"
+S = "${UNPACKDIR}/gst-libav-${PV}"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
@@ -22,6 +22,7 @@ inherit meson pkgconfig upstream-version-is-even
 EXTRA_OEMESON += " \
    -Dtests=disabled \
+    -Ddoc=disabled \
 "
 FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index 6cc11e1928..dcb5c0e6b5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
@@ -7,8 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
-DEPENDS_UGLY="${@'gstreamer1.0-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS_UGLY = "${@'gstreamer1.0-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
-DEPENDS_BAD="${@'gstreamer1.0-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS_BAD = "${@'gstreamer1.0-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
 PACKAGES = "\
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb
deleted file mode 100644
index 97348fb398..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.11.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-SUMMARY = "OpenMAX IL plugins for GStreamer"
-DESCRIPTION = "Wraps available OpenMAX IL components and makes them available as standard GStreamer elements."
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-SECTION = "multimedia"
-LICENSE = "LGPL-2.1-or-later"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f"
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
-SRC_URI[sha256sum] = "18dfdf5f6b773d67e62a315c6cf6247da320b83603a5819493f53c69ed2eeef6"
-S = "${WORKDIR}/gst-omx-${PV}"
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad virtual/libomxil"
-inherit meson pkgconfig upstream-version-is-even
-GSTREAMER_1_0_OMX_TARGET ?= "bellagio"
-GSTREAMER_1_0_OMX_CORE_NAME ?= "${libdir}/libomxil-bellagio.so.0"
-EXTRA_OEMESON += "-Dtarget=${GSTREAMER_1_0_OMX_TARGET}"
-python __anonymous () {
-    omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET")
-    if omx_target in ['generic', 'bellagio']:
-        # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,#
-        # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros);
-        # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this
-        d.appendVar("CFLAGS", " -I${S}/omx/openmax")
-    elif omx_target == "rpi":
-        # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific
-        d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH"))
-}
-set_omx_core_name() {
-        sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}${sysconfdir}/xdg/gstomx.conf"
-}
-do_install[postfuncs] += " set_omx_core_name "
-FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
-VIRTUAL-RUNTIME_libomxil ?= "libomxil"
-RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_libomxil}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
index a57fcd7d21..4dd9febbf6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch
@@ -1,4 +1,4 @@
-From 8be0c6ac60c96e87d8aa443be9c431844dc3d92a Mon Sep 17 00:00:00 2001
+From 9456674cea4a933d5fbc24230d307fe0f52588f3 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 26 Jan 2016 15:16:01 -0800
 Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
@@ -6,13 +6,12 @@ Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
 Upstream-Status: Pending
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 ---
 gst-libs/gst/codecparsers/gstvc1parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
-index 2c60ced..e8226d8 100644
+index f9af175..6661e2e 100644
 --- a/gst-libs/gst/codecparsers/gstvc1parser.c
 +++ b/gst-libs/gst/codecparsers/gstvc1parser.c
 @@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
index 6509a293b7..e6ae7f4bfe 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch
@@ -1,4 +1,4 @@
-From 426ee79adeecc24605426030a486d7c5a755048c Mon Sep 17 00:00:00 2001
+From dd2b92fb70fed2799809c423fea79221a3e17108 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Wed, 3 Feb 2016 18:05:41 -0800
 Subject: [PATCH] avoid including <sys/poll.h> directly
@@ -8,13 +8,12 @@ musl libc generates warnings if <sys/poll.h> is included directly.
 Upstream-Status: Pending
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 ---
 sys/dvb/gstdvbsrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
-index b8e5b1a..5bca6e5 100644
+index 33ee3ff..b8ddea9 100644
 --- a/sys/dvb/gstdvbsrc.c
 +++ b/sys/dvb/gstdvbsrc.c
 @@ -98,7 +98,7 @@
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
index 50a3143eca..d49cf5bd89 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
@@ -1,4 +1,4 @@
-From e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001
+From 11a08e3f3135b649b68714c77670c37559f3a33c Mon Sep 17 00:00:00 2001
 From: Andrey Zhizhikin <andrey.z@gmail.com>
 Date: Mon, 27 Jan 2020 10:22:35 +0000
 Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
@@ -12,22 +12,21 @@ Upstream-Status: Inappropriate [OE-specific]
 Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
- ext/opencv/meson.build | 3 +++
+ gst-libs/gst/opencv/meson.build | 3 +++
 1 file changed, 3 insertions(+)
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
+diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
-index 37e2015..326f737 100644
+index 64e913e..42a0958 100644
--- a/ext/opencv/meson.build
+--- a/gst-libs/gst/opencv/meson.build
-+++ b/ext/opencv/meson.build
+++ b/gst-libs/gst/opencv/meson.build
-@@ -87,6 +87,9 @@ if opencv_found
+@@ -61,6 +61,9 @@ gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
-   opencv_prefix = opencv_dep.get_variable('prefix')
+ # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
-   gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
+ gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral'])
 
-+  pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
+pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
-+  opencv_prefix = pkgconf_sysroot + opencv_prefix
+opencv_prefix = pkgconf_sysroot + opencv_prefix
 +
-   # Check the data dir used by opencv for its xml data files
+ # Check the data dir used by opencv for its xml data files
-   # Use prefix from pkg-config to be compatible with cross-compilation
+ # Use prefix from pkg-config to be compatible with cross-compilation
-   r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
+ fsmod = import('fs')
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.3.bb
index 523ee7a5ae..12992057e7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.3.bb
@@ -10,9 +10,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
           file://0002-avoid-including-sys-poll.h-directly.patch \
           file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
           "
-SRC_URI[sha256sum] = "808d3b33fc4c71aeb2561c364a87c2e8a3e2343319a83244c8391be4b09499c8"
+SRC_URI[sha256sum] = "95c48dacaf14276f4e595f4cbca94b3cfebfc22285e765e2aa56d0a7275d7561"
-S = "${WORKDIR}/gst-plugins-bad-${PV}"
+S = "${UNPACKDIR}/gst-plugins-bad-${PV}"
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -28,10 +28,11 @@ PACKAGECONFIG ??= " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \
    bz2 closedcaption curl dash dtls hls openssl sbc smoothstreaming \
-    sndfile ttml uvch264 webp \
+    sndfile ttml uvch264 webp analytics \
    ${@bb.utils.contains('TUNE_FEATURES', 'mx32', '', 'rsvg', d)} \
 "
+PACKAGECONFIG[analytics]       = "-Danalyticsoverlay=enabled,-Danalyticsoverlay=disabled,"
 PACKAGECONFIG[aom]             = "-Daom=enabled,-Daom=disabled,aom"
 PACKAGECONFIG[assrender]       = "-Dassrender=enabled,-Dassrender=disabled,libass"
 PACKAGECONFIG[avtp]            = "-Davtp=enabled,-Davtp=disabled,libavtp"
@@ -46,6 +47,7 @@ PACKAGECONFIG[dtls]            = "-Ddtls=enabled,-Ddtls=disabled,openssl"
 PACKAGECONFIG[faac]            = "-Dfaac=enabled,-Dfaac=disabled,faac"
 PACKAGECONFIG[faad]            = "-Dfaad=enabled,-Dfaad=disabled,faad2"
 PACKAGECONFIG[fluidsynth]      = "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth"
+PACKAGECONFIG[gtk3]            = "-Dgtk3=enabled,-Dgtk3=disabled,gtk3+"
 PACKAGECONFIG[hls]             = "-Dhls=enabled,-Dhls=disabled,"
 # Pick atleast one crypto backend below when enabling hls
 PACKAGECONFIG[nettle]          = "-Dhls-crypto=nettle,,nettle"
@@ -60,7 +62,7 @@ PACKAGECONFIG[libde265]        = "-Dlibde265=enabled,-Dlibde265=disabled,libde26
 PACKAGECONFIG[libssh2]         = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2"
 PACKAGECONFIG[lcms2]           = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms"
 PACKAGECONFIG[modplug]         = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug"
-PACKAGECONFIG[msdk]            = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu"
+PACKAGECONFIG[msdk]            = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,vpl-gpu-rt"
 PACKAGECONFIG[neon]            = "-Dneon=enabled,-Dneon=disabled,neon"
 PACKAGECONFIG[openal]          = "-Dopenal=enabled,-Dopenal=disabled,openal-soft"
 PACKAGECONFIG[opencv]          = "-Dopencv=enabled,-Dopencv=disabled,opencv"
@@ -92,7 +94,7 @@ PACKAGECONFIG[vulkan]          = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-load
 PACKAGECONFIG[wayland]         = "-Dwayland=enabled,-Dwayland=disabled,wayland-native wayland wayland-protocols libdrm"
 PACKAGECONFIG[webp]            = "-Dwebp=enabled,-Dwebp=disabled,libwebp"
 PACKAGECONFIG[webrtc]          = "-Dwebrtc=enabled,-Dwebrtc=disabled,libnice"
-PACKAGECONFIG[webrtcdsp]       = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing"
+PACKAGECONFIG[webrtcdsp]       = "-Dwebrtcdsp=enabled,-Dwebrtcdsp=disabled,webrtc-audio-processing-1"
 PACKAGECONFIG[zbar]            = "-Dzbar=enabled,-Dzbar=disabled,zbar"
 PACKAGECONFIG[x11]             = "-Dx11=enabled,-Dx11=disabled,libxcb libxkbcommon"
 PACKAGECONFIG[x265]            = "-Dx265=enabled,-Dx265=disabled,x265"
@@ -124,7 +126,6 @@ EXTRA_OEMESON += " \
    -Dgs=disabled \
    -Dgsm=disabled \
    -Diqa=disabled \
-    -Dkate=disabled \
    -Dladspa=disabled \
    -Dldac=disabled \
    -Dlv2=disabled \
@@ -152,6 +153,16 @@ EXTRA_OEMESON += " \
    -Dwinscreencap=disabled \
    -Dwpe=disabled \
    -Dzxing=disabled \
+    -Dlcevcdecoder=disabled \
+    -Dlcevcencoder=disabled \
+    -Dtensordecoders=disabled \
+    -Dnvcomp=disabled \
+    -Dnvdswrapper=disabled \
+    -Dsvtjpegxs=disabled \
+    -Dwebview2=disabled \
+    -Daja=disabled \
+    -Dcuda-nvmm=disabled \
+    -Dd3d12=disabled \
 "
 export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
@@ -159,6 +170,8 @@ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
 ARM_INSTRUCTION_SET:armv4 = "arm"
 ARM_INSTRUCTION_SET:armv5 = "arm"
+CVE_PRODUCT = "gst-plugins-bad"
 FILES:${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs"
 FILES:${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
 FILES:${PN}-transcode += "${datadir}/gstreamer-1.0/encoding-profiles"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
index 34c99ded42..7373bd3e26 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
@@ -1,4 +1,4 @@
-From 63fe5a7b4ef70e2c490bad3b0838329935a8d77c Mon Sep 17 00:00:00 2001
+From bd1436f0027bb09cdcf90386910a497422d9a871 Mon Sep 17 00:00:00 2001
 From: zhouming <b42586@freescale.com>
 Date: Wed, 14 May 2014 10:16:20 +0800
 Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
@@ -8,7 +8,6 @@ https://bugzilla.gnome.org/show_bug.cgi?id=728312
 Upstream-Status: Pending
 Signed-off-by: zhouming <b42586@freescale.com>
 ---
 gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
@@ -17,7 +16,7 @@ Signed-off-by: zhouming <b42586@freescale.com>
 diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
 old mode 100644
 new mode 100755
-index 173da37..2b7f34c
+index 975fe83..df82840
 --- a/gst-libs/gst/tag/gsttagdemux.c
 +++ b/gst-libs/gst/tag/gsttagdemux.c
 @@ -1796,6 +1796,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
index 2adeae93d6..fc9ad474d9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
@@ -1,4 +1,4 @@
-From 7bf9525528c8f4a47413d7f82214d76f95f0c5f6 Mon Sep 17 00:00:00 2001
+From 1cc876662b7707eb5a2f668654f7921b5642e108 Mon Sep 17 00:00:00 2001
 From: Mingke Wang <mingke.wang@freescale.com>
 Date: Thu, 19 Mar 2015 14:17:10 +0800
 Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
@@ -9,7 +9,6 @@ and there's are maybe multiple Dialog lines in one input buffer.
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/178]
 Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
 ---
 gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++----
 1 file changed, 134 insertions(+), 16 deletions(-)
@@ -18,10 +17,10 @@ Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
 diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c
 old mode 100644
 new mode 100755
-index d6fdb9c..5ebe678
+index c162a54..bd8afd9
 --- a/gst/subparse/gstssaparse.c
 +++ b/gst/subparse/gstssaparse.c
-@@ -270,6 +270,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
+@@ -304,6 +304,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
  * gst_ssa_parse_push_line:
  * @parse: caller element
  * @txt: text to push
@@ -29,7 +28,7 @@ index d6fdb9c..5ebe678
  * @start: timestamp for the buffer
  * @duration: duration for the buffer
  *
-@@ -279,27 +280,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
+@@ -313,27 +314,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt)
  * Returns: result of the push of the created buffer
  */
 static GstFlowReturn
@@ -174,7 +173,7 @@ index d6fdb9c..5ebe678
   GST_LOG_OBJECT (parse, "Text : %s", t);
 
   if (gst_ssa_parse_remove_override_codes (parse, t)) {
-@@ -317,13 +424,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt,
+@@ -351,13 +458,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt,
   gst_buffer_fill (buf, 0, escaped, len + 1);
   gst_buffer_set_size (buf, len);
   g_free (escaped);
@@ -201,7 +200,7 @@ index d6fdb9c..5ebe678
 
   ret = gst_pad_push (parse->srcpad, buf);
 
-@@ -343,6 +459,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
+@@ -377,6 +493,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
   GstClockTime ts;
   gchar *txt;
   GstMapInfo map;
@@ -209,7 +208,7 @@ index d6fdb9c..5ebe678
 
   if (G_UNLIKELY (!parse->framed))
     goto not_framed;
-@@ -360,13 +477,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
+@@ -394,13 +511,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf)
   /* make double-sure it's 0-terminated and all */
   gst_buffer_map (buf, &map, GST_MAP_READ);
   txt = g_strndup ((gchar *) map.data, map.size);
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
index a605533be8..06b5bc41ed 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
@@ -1,4 +1,4 @@
-From 2b07840122bc2e83bd23dad59aa80d9479f2e1e4 Mon Sep 17 00:00:00 2001
+From c0c6944eca0c497477aa9f2cec2c83c4ea7a70e5 Mon Sep 17 00:00:00 2001
 From: Carlos Rafael Giani <crg7475@mailbox.org>
 Date: Tue, 21 May 2019 14:01:11 +0200
 Subject: [PATCH] viv-fb: Make sure config.h is included
@@ -8,7 +8,6 @@ This prevents build errors due to missing GST_API_* symbols
 Upstream-Status: Pending
 Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
 ---
 gst-libs/gst/gl/gl-prelude.h | 4 ++++
 1 file changed, 4 insertions(+)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.3.bb
index 7aa10eb646..74eb1360f6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.3.bb
@@ -11,9 +11,9 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
           file://0003-viv-fb-Make-sure-config.h-is-included.patch \
           file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
           "
-SRC_URI[sha256sum] = "65eaf72296cc5edc985695a4d80affc931e64a79f4879d05615854f7a2cf5bd1"
+SRC_URI[sha256sum] = "4ef9f9ef09025308ce220e2dd22a89e4c992d8ca71b968e3c70af0634ec27933"
-S = "${WORKDIR}/gst-plugins-base-${PV}"
+S = "${UNPACKDIR}/gst-plugins-base-${PV}"
 DEPENDS += "iso-codes util-linux zlib"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch
deleted file mode 100644
index 33bd4200f6..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b77d4806fd5de50d0b017a3e6a19c5bfdef7b3e4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Feb 2023 12:47:31 -0800
-Subject: [PATCH] v4l2: Define ioctl_req_t for posix/linux case
-this is an issue seen with musl based linux distros e.g. alpine [1]
-musl is not going to change this since it breaks ABI/API interfaces
-Newer compilers are stringent ( e.g. clang16 ) which can now detect
-signature mismatches in function pointers too, existing code warned but
-did not error with older clang
-Fixes
-gstv4l2object.c:544:23: error: incompatible function pointer types assigning to 'gint (*)(gint, ioctl_req_t, ...)' (aka 'int (*)(int, unsigned long, ...)') from 'int (int, int, ...)' [-Wincompatible-function-pointer-types]
-    v4l2object->ioctl = ioctl;
-                      ^ ~~~~~
-[1] https://gitlab.alpinelinux.org/alpine/aports/-/issues/7580
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3950]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- sys/v4l2/gstv4l2object.h | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
-index d95b375..5223cbb 100644
--- a/sys/v4l2/gstv4l2object.h
-+++ b/sys/v4l2/gstv4l2object.h
-@@ -76,6 +76,8 @@ typedef gboolean  (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object);
-  * 'unsigned long' for the 2nd parameter */
- #ifdef __ANDROID__
- typedef unsigned ioctl_req_t;
-+#elif defined(__linux__) && !defined(__GLIBC__) /* musl/linux */
-+typedef int ioctl_req_t;
- #else
- typedef gulong ioctl_req_t;
- #endif
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.3.bb
index 9ce3f73f7c..601a7961c7 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.3.bb
@@ -4,12 +4,11 @@ SUMMARY = "'Good' GStreamer plugins"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues"
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
-           file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch"
-SRC_URI[sha256sum] = "6ddd032381827d31820540735f0004b429436b0bdac19aaeab44fa22faad52e2"
+SRC_URI[sha256sum] = "fe4ec9670edfe6bb1e5f27169ae145b5ac2dd218ac98bd8251c8fba41ad33c53"
-S = "${WORKDIR}/gst-plugins-good-${PV}"
+S = "${UNPACKDIR}/gst-plugins-good-${PV}"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
@@ -36,6 +35,8 @@ X11DISABLEOPTS = "-Dximagesrc=disabled -Dximagesrc-xshm=disabled -Dximagesrc-xfi
 QT5WAYLANDDEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+PACKAGECONFIG[amrnb]      = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
+PACKAGECONFIG[amrwb]      = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
 PACKAGECONFIG[asm]        = "-Dasm=enabled,-Dasm=disabled,nasm-native"
 PACKAGECONFIG[bz2]        = "-Dbz2=enabled,-Dbz2=disabled,bzip2"
 PACKAGECONFIG[cairo]      = "-Dcairo=enabled,-Dcairo=disabled,cairo"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.3.bb
index 99f41d4f3d..cc3da89556 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.3.bb
@@ -15,9 +15,9 @@ SRC_URI = " \
            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "7758b7decfd20c00cae5700822bcbbf03f98c723e33e17634db2e07ca1da60bf"
+SRC_URI[sha256sum] = "417f5ee895f734ac0341b3719c175fff16b4c8eae8806e29e170b3bcb3d9dba5"
-S = "${WORKDIR}/gst-plugins-ugly-${PV}"
+S = "${UNPACKDIR}/gst-plugins-ugly-${PV}"
 DEPENDS += "gstreamer1.0-plugins-base"
@@ -27,8 +27,6 @@ PACKAGECONFIG ??= " \
    ${GSTREAMER_ORC} \
 "
-PACKAGECONFIG[amrnb]    = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
-PACKAGECONFIG[amrwb]    = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
 PACKAGECONFIG[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
 PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
 PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.3.bb
index 0fbb03f757..1f80063a0b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.3.bb
@@ -8,14 +8,14 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "f7a5450d93fd81bf46060dca7f4a048d095b6717961fec211731a11a994c99a7"
+SRC_URI[sha256sum] = "9343b9a7c45f472498c24ddb6fea9aba5f1a24395ddbc0b79da6e485e42d1b12"
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject gstreamer1.0-plugins-bad"
 RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 PNREAL = "gst-python"
-S = "${WORKDIR}/${PNREAL}-${PV}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 EXTRA_OEMESON += "\
    -Dtests=disabled \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.3.bb
index 554ed9ec8f..7ee7a1f07f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.3.bb
@@ -10,9 +10,9 @@ PNREAL = "gst-rtsp-server"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "ec49d474750a6ff6729c85b448abc607fb6840b21717ad7abc967e2adbf07a24"
+SRC_URI[sha256sum] = "415e8a53a9844789770dd4f116ac2e3a4a33de42673c57acc25c5ba0f4406fc5"
-S = "${WORKDIR}/${PNREAL}-${PV}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.3.bb
index 87eb8484a1..98eba8bcdb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.3.bb
@@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6eae1360658302b9b512fa46b4d06f5b818dfce5f2f43d7d710ca8142719d8ad"
+SRC_URI[sha256sum] = "2d643fbd1420297da5a4d6945d11f0a5b4f82feea54ea6aec9368d42995d8b03"
-S = "${WORKDIR}/${REALPN}-${PV}"
+S = "${UNPACKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 inherit meson pkgconfig features_check upstream-version-is-even
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
index 0d839bd6c8..5db93c5be1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch
@@ -1,4 +1,4 @@
-From 5372cd5bf2a9dd247b9c5fc6e4fe248046dbb085 Mon Sep 17 00:00:00 2001
+From cb49c5433f343aa9ae6c0656d2e835365330922b Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH] tests: respect the idententaion used in meson
@@ -6,16 +6,15 @@ Subject: [PATCH] tests: respect the idententaion used in meson
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
 tests/check/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 9787b0a..16caac7 100644
+index e8419fc..4cc4618 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -145,11 +145,11 @@ foreach t : core_tests
+@@ -149,11 +149,11 @@ foreach t : core_tests
 
   if not skip_test
     exe = executable(test_name, fname,
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
index 64717e66c3..ba8e410669 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
@@ -1,4 +1,4 @@
-From 27e977d03b0f7c1d0bf19621ef0cec0585410e7b Mon Sep 17 00:00:00 2001
+From bfb530d2f0761f28c2645e2c45de5147b0528e4d Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 11 Apr 2021 19:48:13 +0100
 Subject: [PATCH] tests: add support for install the tests
@@ -10,7 +10,6 @@ This will provide to run the tests using the gnome-desktop-testing [1]
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
 meson.build                  |  4 ++++
 meson_options.txt            |  1 +
@@ -20,10 +19,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 create mode 100644 tests/check/template.test.in
 diff --git a/meson.build b/meson.build
-index 60c7bec..f7650b1 100644
+index ba50005..09c7212 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -606,6 +606,10 @@ if bashcomp_dep.found()
+@@ -664,6 +664,10 @@ if bashcomp_dep.found()
   endif
 endif
 
@@ -35,10 +34,10 @@ index 60c7bec..f7650b1 100644
 
 pkgconfig = import('pkgconfig')
 diff --git a/meson_options.txt b/meson_options.txt
-index 7363bdb..a34ba37 100644
+index 39255cf..78af552 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
+@@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso
 option('memory-alignment', type: 'combo',
        choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'],
        value: 'malloc')
@@ -47,14 +46,14 @@ index 7363bdb..a34ba37 100644
 # Feature options
 option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries')
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 16caac7..f2d400f 100644
+index 4cc4618..f290e2e 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -124,10 +124,16 @@ test_defines = [
+@@ -128,10 +128,16 @@ test_defines = [
   '-UG_DISABLE_ASSERT',
   '-UG_DISABLE_CAST_CHECKS',
   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
-  '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
+-  '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"',
   '-DGST_DISABLE_DEPRECATED',
 ]
 
@@ -68,7 +67,7 @@ index 16caac7..f2d400f 100644
 # sanity checking
 if get_option('check').disabled()
   if get_option('tests').enabled()
-@@ -150,6 +156,8 @@ foreach t : core_tests
+@@ -154,6 +160,8 @@ foreach t : core_tests
       include_directories : [configinc],
       link_with : link_with_libs,
       dependencies : gst_deps + test_deps,
@@ -77,7 +76,7 @@ index 16caac7..f2d400f 100644
     )
 
     env = environment()
-@@ -161,6 +169,18 @@ foreach t : core_tests
+@@ -165,6 +173,18 @@ foreach t : core_tests
     env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
index 0fd830f150..79e494a22a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
@@ -1,4 +1,4 @@
-From 7041bc5adf9501beb1428d8bbae6b351a6bf07f9 Mon Sep 17 00:00:00 2001
+From d24110809da4588354ad3df4ae99556e8c62838a Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sat, 24 Apr 2021 10:34:47 +0100
 Subject: [PATCH] tests: use a dictionaries for environment
@@ -9,16 +9,15 @@ use a dictionary as this is simplest solution to install the environment.
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
 tests/check/meson.build | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index f2d400f..50dff7f 100644
+index f290e2e..a3ffcb6 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -160,14 +160,19 @@ foreach t : core_tests
+@@ -164,14 +164,19 @@ foreach t : core_tests
       install: installed_tests_enabled,
     )
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
index 5689dc9fbb..4b1aad2616 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
@@ -1,4 +1,4 @@
-From 1b1d1ce4227b6bea7c7def5dac4a663486e070c2 Mon Sep 17 00:00:00 2001
+From 3b9ae399b57cfb6e332fac6a90997a3abd33c819 Mon Sep 17 00:00:00 2001
 From: Jose Quaresma <quaresma.jose@gmail.com>
 Date: Sun, 2 May 2021 01:58:01 +0100
 Subject: [PATCH] tests: add helper script to run the installed_tests
@@ -10,7 +10,6 @@ testing framework.
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789]
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
 tests/check/meson.build      | 17 +++++++++++++++++
 tests/check/template.sh.in   |  9 +++++++++
@@ -19,10 +18,10 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 create mode 100755 tests/check/template.sh.in
 diff --git a/tests/check/meson.build b/tests/check/meson.build
-index 50dff7f..2b9e979 100644
+index a3ffcb6..b907dcf 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -184,6 +184,23 @@ foreach t : core_tests
+@@ -188,6 +188,23 @@ foreach t : core_tests
         install_dir: installed_tests_metadir,
         configuration: test_conf
       )
@@ -48,7 +47,7 @@ index 50dff7f..2b9e979 100644
     test(test_name, exe, env: env, timeout : 3 * 60)
 diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in
 new file mode 100755
-index 0000000..cf7d31b
+index 0000000..f1318fa
 --- /dev/null
 +++ b/tests/check/template.sh.in
 @@ -0,0 +1,9 @@
@@ -60,7 +59,7 @@ index 0000000..cf7d31b
 +GST_PLUGIN_LOADING_WHITELIST="@GST_PLUGIN_LOADING_WHITELIST@"
 +GST_REGISTRY=@GST_REGISTRY@
 +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@"
-+exec @TEST@
+exec @TEST@ "$@"
 diff --git a/tests/check/template.test.in b/tests/check/template.test.in
 index f701627..b74ef6a 100644
 --- a/tests/check/template.test.in
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest
index 7d0312005f..44dc350eb3 100755
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest
@@ -1,11 +1,13 @@
 #! /bin/sh
-# Multiply all timeouts by ten so they're more likely to work
+# Multiply all timeouts by five so they're more likely to work
-# on a loaded system.
+# on a loaded system. The default timeout is 20s so this makes it
+# one minute.
 export CK_TIMEOUT_MULTIPLIER=5
 # Skip some tests that we know are problematic
 export GST_CHECKS_IGNORE=""
 # gstnetclientclock.c:test_functioning is very sensitive to load
 GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning"
@@ -13,4 +15,12 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning"
 # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410
 GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live"
-gnome-desktop-testing-runner gstreamer
+# Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py:
+GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_pull_short_read"
+# These tests are fragile
+# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14884
+# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3524
+GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_convert_duration,parser_pull_frame_growth,parser_reverse_playback"
+gnome-desktop-testing-runner --parallel=4 gstreamer "$@"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.3.bb
index 8965497d01..9de76944fb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.11.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.26.3.bb
@@ -13,7 +13,7 @@ inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection p
 LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                    file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
-S = "${WORKDIR}/gstreamer-${PV}"
+S = "${UNPACKDIR}/gstreamer-${PV}"
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
           file://run-ptest \
@@ -22,7 +22,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
           file://0003-tests-use-a-dictionaries-for-environment.patch \
           file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
           "
-SRC_URI[sha256sum] = "3d16259e9dab8b002c57ce208a09b350d8282f5b0197306c0cdba9a0d0799744"
+SRC_URI[sha256sum] = "dc661603221293dccc740862425eb54fbbed60fb29d08c801d440a6a3ff82680"
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                   check \
diff --git a/meta/recipes-multimedia/lame/lame_3.100.bb b/meta/recipes-multimedia/lame/lame_3.100.bb
index 5b42795f4e..efaf3b9817 100644
--- a/meta/recipes-multimedia/lame/lame_3.100.bb
+++ b/meta/recipes-multimedia/lame/lame_3.100.bb
@@ -14,10 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
           file://no-gtk1.patch \
           "
-SRC_URI[md5sum] = "83e260acbe4389b54fe08e0bdbf7cddb"
 SRC_URI[sha256sum] = "ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e"
-inherit autotools pkgconfig
+inherit autotools pkgconfig sourceforge-releases
 PACKAGES += "libmp3lame libmp3lame-dev"
 FILES:${PN} = "${bindir}/lame"
diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.5.bb b/meta/recipes-multimedia/libogg/libogg_1.3.6.bb
index b4f02e404c..4810f156f2 100644
--- a/meta/recipes-multimedia/libogg/libogg_1.3.5.bb
+++ b/meta/recipes-multimedia/libogg/libogg_1.3.6.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \
 SRC_URI = "http://downloads.xiph.org/releases/ogg/${BP}.tar.xz"
-SRC_URI[md5sum] = "3178c98341559657a15b185bf5d700a5"
+SRC_URI[sha256sum] = "5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061"
-SRC_URI[sha256sum] = "c4d91be36fc8e54deae7575241e03f4211eb102afb3fc0775fbbc1b740016705"
 inherit autotools pkgconfig
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
deleted file mode 100644
index 876e80ef76..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-To enable --disable-Werror for libomxil to avoid some compilers which check code strictly.
-For example, at least the following errors happened to some compilers:
-1) OMX_INDEXTYPE in include/OMX_Index.h IS NOT OMX_INDEXVENDORTYPE in src/base/omx_base_component.h
-| i586-poky-linux-libtool: compile:  i586-poky-linux-gcc -m32 -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_Climinate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c OMXComponentRMExt.c  -fPIC -DPIC -o .libs/libomxbase_la-OMXComponentRMExt.o
-| omx_base_component.c: In function 'omx_base_component_GetParameter':
-| omx_base_component.c:991:3: error: case value '2130706435' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch]
-| omx_base_component.c:918:3: error: case value '2130706436' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch]
-2)
-| i586-poky-linux-gcc  -m32   -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_CONFIG_H -I. -I..    -DOMXILCOMPOminate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c -o omxregister_bellagio-omxregister.o `test -f 'omxregister.c' || echo './'`o
-| omxregister.c: In function 'buildComponentsList':
-| omxregister.c:175:7: error: variable 'err' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-diff -r 82d742d3ea90 configure.ac
--- a/configure.ac      Tue Dec 27 15:30:35 2011 +0800
-+++ b/configure.ac      Tue Dec 27 16:26:03 2011 +0800
-@@ -5,7 +5,7 @@
- AC_PREREQ([2.59])
- 
- AC_CONFIG_HEADERS([config.h])
-CFLAGS="${CFLAGS} -Wall -Werror"
-+CFLAGS="${CFLAGS} -Wall"
- 
- ################################################################################
- # Set the shared versioning info, according to section 6.3 of the libtool info #
-@@ -122,6 +122,14 @@
-     [with_android=$enableval],
-     [with_android=no])
- 
-+AC_ARG_ENABLE(
-+    [Werror],
-+    [AC_HELP_STRING(
-+        [--disable-Werror],
-+        [whether to diable treating gcc warnings as errors])],
-+    [with_Werror=$enableval],
-+    [with_Werror=yes])
-+
- ################################################################################
- # Check for programs                                                           #
- ################################################################################
-@@ -193,6 +201,10 @@
-  CFG_DEBUG_LEVEL=255
- fi
- 
-+if test "x$with_Werror" = "xyes"; then
-+ CFLAGS="${CFLAGS} -Werror"
-+fi
-+
- AC_SUBST(CFG_DEBUG_LEVEL)
- CFLAGS="${CFLAGS} -DCONFIG_DEBUG_LEVEL=$CFG_DEBUG_LEVEL"
- 
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
deleted file mode 100644
index f408e4a621..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Disable so versioning since they are really not a versioned shared lib.
-Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/
-Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
-diff -rub libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am
--- libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am       2014-07-20 15:22:00.858425234 -0400
-+++ libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am    2014-07-20 15:25:42.687525225 -0400
-@@ -10,4 +10,5 @@
- libomxaudio_effects_la_CFLAGS = -I$(top_srcdir)/include \
-                                -I$(top_srcdir)/src \
-                                -I$(top_srcdir)/src/base
-+libomxaudio_effects_la_LDFLAGS = -avoid-version
- 
-diff -rub libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am
--- libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am    2014-07-20 15:22:00.858425234 -0400
-+++ libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am 2014-07-20 15:24:49.151259753 -0400
-@@ -10,4 +10,4 @@
-                              -I$(top_srcdir)/include \
-                              -I$(top_srcdir)/src \
-                              -I$(top_srcdir)/src/base
-
-+libomxclocksrc_la_LDFLAGS = -avoid-version
-diff -rub libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am
--- libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am      2014-07-20 15:22:00.862425254 -0400
-+++ libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am   2014-07-20 15:22:36.462601786 -0400
-@@ -6,7 +6,7 @@
-                                                                library_entry_point.c
- 
- libomxvideosched_la_LIBADD = $(top_builddir)/src/libomxil-bellagio.la
-libomxvideosched_la_LDFLAGS = 
-+libomxvideosched_la_LDFLAGS = -avoid-version
- libomxvideosched_la_CFLAGS = -I$(top_srcdir)/include \
-                        -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/src/base
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
deleted file mode 100644
index 787953a99b..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch fixes link issue when libomxdynamicloader.so is loaded :
-Missing symbol RM_Deinit.
-This patch comes from "http://pkgs.fedoraproject.org/cgit/libomxil-bellagio.git/commit/?h=f17&id=4996a95828943d345e51ded6876c3103653eecf8"
-Upstream-Status: Pending
-Signed-off-by: Sébastien Mennetrier <s.mennetrier@innotis.org>
--- a/src/dynamic_loader/Makefile.am    2014-02-25 15:29:10.128549636 +0100
-+++ b/src/dynamic_loader/Makefile.am    2014-02-25 15:30:15.756548808 +0100
-@@ -3,7 +3,7 @@
- omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
- libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
- 
-libomxdynamicloader_la_LDFLAGS =
-+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs
- libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
-                        -I$(top_srcdir)/src \
-                        -I$(top_srcdir)/src/base \
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
deleted file mode 100644
index dbe8c41f74..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-This patch is to remove DESTDIR in docdir.
-Otherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected.
-Upstream-Status: Pending
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-diff -r 30b597e4e70d Makefile.am
--- a/Makefile.am       Wed Dec 28 15:38:35 2011 +0800
-+++ b/Makefile.am       Wed Dec 28 15:39:25 2011 +0800
-@@ -7,7 +7,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libomxil-bellagio.pc
- 
-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- doc_DATA = README \
-           ChangeLog \
-           TODO
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
deleted file mode 100644
index 483ca1328b..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch is to make libomxil Makefile support "make -jN".
-The omxregister_bellagio stuffs depend on libomxil_bellagio library.
-Upstream-Status: Pending
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-diff -r f59d077d3dd5 Makefile.am
--- a/src/Makefile.am   Wed Dec 28 10:54:36 2011 +0800
-+++ b/src/Makefile.am   Wed Dec 28 10:55:46 2011 +0800
-@@ -7,6 +7,7 @@
- omxregister_bellagio_SOURCES = omxregister.c common.c common.h
- omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
-                              -I$(top_srcdir)/include
-+omxregister_bellagio_LDADD = $(lib_LTLIBRARIES)
- omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
- 
- lib_LTLIBRARIES = libomxil-bellagio.la
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
deleted file mode 100644
index 4564d619ae..0000000000
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-SUMMARY = "Bellagio OpenMAX Integration Layer (IL)"
-DESCRIPTION = "Bellagio is an opensource implementation of the Khronos OpenMAX \
-               Integration Layer API to access multimedia components."
-HOMEPAGE = "http://omxil.sourceforge.net/"
-LICENSE = "LGPL-2.1-or-later"
-LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr', 'commercial', '', d)}"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \
-                    file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90"
-SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
-           file://configure-fix.patch \
-           file://parallel-make.patch \
-           file://makefile-docdir-fix.patch \
-           file://dynamicloader-linking.patch \
-           file://disable-so-versioning.patch"
-SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8"
-SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c"
-S = "${WORKDIR}/${BPN}-bellagio-${PV}"
-inherit autotools
-EXTRA_OECONF += "--disable-doc --disable-Werror"
-PROVIDES += "virtual/libomxil"
-CFLAGS += "-fcommon"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[amr] = "--enable-amr,,"
-#
-# The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked.
-# Make sure they get packaged in the main package.
-#
-FILES:${PN} += "${libdir}/bellagio/*.so \
-                ${libdir}/omxloaders/*${SOLIBS}"
-FILES:${PN}-staticdev += "${libdir}/bellagio/*.a \
-                          ${libdir}/omxloaders/*.a"
-FILES:${PN}-dev += "${libdir}/bellagio/*.la \
-                    ${libdir}/omxloaders/*.la \
-                    ${libdir}/omxloaders/*${SOLIBSDEV}"
diff --git a/meta/recipes-multimedia/libpng/files/run-ptest b/meta/recipes-multimedia/libpng/files/run-ptest
new file mode 100644
index 0000000000..85051a59f5
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/files/run-ptest
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -eux
+cd src
+make check-TESTS
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.43.bb b/meta/recipes-multimedia/libpng/libpng_1.6.43.bb
deleted file mode 100644
index f1febd0a02..0000000000
--- a/meta/recipes-multimedia/libpng/libpng_1.6.43.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "PNG image format decoding library"
-DESCRIPTION = "An open source project to develop and maintain the reference \
-library for use in applications that read, create, and manipulate PNG \
-(Portable Network Graphics) raster image files. "
-HOMEPAGE = "http://www.libpng.org/"
-SECTION = "libs"
-LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0fdbfbe10fc294a6fca24dc76134222a"
-DEPENDS = "zlib"
-LIBV = "16"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"
-MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
-UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html"
-BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
-inherit autotools binconfig-disabled pkgconfig
-# Work around missing symbols
-ARMNEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}"
-ARMNEON:aarch64 = "--enable-hardware-optimizations=on"
-EXTRA_OECONF += "${ARMNEON}"
-PACKAGES =+ "${PN}-tools"
-FILES:${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.48.bb b/meta/recipes-multimedia/libpng/libpng_1.6.48.bb
new file mode 100644
index 0000000000..e603df1edd
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.48.bb
@@ -0,0 +1,71 @@
+SUMMARY = "PNG image format decoding library"
+DESCRIPTION = "An open source project to develop and maintain the reference \
+library for use in applications that read, create, and manipulate PNG \
+(Portable Network Graphics) raster image files. "
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5516d77a3cf75f55a0d37254e3e65a20"
+DEPENDS = "zlib"
+LIBV = "16"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \
+           file://run-ptest \
+"
+SRC_URI[sha256sum] = "46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03"
+MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
+UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html"
+BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
+inherit autotools binconfig-disabled pkgconfig ptest
+# Work around missing symbols
+ARMNEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}"
+ARMNEON:aarch64 = "--enable-hardware-optimizations=on"
+EXTRA_OECONF += "${ARMNEON}"
+PACKAGES =+ "${PN}-tools"
+FILES:${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp"
+RDEPENDS:${PN}-ptest += "make bash gawk"
+do_install_ptest() {
+    # Install test scripts to ptest path
+    install -d ${D}${PTEST_PATH}/src/tests
+    install -m 755 ${S}/tests/* ${D}${PTEST_PATH}/src/tests
+    install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
+    install -d ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 755 ${S}/scripts/*.awk ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 644 ${S}/scripts/pnglib* ${S}/scripts/*.c ${S}/scripts/*.def ${S}/scripts/macro.lst ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 644 ${S}/scripts/pnglibconf.h.prebuilt ${D}${PTEST_PATH}/src/tests/scripts/pnglibconf.h
+    install -d ${D}${PTEST_PATH}/src/contrib/tools
+    install -m 755 ${S}/contrib/tools/*.sh ${D}${PTEST_PATH}/src/contrib/tools
+    install -m 644 ${S}/contrib/tools/*.c ${S}/contrib/tools/*.h ${D}${PTEST_PATH}/src/contrib/tools
+    # Install .libs directory binaries to ptest path
+    install -m 755 ${B}/.libs/pngtest ${B}/.libs/pngstest ${B}/.libs/pngimage ${B}/.libs/pngunknown ${B}/.libs/pngvalid ${D}${PTEST_PATH}/src
+    # Copy png files to ptest path
+    cd ${S} && find contrib -name '*.png' | cpio -pd ${D}${PTEST_PATH}/src
+    # Install Makefile and png files
+    install -m 644 ${S}/pngtest.png ${D}${PTEST_PATH}/src
+    install -m 644 ${S}/*.png ${S}/*.h ${S}/*.c ${S}/*.dfa ${B}/pnglibconf.out ${S}/Makefile.am ${S}/Makefile.in ${D}${PTEST_PATH}/src/tests
+    sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./'          \
+        -e 's/^top_srcdir = ..*/top_srcdir = \.\./'          \
+        -e 's/^srcdir = ..*/srcdir = \./'                    \
+        -e 's/^Makefile: ..*/Makefile: /'                    \
+        -e 's/check-TESTS: $(check_PROGRAMS)/check-TESTS:/g' \
+        ${B}/Makefile > ${D}${PTEST_PATH}/src/Makefile
+    sed -e 's|#!/bin/awk|#!/usr/bin/awk|g' -i ${D}${PTEST_PATH}/src/tests/scripts/*.awk
+}
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
index 29d48fd333..819096878b 100644
--- a/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
+++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.2.2.bb
@@ -16,7 +16,7 @@ CVE_PRODUCT = "libsamplerate"
 GITHUB_BASE_URI = "https://github.com/libsndfile/libsamplerate/releases"
-S = "${WORKDIR}/libsamplerate-${PV}"
+S = "${UNPACKDIR}/libsamplerate-${PV}"
 inherit autotools pkgconfig github-releases
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch
new file mode 100644
index 0000000000..542a783859
--- /dev/null
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1/0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch
@@ -0,0 +1,65 @@
+From 0ba5ab2fb7f29a01dbe570c324011e8cffc89d82 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Tue, 17 Dec 2024 10:38:47 +0100
+Subject: [PATCH] Include <stdbool.h> instead of redefining `bool`, `true` and
+ `false` keywords
+Fixes #1049
+Upstream-Status: Submitted [https://github.com/libsndfile/libsndfile/pull/1055]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/ALAC/alac_decoder.c | 6 +-----
+ src/ALAC/alac_encoder.c | 7 +------
+ 2 files changed, 2 insertions(+), 11 deletions(-)
+diff --git a/src/ALAC/alac_decoder.c b/src/ALAC/alac_decoder.c
+index 46d3330..1b4a87c 100644
+--- a/src/ALAC/alac_decoder.c
+++ b/src/ALAC/alac_decoder.c
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+#include <stdbool.h>
+ #include <string.h>
+ 
+ #include "alac_codec.h"
+@@ -38,11 +39,6 @@
+ #include "ALACBitUtilities.h"
+ #include "EndianPortable.h"
+ 
+-typedef enum
+-{      false = 0,
+-       true = 1
+-} bool ;
+-
+ // constants/data
+ const uint32_t kMaxBitDepth = 32 ;                     // max allowed bit depth is 32
+ 
+diff --git a/src/ALAC/alac_encoder.c b/src/ALAC/alac_encoder.c
+index 599399a..f303311 100644
+--- a/src/ALAC/alac_encoder.c
+++ b/src/ALAC/alac_encoder.c
+@@ -30,6 +30,7 @@
+ // headers
+ #include <stdio.h>
+ #include <stdlib.h>
+#include <stdbool.h>
+ #include <string.h>
+ 
+ #include "sfendian.h"
+@@ -44,12 +45,6 @@
+ #include "ALACAudioTypes.h"
+ #include "EndianPortable.h"
+ 
+-typedef enum
+-{
+-       false = 0,
+-       true = 1
+-} bool ;
+-
+ static void    GetConfig (ALAC_ENCODER *p, ALACSpecificConfig * config) ;
+ 
+ static int32_t EncodeStereo (ALAC_ENCODER *p, struct BitBuffer * bitstream, const int32_t * input, uint32_t stride, uint32_t channelIndex, uint32_t numSamples) ;
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2024-50612.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2024-50612.patch
new file mode 100644
index 0000000000..368dd5446b
--- /dev/null
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2024-50612.patch
@@ -0,0 +1,409 @@
+From 4755f5bd7854611d92ad0f1295587b439f9950ba Mon Sep 17 00:00:00 2001
+From: Arthur Taylor <art@ified.ca>
+Date: Fri, 15 Nov 2024 19:46:53 -0800
+Subject: [PATCH] src/ogg: better error checking for vorbis. Fixes #1035
+CVE: CVE-2024-50612
+Upstream-Status: Backport [4755f5bd7854611d92ad0f1295587b439f9950ba]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ src/ogg.c        |  12 ++--
+ src/ogg_opus.c   |  17 +++--
+ src/ogg_vorbis.c | 170 ++++++++++++++++++++++++++---------------------
+ 3 files changed, 114 insertions(+), 85 deletions(-)
+diff --git a/src/ogg.c b/src/ogg.c
+index 529941af8..e2d679d41 100644
+--- a/src/ogg.c
+++ b/src/ogg.c
+@@ -211,12 +211,16 @@ ogg_read_first_page (SF_PRIVATE *psf, OGG_PRIVATE *odata)
+ 
+ int
+ ogg_write_page (SF_PRIVATE *psf, ogg_page *page)
+-{      int bytes ;
+{      int n ;
+ 
+-       bytes = psf_fwrite (page->header, 1, page->header_len, psf) ;
+-       bytes += psf_fwrite (page->body, 1, page->body_len, psf) ;
+       n = psf_fwrite (page->header, 1, page->header_len, psf) ;
+       if (n == page->header_len)
+               n += psf_fwrite (page->body, 1, page->body_len, psf) ;
+ 
+-       return bytes == page->header_len + page->body_len ;
+       if (n != page->body_len + page->header_len)
+               return -1 ;
+
+       return n ;
+ } /* ogg_write_page */
+ 
+ sf_count_t
+diff --git a/src/ogg_opus.c b/src/ogg_opus.c
+index 511653ecc..e01224b99 100644
+--- a/src/ogg_opus.c
+++ b/src/ogg_opus.c
+@@ -827,15 +827,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
+ 
+        /* The first page MUST only contain the header, so flush it out now */
+        ogg_stream_packetin (&odata->ostream, &op) ;
+-       for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; )
+-       {       if (! (nn = ogg_write_page (psf, &odata->opage)))
+       while (ogg_stream_flush (&odata->ostream, &odata->opage))
+       {       nn = ogg_write_page (psf, &odata->opage) ;
+               if (nn < 0)
+                {       psf_log_printf (psf, "Opus : Failed to write header!\n") ;
+                        if (psf->error)
+                                return psf->error ;
+                        return SFE_INTERNAL ;
+                        } ;
+                psf->dataoffset += nn ;
+-               }
+               } ;
+ 
+        /*
+        ** Metadata Tags (manditory)
+@@ -850,15 +851,16 @@ ogg_opus_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
+        vorbiscomment_write_tags (psf, &op, &opustags_ident, opus_get_version_string (), - (OGG_OPUS_COMMENT_PAD)) ;
+        op.packetno = 2 ;
+        ogg_stream_packetin (&odata->ostream, &op) ;
+-       for ( ; (nn = ogg_stream_flush (&odata->ostream, &odata->opage)) ; )
+-       {       if (! (nn = ogg_write_page (psf, &odata->opage)))
+       while (ogg_stream_flush (&odata->ostream, &odata->opage))
+       {       nn = ogg_write_page (psf, &odata->opage) ;
+               if (nn < 0)
+                {       psf_log_printf (psf, "Opus : Failed to write comments!\n") ;
+                        if (psf->error)
+                                return psf->error ;
+                        return SFE_INTERNAL ;
+                        } ;
+                psf->dataoffset += nn ;
+-               }
+               } ;
+ 
+        return 0 ;
+ } /* ogg_opus_write_header */
+@@ -1132,7 +1134,8 @@ ogg_opus_write_out (SF_PRIVATE *psf, OGG_PRIVATE *odata, OPUS_PRIVATE *oopus)
+                if (nbytes > 0)
+                {       oopus->u.encode.last_segments -= ogg_page_segments (&odata->opage) ;
+                        oopus->pg_pos = oopus->pkt_pos ;
+-                       ogg_write_page (psf, &odata->opage) ;
+                       if (ogg_write_page (psf, &odata->opage) < 0)
+                               return -1 ;
+                        }
+                else
+                        break ;
+diff --git a/src/ogg_vorbis.c b/src/ogg_vorbis.c
+index add123966..fae252ca0 100644
+--- a/src/ogg_vorbis.c
+++ b/src/ogg_vorbis.c
+@@ -82,28 +82,6 @@
+ /* How many seconds in the future to not bother bisection searching for. */
+ #define VORBIS_SEEK_THRESHOLD 2
+ 
+-typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ;
+-
+-static int     vorbis_read_header (SF_PRIVATE *psf) ;
+-static int     vorbis_write_header (SF_PRIVATE *psf, int calc_length) ;
+-static int     vorbis_close (SF_PRIVATE *psf) ;
+-static int     vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
+-static int     vorbis_byterate (SF_PRIVATE *psf) ;
+-static int     vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ;
+-static int     vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ;
+-static int     vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ;
+-static sf_count_t      vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+-static sf_count_t      vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
+-static sf_count_t      vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ;
+-static int     vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ;
+-
+ typedef struct
+ {      int id ;
+        const char *name ;
+@@ -145,6 +123,45 @@ typedef struct
+        sf_count_t last_page ;
+ } VORBIS_PRIVATE ;
+ 
+typedef int convert_func (SF_PRIVATE *psf, int, void *, int, int, float **) ;
+
+static int     vorbis_read_header (SF_PRIVATE *psf) ;
+static int     vorbis_write_header (SF_PRIVATE *psf, int calc_length) ;
+static int     vorbis_close (SF_PRIVATE *psf) ;
+static int     vorbis_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
+static int     vorbis_byterate (SF_PRIVATE *psf) ;
+static int     vorbis_calculate_granulepos (SF_PRIVATE *psf, uint64_t *gp_out) ;
+static int     vorbis_skip (SF_PRIVATE *psf, uint64_t target_gp) ;
+static int     vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp) ;
+static sf_count_t      vorbis_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
+static sf_count_t      vorbis_read_s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_read_i (SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_read_f (SF_PRIVATE *psf, float *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) ;
+static sf_count_t      vorbis_read_sample (SF_PRIVATE *psf, void *ptr, sf_count_t lens, convert_func *transfn) ;
+static int     vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames) ;
+static int     vorbis_rnull (SF_PRIVATE *psf, int samples, void *vptr, int off , int channels, float **pcm) ;
+static void    vorbis_log_error (SF_PRIVATE *psf, int error) ;
+
+
+static void
+vorbis_log_error(SF_PRIVATE *psf, int error) {
+       switch (error)
+       {       case 0: return;
+               case OV_EIMPL:          psf->error = SFE_UNIMPLEMENTED ; break ;
+               case OV_ENOTVORBIS:     psf->error = SFE_MALFORMED_FILE ; break ;
+               case OV_EBADHEADER:     psf->error = SFE_MALFORMED_FILE ; break ;
+               case OV_EVERSION:       psf->error = SFE_UNSUPPORTED_ENCODING ; break ;
+               case OV_EFAULT:
+               case OV_EINVAL:
+               default: psf->error = SFE_INTERNAL ;
+               } ;
+} ;
+
+ static int
+ vorbis_read_header (SF_PRIVATE *psf)
+ {      OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+@@ -380,7 +397,6 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
+        {       ogg_packet header ;
+                ogg_packet header_comm ;
+                ogg_packet header_code ;
+-               int result ;
+ 
+                vorbis_analysis_headerout (&vdata->vdsp, &vdata->vcomment, &header, &header_comm, &header_code) ;
+                ogg_stream_packetin (&odata->ostream, &header) ; /* automatically placed in its own page */
+@@ -390,9 +406,9 @@ vorbis_write_header (SF_PRIVATE *psf, int UNUSED (calc_length))
+                /* This ensures the actual
+                 * audio data will start on a new page, as per spec
+                 */
+-               while ((result = ogg_stream_flush (&odata->ostream, &odata->opage)) != 0)
+-               {       ogg_write_page (psf, &odata->opage) ;
+-                       } ;
+               while (ogg_stream_flush (&odata->ostream, &odata->opage))
+                       if (ogg_write_page (psf, &odata->opage) < 0)
+                               return -1 ;
+        }
+ 
+        return 0 ;
+@@ -402,6 +418,7 @@ static int
+ vorbis_close (SF_PRIVATE *psf)
+ {      OGG_PRIVATE* odata = psf->container_data ;
+        VORBIS_PRIVATE *vdata = psf->codec_data ;
+       int ret = 0 ;
+ 
+        if (odata == NULL || vdata == NULL)
+                return 0 ;
+@@ -412,34 +429,14 @@ vorbis_close (SF_PRIVATE *psf)
+        if (psf->file.mode == SFM_WRITE)
+        {
+                if (psf->write_current <= 0)
+-                       vorbis_write_header (psf, 0) ;
+-
+-               vorbis_analysis_wrote (&vdata->vdsp, 0) ;
+-               while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1)
+-               {
+                       ret = vorbis_write_header (psf, 0) ;
+ 
+-               /* analysis, assume we want to use bitrate management */
+-                       vorbis_analysis (&vdata->vblock, NULL) ;
+-                       vorbis_bitrate_addblock (&vdata->vblock) ;
+-
+-                       while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket))
+-                       {       /* weld the packet into the bitstream */
+-                               ogg_stream_packetin (&odata->ostream, &odata->opacket) ;
+-
+-                               /* write out pages (if any) */
+-                               while (!odata->eos)
+-                               {       int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ;
+-                                       if (result == 0) break ;
+-                                       ogg_write_page (psf, &odata->opage) ;
+-
+-               /* this could be set above, but for illustrative purposes, I do
+-                  it here (to show that vorbis does know where the stream ends) */
+-
+-                                       if (ogg_page_eos (&odata->opage)) odata->eos = 1 ;
+-                               }
+-                       }
+-               }
+-       }
+               if (ret == 0)
+               {       /* A write of zero samples tells Vorbis the stream is done and to
+                          flush. */
+                       ret = vorbis_write_samples (psf, odata, vdata, 0) ;
+                       } ;
+               } ;
+ 
+        /* ogg_page and ogg_packet structs always point to storage in
+           libvorbis.  They are never freed or manipulated directly */
+@@ -449,7 +446,7 @@ vorbis_close (SF_PRIVATE *psf)
+        vorbis_comment_clear (&vdata->vcomment) ;
+        vorbis_info_clear (&vdata->vinfo) ;
+ 
+-       return 0 ;
+       return ret ;
+ } /* vorbis_close */
+ 
+ int
+@@ -688,33 +685,40 @@ vorbis_read_d (SF_PRIVATE *psf, double *ptr, sf_count_t lens)
+ /*==============================================================================
+ */
+ 
+-static void
+static int
+ vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata, int in_frames)
+-{
+-       vorbis_analysis_wrote (&vdata->vdsp, in_frames) ;
+{      int ret ;
+
+       if ((ret = vorbis_analysis_wrote (&vdata->vdsp, in_frames)) != 0)
+               return ret ;
+ 
+        /*
+        **      Vorbis does some data preanalysis, then divvies up blocks for
+        **      more involved (potentially parallel) processing. Get a single
+        **      block for encoding now.
+        */
+-       while (vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock) == 1)
+       while ((ret = vorbis_analysis_blockout (&vdata->vdsp, &vdata->vblock)) == 1)
+        {
+                /* analysis, assume we want to use bitrate management */
+-               vorbis_analysis (&vdata->vblock, NULL) ;
+-               vorbis_bitrate_addblock (&vdata->vblock) ;
+               if ((ret = vorbis_analysis (&vdata->vblock, NULL)) != 0)
+                       return ret ;
+               if ((ret = vorbis_bitrate_addblock (&vdata->vblock)) != 0)
+                       return ret ;
+ 
+-               while (vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket))
+               while ((ret = vorbis_bitrate_flushpacket (&vdata->vdsp, &odata->opacket)) == 1)
+                {
+                        /* weld the packet into the bitstream */
+-                       ogg_stream_packetin (&odata->ostream, &odata->opacket) ;
+                       if ((ret = ogg_stream_packetin (&odata->ostream, &odata->opacket)) != 0)
+                               return ret ;
+ 
+                        /* write out pages (if any) */
+                        while (!odata->eos)
+-                       {       int result = ogg_stream_pageout (&odata->ostream, &odata->opage) ;
+-                               if (result == 0)
+                       {       ret = ogg_stream_pageout (&odata->ostream, &odata->opage) ;
+                               if (ret == 0)
+                                        break ;
+-                               ogg_write_page (psf, &odata->opage) ;
+
+                               if (ogg_write_page (psf, &odata->opage) < 0)
+                                       return -1 ;
+ 
+                                /*      This could be set above, but for illustrative purposes, I do
+                                **      it here (to show that vorbis does know where the stream ends) */
+@@ -722,16 +726,22 @@ vorbis_write_samples (SF_PRIVATE *psf, OGG_PRIVATE *odata, VORBIS_PRIVATE *vdata
+                                        odata->eos = 1 ;
+                                } ;
+                        } ;
+               if (ret != 0)
+                       return ret ;
+                } ;
+       if (ret != 0)
+               return ret ;
+ 
+        vdata->gp += in_frames ;
+
+       return 0 ;
+ } /* vorbis_write_data */
+ 
+ 
+ static sf_count_t
+ vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
+ {
+-       int i, m, j = 0 ;
+       int i, m, j = 0, ret ;
+        OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+        VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+        int in_frames = lens / psf->sf.channels ;
+@@ -740,14 +750,17 @@ vorbis_write_s (SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
+                for (m = 0 ; m < psf->sf.channels ; m++)
+                        buffer [m][i] = (float) (ptr [j++]) / 32767.0f ;
+ 
+-       vorbis_write_samples (psf, odata, vdata, in_frames) ;
+       if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)))
+       {       vorbis_log_error (psf, ret) ;
+               return 0 ;
+               } ;
+ 
+        return lens ;
+ } /* vorbis_write_s */
+ 
+ static sf_count_t
+ vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
+-{      int i, m, j = 0 ;
+{      int i, m, j = 0, ret ;
+        OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+        VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+        int in_frames = lens / psf->sf.channels ;
+@@ -756,14 +769,17 @@ vorbis_write_i (SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
+                for (m = 0 ; m < psf->sf.channels ; m++)
+                        buffer [m][i] = (float) (ptr [j++]) / 2147483647.0f ;
+ 
+-       vorbis_write_samples (psf, odata, vdata, in_frames) ;
+       if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)))
+       {       vorbis_log_error (psf, ret) ;
+               return 0 ;
+               } ;
+ 
+        return lens ;
+ } /* vorbis_write_i */
+ 
+ static sf_count_t
+ vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
+-{      int i, m, j = 0 ;
+{      int i, m, j = 0, ret ;
+        OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+        VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+        int in_frames = lens / psf->sf.channels ;
+@@ -772,14 +788,17 @@ vorbis_write_f (SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
+                for (m = 0 ; m < psf->sf.channels ; m++)
+                        buffer [m][i] = ptr [j++] ;
+ 
+-       vorbis_write_samples (psf, odata, vdata, in_frames) ;
+       if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0)
+       {       vorbis_log_error (psf, ret) ;
+               return 0 ;
+               } ;
+ 
+        return lens ;
+ } /* vorbis_write_f */
+ 
+ static sf_count_t
+ vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
+-{      int i, m, j = 0 ;
+{      int i, m, j = 0, ret ;
+        OGG_PRIVATE *odata = (OGG_PRIVATE *) psf->container_data ;
+        VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE *) psf->codec_data ;
+        int in_frames = lens / psf->sf.channels ;
+@@ -788,7 +807,10 @@ vorbis_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
+                for (m = 0 ; m < psf->sf.channels ; m++)
+                        buffer [m][i] = (float) ptr [j++] ;
+ 
+-       vorbis_write_samples (psf, odata, vdata, in_frames) ;
+       if ((ret = vorbis_write_samples (psf, odata, vdata, in_frames)) != 0)
+       {       vorbis_log_error (psf, ret) ;
+               return 0 ;
+               } ;
+ 
+        return lens ;
+ } /* vorbis_write_d */
+@@ -884,7 +906,7 @@ vorbis_seek_trysearch (SF_PRIVATE *psf, uint64_t target_gp)
+                return 0 ;
+ 
+        /*      Search for a position a half large-block before our target. As Vorbis is
+-       **      lapped, every sample position come from two blocks, the "left" half of
+       **      lapped, every sample position comes from two blocks, the "left" half of
+        **      one block and the "right" half of the previous block.  The granule
+        **      position of an Ogg page of a Vorbis stream is the sample offset of the
+        **      last finished sample in the stream that can be decoded from a page.  A
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb
index a9ee7c3575..0ec40dda7a 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.2.2.bb
@@ -10,6 +10,8 @@ LICENSE = "LGPL-2.1-only"
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/libsndfile-${PV}.tar.xz \
           file://noopus.patch \
           file://cve-2022-33065.patch \
+           file://CVE-2024-50612.patch \
+           file://0001-Include-stdbool.h-instead-of-redefining-bool-true-an.patch \
          "
 GITHUB_BASE_URI = "https://github.com/libsndfile/libsndfile/releases/"
@@ -19,7 +21,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
 CVE_PRODUCT = "libsndfile"
-S = "${WORKDIR}/libsndfile-${PV}"
+S = "${UNPACKDIR}/libsndfile-${PV}"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)}"
 PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
diff --git a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch b/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
deleted file mode 100644
index 359f3d1a7a..0000000000
--- a/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-Index: libtheora-1.1.1/Makefile.am
-===================================================================
--- libtheora-1.1.1.orig/Makefile.am    2009-11-25 22:01:53.593775926 +0100
-+++ libtheora-1.1.1/Makefile.am 2009-11-25 22:02:00.777524017 +0100
-@@ -8,7 +8,7 @@
- EXAMPLES_DIR =
- endif
- 
-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
-+SUBDIRS = lib include tests m4 $(EXAMPLES_DIR)
- 
- 
- # we include the whole debian/ dir in EXTRA_DIST because there's a problem
diff --git a/meta/recipes-multimedia/libtheora/libtheora/0001-add-missing-files.patch b/meta/recipes-multimedia/libtheora/libtheora/0001-add-missing-files.patch
new file mode 100644
index 0000000000..323ac7da83
--- /dev/null
+++ b/meta/recipes-multimedia/libtheora/libtheora/0001-add-missing-files.patch
@@ -0,0 +1,769 @@
+From 0880595f9b08d15da0e72cefaf24841cbb930883 Mon Sep 17 00:00:00 2001
+From: Gyorgy Sarvari <skandigraun@gmail.com>
+Date: Sat, 7 Jun 2025 14:10:40 +0200
+Subject: [PATCH] add missing files
+Due to a release issue, two files were not added to the libtheora 1.2.0
+release tarball - these files are required to be able to build the
+library for 32-bit ARM systems along with assembly optimization.
+This patch adds these files.
+This is not a code issue per-se, rather a tarballing one, as the files
+are present in the source code repository.
+Upstream-Status: Backport [https://gitlab.xiph.org/xiph/theora/-/issues/2338]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ lib/arm/armenc.c  |  57 ++++
+ lib/arm/armloop.s | 676 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 733 insertions(+)
+ create mode 100644 lib/arm/armenc.c
+ create mode 100644 lib/arm/armloop.s
+diff --git a/lib/arm/armenc.c b/lib/arm/armenc.c
+new file mode 100644
+index 0000000..4cfb8a7
+--- /dev/null
+++ b/lib/arm/armenc.c
+@@ -0,0 +1,57 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2010                *
+ * by the Xiph.Org Foundation and contributors                      *
+ * https://www.xiph.org/                                            *
+ *                                                                  *
+ ********************************************************************
+
+  function:
+
+ ********************************************************************/
+#include "armenc.h"
+
+#if defined(OC_ARM_ASM)
+
+void oc_enc_accel_init_arm(oc_enc_ctx *_enc){
+  ogg_uint32_t cpu_flags;
+  cpu_flags=_enc->state.cpu_flags;
+  oc_enc_accel_init_c(_enc);
+# if defined(OC_ENC_USE_VTABLE)
+  /*TODO: Add ARMv4 functions here.*/
+# endif
+# if defined(OC_ARM_ASM_EDSP)
+  if(cpu_flags&OC_CPU_ARM_EDSP){
+#  if defined(OC_STATE_USE_VTABLE)
+    /*TODO: Add EDSP functions here.*/
+#  endif
+  }
+#  if defined(OC_ARM_ASM_MEDIA)
+  if(cpu_flags&OC_CPU_ARM_MEDIA){
+#   if defined(OC_STATE_USE_VTABLE)
+    /*TODO: Add Media functions here.*/
+#   endif
+  }
+#   if defined(OC_ARM_ASM_NEON)
+  if(cpu_flags&OC_CPU_ARM_NEON){
+#    if defined(OC_STATE_USE_VTABLE)
+    _enc->opt_vtable.frag_satd=oc_enc_frag_satd_neon;
+    _enc->opt_vtable.frag_satd2=oc_enc_frag_satd2_neon;
+    _enc->opt_vtable.frag_intra_satd=oc_enc_frag_intra_satd_neon;
+    _enc->opt_vtable.enquant_table_init=oc_enc_enquant_table_init_neon;
+    _enc->opt_vtable.enquant_table_fixup=oc_enc_enquant_table_fixup_neon;
+    _enc->opt_vtable.quantize=oc_enc_quantize_neon;
+#    endif
+    _enc->opt_data.enquant_table_size=128*sizeof(ogg_uint16_t);
+    _enc->opt_data.enquant_table_alignment=16;
+  }
+#   endif
+#  endif
+# endif
+}
+#endif
+diff --git a/lib/arm/armloop.s b/lib/arm/armloop.s
+new file mode 100644
+index 0000000..c35da0f
+--- /dev/null
+++ b/lib/arm/armloop.s
+@@ -0,0 +1,676 @@
+;********************************************************************
+;*                                                                  *
+;* THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
+;* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+;* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+;* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+;*                                                                  *
+;* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2010                *
+;* by the Xiph.Org Foundation and contributors                      *
+;* https://www.xiph.org/                                            *
+;*                                                                  *
+;********************************************************************
+; Original implementation:
+;  Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+;********************************************************************
+
+       AREA    |.text|, CODE, READONLY
+
+       GET     armopts.s
+
+       EXPORT  oc_loop_filter_frag_rows_arm
+
+; Which bit this is depends on the order of packing within a bitfield.
+; Hopefully that doesn't change among any of the relevant compilers.
+OC_FRAG_CODED_FLAG     *       1
+
+       ; Vanilla ARM v4 version
+loop_filter_h_arm PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int           *_bv
+       ; preserves r0-r3
+       STMFD   r13!,{r3-r6,r14}
+       MOV     r14,#8
+       MOV     r6, #255
+lfh_arm_lp
+       LDRB    r3, [r0, #-2]           ; r3 = _pix[0]
+       LDRB    r12,[r0, #1]            ; r12= _pix[3]
+       LDRB    r4, [r0, #-1]           ; r4 = _pix[1]
+       LDRB    r5, [r0]                ; r5 = _pix[2]
+       SUB     r3, r3, r12             ; r3 = _pix[0]-_pix[3]+4
+       ADD     r3, r3, #4
+       SUB     r12,r5, r4              ; r12= _pix[2]-_pix[1]
+       ADD     r12,r12,r12,LSL #1      ; r12= 3*(_pix[2]-_pix[1])
+       ADD     r12,r12,r3      ; r12= _pix[0]-_pix[3]+3*(_pix[2]-_pix[1])+4
+       MOV     r12,r12,ASR #3
+       LDRSB   r12,[r2, r12]
+       ; Stall (2 on Xscale)
+       ADDS    r4, r4, r12
+       CMPGT   r6, r4
+       EORLT   r4, r6, r4, ASR #32
+       SUBS    r5, r5, r12
+       CMPGT   r6, r5
+       EORLT   r5, r6, r5, ASR #32
+       STRB    r4, [r0, #-1]
+       STRB    r5, [r0], r1
+       SUBS    r14,r14,#1
+       BGT     lfh_arm_lp
+       SUB     r0, r0, r1, LSL #3
+       LDMFD   r13!,{r3-r6,PC}
+       ENDP
+
+loop_filter_v_arm PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int           *_bv
+       ; preserves r0-r3
+       STMFD   r13!,{r3-r6,r14}
+       MOV     r14,#8
+       MOV     r6, #255
+lfv_arm_lp
+       LDRB    r3, [r0, -r1, LSL #1]   ; r3 = _pix[0]
+       LDRB    r12,[r0, r1]            ; r12= _pix[3]
+       LDRB    r4, [r0, -r1]           ; r4 = _pix[1]
+       LDRB    r5, [r0]                ; r5 = _pix[2]
+       SUB     r3, r3, r12             ; r3 = _pix[0]-_pix[3]+4
+       ADD     r3, r3, #4
+       SUB     r12,r5, r4              ; r12= _pix[2]-_pix[1]
+       ADD     r12,r12,r12,LSL #1      ; r12= 3*(_pix[2]-_pix[1])
+       ADD     r12,r12,r3      ; r12= _pix[0]-_pix[3]+3*(_pix[2]-_pix[1])+4
+       MOV     r12,r12,ASR #3
+       LDRSB   r12,[r2, r12]
+       ; Stall (2 on Xscale)
+       ADDS    r4, r4, r12
+       CMPGT   r6, r4
+       EORLT   r4, r6, r4, ASR #32
+       SUBS    r5, r5, r12
+       CMPGT   r6, r5
+       EORLT   r5, r6, r5, ASR #32
+       STRB    r4, [r0, -r1]
+       STRB    r5, [r0], #1
+       SUBS    r14,r14,#1
+       BGT     lfv_arm_lp
+       SUB     r0, r0, #8
+       LDMFD   r13!,{r3-r6,PC}
+       ENDP
+
+oc_loop_filter_frag_rows_arm PROC
+       ; r0 = _ref_frame_data
+       ; r1 = _ystride
+       ; r2 = _bv
+       ; r3 = _frags
+       ; r4 = _fragi0
+       ; r5 = _fragi0_end
+       ; r6 = _fragi_top
+       ; r7 = _fragi_bot
+       ; r8 = _frag_buf_offs
+       ; r9 = _nhfrags
+       MOV     r12,r13
+       STMFD   r13!,{r0,r4-r11,r14}
+       LDMFD   r12,{r4-r9}
+       ADD     r2, r2, #127    ; _bv += 127
+       CMP     r4, r5          ; if(_fragi0>=_fragi0_end)
+       BGE     oslffri_arm_end ;   bail
+       SUBS    r9, r9, #1      ; r9 = _nhfrags-1       if (r9<=0)
+       BLE     oslffri_arm_end ;                         bail
+       ADD     r3, r3, r4, LSL #2      ; r3 = &_frags[fragi]
+       ADD     r8, r8, r4, LSL #2      ; r8 = &_frag_buf_offs[fragi]
+       SUB     r7, r7, r9      ; _fragi_bot -= _nhfrags;
+oslffri_arm_lp1
+       MOV     r10,r4          ; r10= fragi = _fragi0
+       ADD     r11,r4, r9      ; r11= fragi_end-1=fragi+_nhfrags-1
+oslffri_arm_lp2
+       LDR     r14,[r3], #4    ; r14= _frags[fragi]    _frags++
+       LDR     r0, [r13]       ; r0 = _ref_frame_data
+       LDR     r12,[r8], #4    ; r12= _frag_buf_offs[fragi]   _frag_buf_offs++
+       TST     r14,#OC_FRAG_CODED_FLAG
+       BEQ     oslffri_arm_uncoded
+       CMP     r10,r4          ; if (fragi>_fragi0)
+       ADD     r0, r0, r12     ; r0 = _ref_frame_data + _frag_buf_offs[fragi]
+       BLGT    loop_filter_h_arm
+       CMP     r4, r6          ; if (_fragi0>_fragi_top)
+       BLGT    loop_filter_v_arm
+       CMP     r10,r11         ; if(fragi+1<fragi_end)===(fragi<fragi_end-1)
+       LDRLT   r12,[r3]        ; r12 = _frags[fragi+1]
+       ADD     r0, r0, #8
+       ADD     r10,r10,#1      ; r10 = fragi+1;
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG ; && _frags[fragi+1].coded==0
+       BLLT    loop_filter_h_arm
+       CMP     r10,r7          ; if (fragi<_fragi_bot)
+       LDRLT   r12,[r3, r9, LSL #2]    ; r12 = _frags[fragi+1+_nhfrags-1]
+       SUB     r0, r0, #8
+       ADD     r0, r0, r1, LSL #3
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG
+       BLLT    loop_filter_v_arm
+       CMP     r10,r11         ; while(fragi<=fragi_end-1)
+       BLE     oslffri_arm_lp2
+       MOV     r4, r10         ; r4 = fragi0 += _nhfrags
+       CMP     r4, r5
+       BLT     oslffri_arm_lp1
+oslffri_arm_end
+       LDMFD   r13!,{r0,r4-r11,PC}
+oslffri_arm_uncoded
+       ADD     r10,r10,#1
+       CMP     r10,r11
+       BLE     oslffri_arm_lp2
+       MOV     r4, r10         ; r4 = _fragi0 += _nhfrags
+       CMP     r4, r5
+       BLT     oslffri_arm_lp1
+       LDMFD   r13!,{r0,r4-r11,PC}
+       ENDP
+
+ [ OC_ARM_ASM_MEDIA
+       EXPORT  oc_loop_filter_init_v6
+       EXPORT  oc_loop_filter_frag_rows_v6
+
+oc_loop_filter_init_v6 PROC
+       ; r0 = _bv
+       ; r1 = _flimit (=L from the spec)
+       MVN     r1, r1, LSL #1          ; r1 = <0xFFFFFF|255-2*L>
+       AND     r1, r1, #255            ; r1 = ll=r1&0xFF
+       ORR     r1, r1, r1, LSL #8      ; r1 = <ll|ll>
+       PKHBT   r1, r1, r1, LSL #16     ; r1 = <ll|ll|ll|ll>
+       STR     r1, [r0]
+       MOV     PC,r14
+       ENDP
+
+; We could use the same strategy as the v filter below, but that would require
+;  40 instructions to load the data and transpose it into columns and another
+;  32 to write out the results at the end, plus the 52 instructions to do the
+;  filtering itself.
+; This is slightly less, and less code, even assuming we could have shared the
+;  52 instructions in the middle with the other function.
+; It executes slightly fewer instructions than the ARMv6 approach David Conrad
+;  proposed for FFmpeg, but not by much:
+;  http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2010-February/083141.html
+; His is a lot less code, though, because it only does two rows at once instead
+;  of four.
+loop_filter_h_v6 PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int            _ll
+       ; preserves r0-r3
+       STMFD   r13!,{r4-r11,r14}
+       LDR     r12,=0x10003
+       BL loop_filter_h_core_v6
+       ADD     r0, r0, r1, LSL #2
+       BL loop_filter_h_core_v6
+       SUB     r0, r0, r1, LSL #2
+       LDMFD   r13!,{r4-r11,PC}
+       ENDP
+
+loop_filter_h_core_v6 PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int            _ll
+       ; r12= 0x10003
+       ; Preserves r0-r3, r12; Clobbers r4-r11.
+       LDR     r4,[r0, #-2]!           ; r4 = <p3|p2|p1|p0>
+       ; Single issue
+       LDR     r5,[r0, r1]!            ; r5 = <q3|q2|q1|q0>
+       UXTB16  r6, r4, ROR #16         ; r6 = <p0|p2>
+       UXTB16  r4, r4, ROR #8          ; r4 = <p3|p1>
+       UXTB16  r7, r5, ROR #16         ; r7 = <q0|q2>
+       UXTB16  r5, r5, ROR #8          ; r5 = <q3|q1>
+       PKHBT   r8, r4, r5, LSL #16     ; r8 = <__|q1|__|p1>
+       PKHBT   r9, r6, r7, LSL #16     ; r9 = <__|q2|__|p2>
+       SSUB16  r6, r4, r6              ; r6 = <p3-p0|p1-p2>
+       SMLAD   r6, r6, r12,r12         ; r6 = <????|(p3-p0)+3*(p1-p2)+3>
+       SSUB16  r7, r5, r7              ; r7 = <q3-q0|q1-q2>
+       SMLAD   r7, r7, r12,r12         ; r7 = <????|(q0-q3)+3*(q2-q1)+4>
+       LDR     r4,[r0, r1]!            ; r4 = <r3|r2|r1|r0>
+       MOV     r6, r6, ASR #3          ; r6 = <??????|(p3-p0)+3*(p1-p2)+3>>3>
+       LDR     r5,[r0, r1]!            ; r5 = <s3|s2|s1|s0>
+       PKHBT   r11,r6, r7, LSL #13     ; r11= <??|-R_q|??|-R_p>
+       UXTB16  r6, r4, ROR #16         ; r6 = <r0|r2>
+       UXTB16  r11,r11                 ; r11= <__|-R_q|__|-R_p>
+       UXTB16  r4, r4, ROR #8          ; r4 = <r3|r1>
+       UXTB16  r7, r5, ROR #16         ; r7 = <s0|s2>
+       PKHBT   r10,r6, r7, LSL #16     ; r10= <__|s2|__|r2>
+       SSUB16  r6, r4, r6              ; r6 = <r3-r0|r1-r2>
+       UXTB16  r5, r5, ROR #8          ; r5 = <s3|s1>
+       SMLAD   r6, r6, r12,r12         ; r6 = <????|(r3-r0)+3*(r2-r1)+3>
+       SSUB16  r7, r5, r7              ; r7 = <r3-r0|r1-r2>
+       SMLAD   r7, r7, r12,r12         ; r7 = <????|(s0-s3)+3*(s2-s1)+4>
+       ORR     r9, r9, r10, LSL #8     ; r9 = <s2|q2|r2|p2>
+       MOV     r6, r6, ASR #3          ; r6 = <??????|(r0-r3)+3*(r2-r1)+4>>3>
+       PKHBT   r10,r4, r5, LSL #16     ; r10= <__|s1|__|r1>
+       PKHBT   r6, r6, r7, LSL #13     ; r6 = <??|-R_s|??|-R_r>
+       ORR     r8, r8, r10, LSL #8     ; r8 = <s1|q1|r1|p1>
+       UXTB16  r6, r6                  ; r6 = <__|-R_s|__|-R_r>
+       MOV     r10,#0
+       ORR     r6, r11,r6, LSL #8      ; r6 = <-R_s|-R_q|-R_r|-R_p>
+       ; Single issue
+       ; There's no min, max or abs instruction.
+       ; SSUB8 and SEL will work for abs, and we can do all the rest with
+       ;  unsigned saturated adds, which means the GE flags are still all
+       ;  set when we're done computing lflim(abs(R_i),L).
+       ; This allows us to both add and subtract, and split the results by
+       ;  the original sign of R_i.
+       SSUB8   r7, r10,r6
+       ; Single issue
+       SEL     r7, r7, r6              ; r7 = abs(R_i)
+       ; Single issue
+       UQADD8  r4, r7, r2              ; r4 = 255-max(2*L-abs(R_i),0)
+       ; Single issue
+       UQADD8  r7, r7, r4
+       ; Single issue
+       UQSUB8  r7, r7, r4              ; r7 = min(abs(R_i),max(2*L-abs(R_i),0))
+       ; Single issue
+       UQSUB8  r4, r8, r7
+       UQADD8  r5, r9, r7
+       UQADD8  r8, r8, r7
+       UQSUB8  r9, r9, r7
+       SEL     r8, r8, r4              ; r8 = p1+lflim(R_i,L)
+       SEL     r9, r9, r5              ; r9 = p2-lflim(R_i,L)
+       MOV     r5, r9, LSR #24         ; r5 = s2
+       STRB    r5, [r0,#2]!
+       MOV     r4, r8, LSR #24         ; r4 = s1
+       STRB    r4, [r0,#-1]
+       MOV     r5, r9, LSR #8          ; r5 = r2
+       STRB    r5, [r0,-r1]!
+       MOV     r4, r8, LSR #8          ; r4 = r1
+       STRB    r4, [r0,#-1]
+       MOV     r5, r9, LSR #16         ; r5 = q2
+       STRB    r5, [r0,-r1]!
+       MOV     r4, r8, LSR #16         ; r4 = q1
+       STRB    r4, [r0,#-1]
+       ; Single issue
+       STRB    r9, [r0,-r1]!
+       ; Single issue
+       STRB    r8, [r0,#-1]
+       MOV     PC,r14
+       ENDP
+
+; This uses the same strategy as the MMXEXT version for x86, except that UHADD8
+;  computes (a+b>>1) instead of (a+b+1>>1) like PAVGB.
+; This works just as well, with the following procedure for computing the
+;  filter value, f:
+;   u = ~UHADD8(p1,~p2);
+;   v = UHADD8(~p1,p2);
+;   m = v-u;
+;   a = m^UHADD8(m^p0,m^~p3);
+;   f = UHADD8(UHADD8(a,u1),v1);
+;  where f = 127+R, with R in [-127,128] defined as in the spec.
+; This is exactly the same amount of arithmetic as the version that uses PAVGB
+;  as the basic operator.
+; It executes about 2/3 the number of instructions of David Conrad's approach,
+;  but requires more code, because it does all eight columns at once, instead
+;  of four at a time.
+loop_filter_v_v6 PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int            _ll
+       ; preserves r0-r11
+       STMFD   r13!,{r4-r11,r14}
+       LDRD    r6, [r0, -r1]!          ; r7, r6 = <p5|p1>
+       LDRD    r4, [r0, -r1]           ; r5, r4 = <p4|p0>
+       LDRD    r8, [r0, r1]!           ; r9, r8 = <p6|p2>
+       MVN     r14,r6                  ; r14= ~p1
+       LDRD    r10,[r0, r1]            ; r11,r10= <p7|p3>
+       ; Filter the first four columns.
+       MVN     r12,r8                  ; r12= ~p2
+       UHADD8  r14,r14,r8              ; r14= v1=~p1+p2>>1
+       UHADD8  r12,r12,r6              ; r12= p1+~p2>>1
+       MVN     r10, r10                ; r10=~p3
+       MVN     r12,r12                 ; r12= u1=~p1+p2+1>>1
+       SSUB8   r14,r14,r12             ; r14= m1=v1-u1
+       ; Single issue
+       EOR     r4, r4, r14             ; r4 = m1^p0
+       EOR     r10,r10,r14             ; r10= m1^~p3
+       UHADD8  r4, r4, r10             ; r4 = (m1^p0)+(m1^~p3)>>1
+       ; Single issue
+       EOR     r4, r4, r14             ; r4 = a1=m1^((m1^p0)+(m1^~p3)>>1)
+       SADD8   r14,r14,r12             ; r14= v1=m1+u1
+       UHADD8  r4, r4, r12             ; r4 = a1+u1>>1
+       MVN     r12,r9                  ; r12= ~p6
+       UHADD8  r4, r4, r14             ; r4 = f1=(a1+u1>>1)+v1>>1
+       ; Filter the second four columns.
+       MVN     r14,r7                  ; r14= ~p5
+       UHADD8  r12,r12,r7              ; r12= p5+~p6>>1
+       UHADD8  r14,r14,r9              ; r14= v2=~p5+p6>>1
+       MVN     r12,r12                 ; r12= u2=~p5+p6+1>>1
+       MVN     r11,r11                 ; r11=~p7
+       SSUB8   r10,r14,r12             ; r10= m2=v2-u2
+       ; Single issue
+       EOR     r5, r5, r10             ; r5 = m2^p4
+       EOR     r11,r11,r10             ; r11= m2^~p7
+       UHADD8  r5, r5, r11             ; r5 = (m2^p4)+(m2^~p7)>>1
+       ; Single issue
+       EOR     r5, r5, r10             ; r5 = a2=m2^((m2^p4)+(m2^~p7)>>1)
+       ; Single issue
+       UHADD8  r5, r5, r12             ; r5 = a2+u2>>1
+       LDR     r12,=0x7F7F7F7F         ; r12 = {127}x4
+       UHADD8  r5, r5, r14             ; r5 = f2=(a2+u2>>1)+v2>>1
+       ; Now split f[i] by sign.
+       ; There's no min or max instruction.
+       ; We could use SSUB8 and SEL, but this is just as many instructions and
+       ;  dual issues more (for v7 without NEON).
+       UQSUB8  r10,r4, r12             ; r10= R_i>0?R_i:0
+       UQSUB8  r4, r12,r4              ; r4 = R_i<0?-R_i:0
+       UQADD8  r11,r10,r2              ; r11= 255-max(2*L-abs(R_i<0),0)
+       UQADD8  r14,r4, r2              ; r14= 255-max(2*L-abs(R_i>0),0)
+       UQADD8  r10,r10,r11
+       UQADD8  r4, r4, r14
+       UQSUB8  r10,r10,r11             ; r10= min(abs(R_i<0),max(2*L-abs(R_i<0),0))
+       UQSUB8  r4, r4, r14             ; r4 = min(abs(R_i>0),max(2*L-abs(R_i>0),0))
+       UQSUB8  r11,r5, r12             ; r11= R_i>0?R_i:0
+       UQADD8  r6, r6, r10
+       UQSUB8  r8, r8, r10
+       UQSUB8  r5, r12,r5              ; r5 = R_i<0?-R_i:0
+       UQSUB8  r6, r6, r4              ; r6 = p1+lflim(R_i,L)
+       UQADD8  r8, r8, r4              ; r8 = p2-lflim(R_i,L)
+       UQADD8  r10,r11,r2              ; r10= 255-max(2*L-abs(R_i<0),0)
+       UQADD8  r14,r5, r2              ; r14= 255-max(2*L-abs(R_i>0),0)
+       UQADD8  r11,r11,r10
+       UQADD8  r5, r5, r14
+       UQSUB8  r11,r11,r10             ; r11= min(abs(R_i<0),max(2*L-abs(R_i<0),0))
+       UQSUB8  r5, r5, r14             ; r5 = min(abs(R_i>0),max(2*L-abs(R_i>0),0))
+       UQADD8  r7, r7, r11
+       UQSUB8  r9, r9, r11
+       UQSUB8  r7, r7, r5              ; r7 = p5+lflim(R_i,L)
+       STRD    r6, [r0, -r1]           ; [p5:p1] = [r7: r6]
+       UQADD8  r9, r9, r5              ; r9 = p6-lflim(R_i,L)
+       STRD    r8, [r0]                ; [p6:p2] = [r9: r8]
+       LDMFD   r13!,{r4-r11,PC}
+       ENDP
+
+oc_loop_filter_frag_rows_v6 PROC
+       ; r0 = _ref_frame_data
+       ; r1 = _ystride
+       ; r2 = _bv
+       ; r3 = _frags
+       ; r4 = _fragi0
+       ; r5 = _fragi0_end
+       ; r6 = _fragi_top
+       ; r7 = _fragi_bot
+       ; r8 = _frag_buf_offs
+       ; r9 = _nhfrags
+       MOV     r12,r13
+       STMFD   r13!,{r0,r4-r11,r14}
+       LDMFD   r12,{r4-r9}
+       LDR     r2, [r2]        ; ll = *(int *)_bv
+       CMP     r4, r5          ; if(_fragi0>=_fragi0_end)
+       BGE     oslffri_v6_end  ;   bail
+       SUBS    r9, r9, #1      ; r9 = _nhfrags-1       if (r9<=0)
+       BLE     oslffri_v6_end  ;                         bail
+       ADD     r3, r3, r4, LSL #2      ; r3 = &_frags[fragi]
+       ADD     r8, r8, r4, LSL #2      ; r8 = &_frag_buf_offs[fragi]
+       SUB     r7, r7, r9      ; _fragi_bot -= _nhfrags;
+oslffri_v6_lp1
+       MOV     r10,r4          ; r10= fragi = _fragi0
+       ADD     r11,r4, r9      ; r11= fragi_end-1=fragi+_nhfrags-1
+oslffri_v6_lp2
+       LDR     r14,[r3], #4    ; r14= _frags[fragi]    _frags++
+       LDR     r0, [r13]       ; r0 = _ref_frame_data
+       LDR     r12,[r8], #4    ; r12= _frag_buf_offs[fragi]   _frag_buf_offs++
+       TST     r14,#OC_FRAG_CODED_FLAG
+       BEQ     oslffri_v6_uncoded
+       CMP     r10,r4          ; if (fragi>_fragi0)
+       ADD     r0, r0, r12     ; r0 = _ref_frame_data + _frag_buf_offs[fragi]
+       BLGT    loop_filter_h_v6
+       CMP     r4, r6          ; if (fragi0>_fragi_top)
+       BLGT    loop_filter_v_v6
+       CMP     r10,r11         ; if(fragi+1<fragi_end)===(fragi<fragi_end-1)
+       LDRLT   r12,[r3]        ; r12 = _frags[fragi+1]
+       ADD     r0, r0, #8
+       ADD     r10,r10,#1      ; r10 = fragi+1;
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG ; && _frags[fragi+1].coded==0
+       BLLT    loop_filter_h_v6
+       CMP     r10,r7          ; if (fragi<_fragi_bot)
+       LDRLT   r12,[r3, r9, LSL #2]    ; r12 = _frags[fragi+1+_nhfrags-1]
+       SUB     r0, r0, #8
+       ADD     r0, r0, r1, LSL #3
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG
+       BLLT    loop_filter_v_v6
+       CMP     r10,r11         ; while(fragi<=fragi_end-1)
+       BLE     oslffri_v6_lp2
+       MOV     r4, r10         ; r4 = fragi0 += nhfrags
+       CMP     r4, r5
+       BLT     oslffri_v6_lp1
+oslffri_v6_end
+       LDMFD   r13!,{r0,r4-r11,PC}
+oslffri_v6_uncoded
+       ADD     r10,r10,#1
+       CMP     r10,r11
+       BLE     oslffri_v6_lp2
+       MOV     r4, r10         ; r4 = fragi0 += nhfrags
+       CMP     r4, r5
+       BLT     oslffri_v6_lp1
+       LDMFD   r13!,{r0,r4-r11,PC}
+       ENDP
+ ]
+
+ [ OC_ARM_ASM_NEON
+       EXPORT  oc_loop_filter_init_neon
+       EXPORT  oc_loop_filter_frag_rows_neon
+
+oc_loop_filter_init_neon PROC
+       ; r0 = _bv
+       ; r1 = _flimit (=L from the spec)
+       MOV             r1, r1, LSL #1  ; r1 = 2*L
+       VDUP.S16        Q15, r1         ; Q15= 2L in U16s
+       VST1.64         {D30,D31}, [r0@128]
+       MOV     PC,r14
+       ENDP
+
+loop_filter_h_neon PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int           *_bv
+       ; preserves r0-r3
+       ; We assume Q15= 2*L in U16s
+       ;                    My best guesses at cycle counts (and latency)--vvv
+       SUB     r12,r0, #2
+       ; Doing a 2-element structure load saves doing two VTRN's below, at the
+       ;  cost of using two more slower single-lane loads vs. the faster
+       ;  all-lane loads.
+       ; It's less code this way, though, and benches a hair faster, but it
+       ;  leaves D2 and D4 swapped.
+       VLD2.16 {D0[],D2[]},  [r12], r1         ; D0 = ____________1100     2,1
+                                               ; D2 = ____________3322
+       VLD2.16 {D4[],D6[]},  [r12], r1         ; D4 = ____________5544     2,1
+                                               ; D6 = ____________7766
+       VLD2.16 {D0[1],D2[1]},[r12], r1         ; D0 = ________99881100     3,1
+                                               ; D2 = ________BBAA3322
+       VLD2.16 {D4[1],D6[1]},[r12], r1         ; D4 = ________DDCC5544     3,1
+                                               ; D6 = ________FFEE7766
+       VLD2.16 {D0[2],D2[2]},[r12], r1         ; D0 = ____GGHH99881100     3,1
+                                               ; D2 = ____JJIIBBAA3322
+       VLD2.16 {D4[2],D6[2]},[r12], r1         ; D4 = ____KKLLDDCC5544     3,1
+                                               ; D6 = ____NNMMFFEE7766
+       VLD2.16 {D0[3],D2[3]},[r12], r1         ; D0 = PPOOGGHH99881100     3,1
+                                               ; D2 = RRQQJJIIBBAA3322
+       VLD2.16 {D4[3],D6[3]},[r12], r1         ; D4 = TTSSKKLLDDCC5544     3,1
+                                               ; D6 = VVUUNNMMFFEE7766
+       VTRN.8  D0, D4  ; D0 = SSOOKKGGCC884400 D4 = TTPPLLHHDD995511       1,1
+       VTRN.8  D2, D6  ; D2 = UUQQMMIIEEAA6622 D6 = VVRRNNJJFFBB7733       1,1
+       VSUBL.U8        Q0, D0, D6      ; Q0 = 00 - 33 in S16s              1,3
+       VSUBL.U8        Q8, D2, D4      ; Q8 = 22 - 11 in S16s              1,3
+       ADD     r12,r0, #8
+       VADD.S16        Q0, Q0, Q8      ;                                   1,3
+       PLD     [r12]
+       VADD.S16        Q0, Q0, Q8      ;                                   1,3
+       PLD     [r12,r1]
+       VADD.S16        Q0, Q0, Q8      ; Q0 = [0-3]+3*[2-1]                1,3
+       PLD     [r12,r1, LSL #1]
+       VRSHR.S16       Q0, Q0, #3      ; Q0 = f = ([0-3]+3*[2-1]+4)>>3     1,4
+       ADD     r12,r12,r1, LSL #2
+       ;  We want to do
+       ; f =             CLAMP(MIN(-2L-f,0), f, MAX(2L-f,0))
+       ;   = ((f >= 0) ? MIN( f ,MAX(2L- f ,0)) : MAX(  f , MIN(-2L- f ,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) : MAX(-|f|, MIN(-2L+|f|,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) :-MIN( |f|,-MIN(-2L+|f|,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) :-MIN( |f|, MAX( 2L-|f|,0)))
+       ; So we've reduced the left and right hand terms to be the same, except
+       ; for a negation.
+       ; Stall x3
+       VABS.S16        Q9, Q0          ; Q9 = |f| in U16s                  1,4
+       PLD     [r12,-r1]
+       VSHR.S16        Q0, Q0, #15     ; Q0 = -1 or 0 according to sign    1,3
+       PLD     [r12]
+       VQSUB.U16       Q10,Q15,Q9      ; Q10= MAX(2L-|f|,0) in U16s        1,4
+       PLD     [r12,r1]
+       VMOVL.U8        Q1, D2     ; Q2 = __UU__QQ__MM__II__EE__AA__66__22  2,3
+       PLD     [r12,r1,LSL #1]
+       VMIN.U16        Q9, Q10,Q9      ; Q9 = MIN(|f|,MAX(2L-|f|))         1,4
+       ADD     r12,r12,r1, LSL #2
+       ; Now we need to correct for the sign of f.
+       ; For negative elements of Q0, we want to subtract the appropriate
+       ; element of Q9. For positive elements we want to add them. No NEON
+       ; instruction exists to do this, so we need to negate the negative
+       ; elements, and we can then just add them. a-b = a-(1+!b) = a-1+!b
+       VADD.S16        Q9, Q9, Q0      ;                                   1,3
+       PLD     [r12,-r1]
+       VEOR.S16        Q9, Q9, Q0      ; Q9 = real value of f              1,3
+       ; Bah. No VRSBW.U8
+       ; Stall (just 1 as Q9 not needed to second pipeline stage. I think.)
+       VADDW.U8        Q2, Q9, D4 ; Q1 = xxTTxxPPxxLLxxHHxxDDxx99xx55xx11  1,3
+       VSUB.S16        Q1, Q1, Q9 ; Q2 = xxUUxxQQxxMMxxIIxxEExxAAxx66xx22  1,3
+       VQMOVUN.S16     D4, Q2          ; D4 = TTPPLLHHDD995511             1,1
+       VQMOVUN.S16     D2, Q1          ; D2 = UUQQMMIIEEAA6622             1,1
+       SUB     r12,r0, #1
+       VTRN.8  D4, D2          ; D4 = QQPPIIHHAA992211 D2 = MMLLEEDD6655   1,1
+       VST1.16 {D4[0]}, [r12], r1
+       VST1.16 {D2[0]}, [r12], r1
+       VST1.16 {D4[1]}, [r12], r1
+       VST1.16 {D2[1]}, [r12], r1
+       VST1.16 {D4[2]}, [r12], r1
+       VST1.16 {D2[2]}, [r12], r1
+       VST1.16 {D4[3]}, [r12], r1
+       VST1.16 {D2[3]}, [r12], r1
+       MOV     PC,r14
+       ENDP
+
+loop_filter_v_neon PROC
+       ; r0 = unsigned char *_pix
+       ; r1 = int            _ystride
+       ; r2 = int           *_bv
+       ; preserves r0-r3
+       ; We assume Q15= 2*L in U16s
+       ;                    My best guesses at cycle counts (and latency)--vvv
+       SUB     r12,r0, r1, LSL #1
+       VLD1.64 {D0}, [r12@64], r1              ; D0 = SSOOKKGGCC884400     2,1
+       VLD1.64 {D2}, [r12@64], r1              ; D2 = TTPPLLHHDD995511     2,1
+       VLD1.64 {D4}, [r12@64], r1              ; D4 = UUQQMMIIEEAA6622     2,1
+       VLD1.64 {D6}, [r12@64]                  ; D6 = VVRRNNJJFFBB7733     2,1
+       VSUBL.U8        Q8, D4, D2      ; Q8 = 22 - 11 in S16s              1,3
+       VSUBL.U8        Q0, D0, D6      ; Q0 = 00 - 33 in S16s              1,3
+       ADD     r12, #8
+       VADD.S16        Q0, Q0, Q8      ;                                   1,3
+       PLD     [r12]
+       VADD.S16        Q0, Q0, Q8      ;                                   1,3
+       PLD     [r12,r1]
+       VADD.S16        Q0, Q0, Q8      ; Q0 = [0-3]+3*[2-1]                1,3
+       SUB     r12, r0, r1
+       VRSHR.S16       Q0, Q0, #3      ; Q0 = f = ([0-3]+3*[2-1]+4)>>3     1,4
+       ;  We want to do
+       ; f =             CLAMP(MIN(-2L-f,0), f, MAX(2L-f,0))
+       ;   = ((f >= 0) ? MIN( f ,MAX(2L- f ,0)) : MAX(  f , MIN(-2L- f ,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) : MAX(-|f|, MIN(-2L+|f|,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) :-MIN( |f|,-MIN(-2L+|f|,0)))
+       ;   = ((f >= 0) ? MIN(|f|,MAX(2L-|f|,0)) :-MIN( |f|, MAX( 2L-|f|,0)))
+       ; So we've reduced the left and right hand terms to be the same, except
+       ; for a negation.
+       ; Stall x3
+       VABS.S16        Q9, Q0          ; Q9 = |f| in U16s                  1,4
+       VSHR.S16        Q0, Q0, #15     ; Q0 = -1 or 0 according to sign    1,3
+       ; Stall x2
+       VQSUB.U16       Q10,Q15,Q9      ; Q10= MAX(2L-|f|,0) in U16s        1,4
+       VMOVL.U8        Q2, D4     ; Q2 = __UU__QQ__MM__II__EE__AA__66__22  2,3
+       ; Stall x2
+       VMIN.U16        Q9, Q10,Q9      ; Q9 = MIN(|f|,MAX(2L-|f|))         1,4
+       ; Now we need to correct for the sign of f.
+       ; For negative elements of Q0, we want to subtract the appropriate
+       ; element of Q9. For positive elements we want to add them. No NEON
+       ; instruction exists to do this, so we need to negate the negative
+       ; elements, and we can then just add them. a-b = a-(1+!b) = a-1+!b
+       ; Stall x3
+       VADD.S16        Q9, Q9, Q0      ;                                   1,3
+       ; Stall x2
+       VEOR.S16        Q9, Q9, Q0      ; Q9 = real value of f              1,3
+       ; Bah. No VRSBW.U8
+       ; Stall (just 1 as Q9 not needed to second pipeline stage. I think.)
+       VADDW.U8        Q1, Q9, D2 ; Q1 = xxTTxxPPxxLLxxHHxxDDxx99xx55xx11  1,3
+       VSUB.S16        Q2, Q2, Q9 ; Q2 = xxUUxxQQxxMMxxIIxxEExxAAxx66xx22  1,3
+       VQMOVUN.S16     D2, Q1          ; D2 = TTPPLLHHDD995511             1,1
+       VQMOVUN.S16     D4, Q2          ; D4 = UUQQMMIIEEAA6622             1,1
+       VST1.64 {D2}, [r12@64], r1
+       VST1.64 {D4}, [r12@64], r1
+       MOV     PC,r14
+       ENDP
+
+oc_loop_filter_frag_rows_neon PROC
+       ; r0 = _ref_frame_data
+       ; r1 = _ystride
+       ; r2 = _bv
+       ; r3 = _frags
+       ; r4 = _fragi0
+       ; r5 = _fragi0_end
+       ; r6 = _fragi_top
+       ; r7 = _fragi_bot
+       ; r8 = _frag_buf_offs
+       ; r9 = _nhfrags
+       MOV     r12,r13
+       STMFD   r13!,{r0,r4-r11,r14}
+       LDMFD   r12,{r4-r9}
+       CMP     r4, r5          ; if(_fragi0>=_fragi0_end)
+       BGE     oslffri_neon_end;   bail
+       SUBS    r9, r9, #1      ; r9 = _nhfrags-1       if (r9<=0)
+       BLE     oslffri_neon_end        ;                 bail
+       VLD1.64 {D30,D31}, [r2@128]     ; Q15= 2L in U16s
+       ADD     r3, r3, r4, LSL #2      ; r3 = &_frags[fragi]
+       ADD     r8, r8, r4, LSL #2      ; r8 = &_frag_buf_offs[fragi]
+       SUB     r7, r7, r9      ; _fragi_bot -= _nhfrags;
+oslffri_neon_lp1
+       MOV     r10,r4          ; r10= fragi = _fragi0
+       ADD     r11,r4, r9      ; r11= fragi_end-1=fragi+_nhfrags-1
+oslffri_neon_lp2
+       LDR     r14,[r3], #4    ; r14= _frags[fragi]    _frags++
+       LDR     r0, [r13]       ; r0 = _ref_frame_data
+       LDR     r12,[r8], #4    ; r12= _frag_buf_offs[fragi]   _frag_buf_offs++
+       TST     r14,#OC_FRAG_CODED_FLAG
+       BEQ     oslffri_neon_uncoded
+       CMP     r10,r4          ; if (fragi>_fragi0)
+       ADD     r0, r0, r12     ; r0 = _ref_frame_data + _frag_buf_offs[fragi]
+       BLGT    loop_filter_h_neon
+       CMP     r4, r6          ; if (_fragi0>_fragi_top)
+       BLGT    loop_filter_v_neon
+       CMP     r10,r11         ; if(fragi+1<fragi_end)===(fragi<fragi_end-1)
+       LDRLT   r12,[r3]        ; r12 = _frags[fragi+1]
+       ADD     r0, r0, #8
+       ADD     r10,r10,#1      ; r10 = fragi+1;
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG ; && _frags[fragi+1].coded==0
+       BLLT    loop_filter_h_neon
+       CMP     r10,r7          ; if (fragi<_fragi_bot)
+       LDRLT   r12,[r3, r9, LSL #2]    ; r12 = _frags[fragi+1+_nhfrags-1]
+       SUB     r0, r0, #8
+       ADD     r0, r0, r1, LSL #3
+       ANDLT   r12,r12,#OC_FRAG_CODED_FLAG
+       CMPLT   r12,#OC_FRAG_CODED_FLAG
+       BLLT    loop_filter_v_neon
+       CMP     r10,r11         ; while(fragi<=fragi_end-1)
+       BLE     oslffri_neon_lp2
+       MOV     r4, r10         ; r4 = _fragi0 += _nhfrags
+       CMP     r4, r5
+       BLT     oslffri_neon_lp1
+oslffri_neon_end
+       LDMFD   r13!,{r0,r4-r11,PC}
+oslffri_neon_uncoded
+       ADD     r10,r10,#1
+       CMP     r10,r11
+       BLE     oslffri_neon_lp2
+       MOV     r4, r10         ; r4 = _fragi0 += _nhfrags
+       CMP     r4, r5
+       BLT     oslffri_neon_lp1
+       LDMFD   r13!,{r0,r4-r11,PC}
+       ENDP
+ ]
+
+       END
diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
deleted file mode 100644
index 11674af379..0000000000
--- a/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Theora Video Codec"
-DESCRIPTION = "The libtheora reference implementation provides the standard encoder and decoder under a BSD license."
-HOMEPAGE = "http://xiph.org/"
-BUGTRACKER = "https://trac.xiph.org/newticket"
-SECTION = "libs"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cf91718f59eb6a83d06dc7bcaf411132"
-DEPENDS = "libogg"
-SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.bz2 \
-           file://no-docs.patch"
-SRC_URI[md5sum] = "292ab65cedd5021d6b7ddd117e07cd8e"
-SRC_URI[sha256sum] = "b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc"
-UPSTREAM_CHECK_REGEX = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
-inherit autotools pkgconfig
-EXTRA_OECONF = "--disable-examples"
diff --git a/meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb b/meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb
new file mode 100644
index 0000000000..04de8507fb
--- /dev/null
+++ b/meta/recipes-multimedia/libtheora/libtheora_1.2.0.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Theora Video Codec"
+DESCRIPTION = "The libtheora reference implementation provides the standard encoder and decoder under a BSD license."
+HOMEPAGE = "http://xiph.org/"
+BUGTRACKER = "https://trac.xiph.org/newticket"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cf91718f59eb6a83d06dc7bcaf411132"
+DEPENDS = "libogg"
+SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-${PV}.tar.xz \
+           file://0001-add-missing-files.patch"
+SRC_URI[sha256sum] = "ebdf77a8f5c0a8f7a9e42323844fa09502b34eb1d1fece7b5f54da41fe2122ec"
+UPSTREAM_CHECK_REGEX = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)"
+inherit autotools pkgconfig
+EXTRA_OECONF = "--disable-examples --disable-doc"
+# theora 1.2.0 has broken 32-bit arm assembler, see:
+# https://gitlab.xiph.org/xiph/theora/-/issues/2339
+# https://gitlab.xiph.org/xiph/theora/-/issues/2340
+EXTRA_OECONF:append:arm = " --disable-asm"
+# these old architectures don't support all the instructions from the asm source files
+EXTRA_OECONF:append:armv4 = " --disable-asm "
+EXTRA_OECONF:append:armv5 = " --disable-asm "
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0001.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0001.patch
deleted file mode 100644
index f5520fcafd..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0001.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-From 335947359ce2dd3862cd9f7c49f92eba065dfed4 Mon Sep 17 00:00:00 2001
-From: Su_Laus <sulau@freenet.de>
-Date: Thu, 1 Feb 2024 13:06:08 +0000
-Subject: [PATCH] manpage: Update TIFF documentation about TIFFOpenOptions.rst
- and TIFFOpenOptionsSetMaxSingleMemAlloc() usage and some other small fixes.
-CVE: CVE-2023-52355
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/335947359ce2dd3862cd9f7c49f92eba065dfed4]
-Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
- doc/functions/TIFFDeferStrileArrayWriting.rst |  5 +++
- doc/functions/TIFFError.rst                   |  3 ++
- doc/functions/TIFFOpen.rst                    | 13 +++---
- doc/functions/TIFFOpenOptions.rst             | 44 ++++++++++++++++++-
- doc/functions/TIFFStrileQuery.rst             |  5 +++
- doc/libtiff.rst                               | 31 ++++++++++++-
- 6 files changed, 91 insertions(+), 10 deletions(-)
-diff --git a/doc/functions/TIFFDeferStrileArrayWriting.rst b/doc/functions/TIFFDeferStrileArrayWriting.rst
-index 60ee746..705aebc 100644
--- a/doc/functions/TIFFDeferStrileArrayWriting.rst
-+++ b/doc/functions/TIFFDeferStrileArrayWriting.rst
-@@ -61,6 +61,11 @@ Diagnostics
- All error messages are directed to the :c:func:`TIFFErrorExtR` routine.
- Likewise, warning messages are directed to the :c:func:`TIFFWarningExtR` routine.
- 
-+Note
-+----
-+
-+This functionality was introduced with libtiff 4.1.
-+
- See also
- --------
- 
-diff --git a/doc/functions/TIFFError.rst b/doc/functions/TIFFError.rst
-index 99924ad..cf4b37c 100644
--- a/doc/functions/TIFFError.rst
-+++ b/doc/functions/TIFFError.rst
-@@ -65,6 +65,9 @@ or :c:func:`TIFFClientOpenExt`.
- Furthermore, a **custom defined data structure** *user_data* for the
- error handler can be given along.
- 
-+Please refer to :doc:`/functions/TIFFOpenOptions` for how to setup the
-+application-specific handler introduced with libtiff 4.5.
-+
- Note
- ----
- 
-diff --git a/doc/functions/TIFFOpen.rst b/doc/functions/TIFFOpen.rst
-index db79d7b..adc474f 100644
--- a/doc/functions/TIFFOpen.rst
-+++ b/doc/functions/TIFFOpen.rst
-@@ -94,8 +94,9 @@ TIFF structure without closing the file handle and afterwards the
- file should be closed using its file descriptor *fd*.
- 
- :c:func:`TIFFOpenExt` (added in libtiff 4.5) is like :c:func:`TIFFOpen`,
-but options, such as re-entrant error and warning handlers may be passed
-with the *opts* argument. The *opts* argument may be NULL. 
-+but options, such as re-entrant error and warning handlers and a limit in byte
-+that libtiff internal memory allocation functions are allowed to request per call
-+may be passed with the *opts* argument. The *opts* argument may be NULL.
- Refer to :doc:`TIFFOpenOptions` for allocating and filling the *opts* argument
- parameters. The allocated memory for :c:type:`TIFFOpenOptions`
- can be released straight after successful execution of the related
-@@ -105,9 +106,7 @@ can be released straight after successful execution of the related
- but opens a TIFF file with a Unicode filename.
- 
- :c:func:`TIFFFdOpenExt` (added in libtiff 4.5) is like :c:func:`TIFFFdOpen`,
-but options, such as re-entrant error and warning handlers may be passed
-with the *opts* argument. The *opts* argument may be NULL. 
-Refer to :doc:`TIFFOpenOptions` for filling the *opts* argument.
-+but options argument *opts* like for :c:func:`TIFFOpenExt` can be passed.
- 
- :c:func:`TIFFSetFileName` sets the file name in the tif-structure
- and returns the old file name.
-@@ -326,5 +325,5 @@ See also
- 
- :doc:`libtiff` (3tiff),
- :doc:`TIFFClose` (3tiff),
-:doc:`TIFFStrileQuery`,
-:doc:`TIFFOpenOptions`
-\ No newline at end of file
-+:doc:`TIFFStrileQuery` (3tiff),
-+:doc:`TIFFOpenOptions`
-diff --git a/doc/functions/TIFFOpenOptions.rst b/doc/functions/TIFFOpenOptions.rst
-index 5c67566..23f2975 100644
--- a/doc/functions/TIFFOpenOptions.rst
-+++ b/doc/functions/TIFFOpenOptions.rst
-@@ -38,12 +38,17 @@ opaque structure and returns a :c:type:`TIFFOpenOptions` pointer.
- :c:func:`TIFFOpenOptionsFree` releases the allocated memory for
- :c:type:`TIFFOpenOptions`. The allocated memory for :c:type:`TIFFOpenOptions`
- can be released straight after successful execution of the related
-TIFF open"Ext" functions like :c:func:`TIFFOpenExt`.
-+TIFFOpen"Ext" functions like :c:func:`TIFFOpenExt`.
- 
- :c:func:`TIFFOpenOptionsSetMaxSingleMemAlloc` sets parameter for the
- maximum single memory limit in byte that ``libtiff`` internal memory allocation
- functions are allowed to request per call.
- 
-+.. note::
-+    However, the ``libtiff`` external functions :c:func:`_TIFFmalloc`
-+    and :c:func:`_TIFFrealloc` **do not apply** this internal memory
-+    allocation limit set by :c:func:`TIFFOpenOptionsSetMaxSingleMemAlloc`!
-+
- :c:func:`TIFFOpenOptionsSetErrorHandlerExtR` sets the function pointer to
- an application-specific and per-TIFF handle (re-entrant) error handler.
- Furthermore, a pointer to a **custom defined data structure** *errorhandler_user_data* 
-@@ -55,6 +60,43 @@ The *errorhandler_user_data* argument may be NULL.
- :c:func:`TIFFOpenOptionsSetErrorHandlerExtR` but for the warning handler,
- which is invoked through  :c:func:`TIFFWarningExtR`
- 
-+Example
-+-------
-+
-+::
-+
-+    #include "tiffio.h"
-+
-+    typedef struct MyErrorHandlerUserDataStruct
-+    {
-+        /* ... any user data structure ... */
-+    } MyErrorHandlerUserDataStruct;
-+
-+    static int myErrorHandler(TIFF *tiff, void *user_data, const char *module,
-+                          const char *fmt, va_list ap)
-+    {
-+        MyErrorHandlerUserDataStruct *errorhandler_user_data =
-+            (MyErrorHandlerUserDataStruct *)user_data;
-+        /*... code of myErrorHandler ...*/
-+        return 1;
-+    }
-+
-+
-+    main()
-+    {
-+        tmsize_t limit = (256 * 1024 * 1024);
-+        MyErrorHandlerUserDataStruct user_data = { /* ... any data ... */};
-+
-+        TIFFOpenOptions *opts = TIFFOpenOptionsAlloc();
-+        TIFFOpenOptionsSetMaxSingleMemAlloc(opts, limit);
-+        TIFFOpenOptionsSetErrorHandlerExtR(opts, myErrorHandler, &user_data);
-+        TIFF *tif = TIFFOpenExt("foo.tif", "r", opts);
-+        TIFFOpenOptionsFree(opts);
-+        /* ... go on here ... */
-+
-+        TIFFClose(tif);
-+    }
-+
- Note
- ----
- 
-diff --git a/doc/functions/TIFFStrileQuery.rst b/doc/functions/TIFFStrileQuery.rst
-index f8631af..7931fe4 100644
--- a/doc/functions/TIFFStrileQuery.rst
-+++ b/doc/functions/TIFFStrileQuery.rst
-@@ -66,6 +66,11 @@ Diagnostics
- All error messages are directed to the :c:func:`TIFFErrorExtR` routine.
- Likewise, warning messages are directed to the :c:func:`TIFFWarningExtR` routine.
- 
-+Note
-+----
-+
-+This functionality was introduced with libtiff 4.1.
-+
- See also
- --------
- 
-diff --git a/doc/libtiff.rst b/doc/libtiff.rst
-index 6a0054c..d96a860 100644
--- a/doc/libtiff.rst
-+++ b/doc/libtiff.rst
-@@ -90,11 +90,15 @@ compatibility on machines with a segmented architecture.
- :c:func:`realloc`, and :c:func:`free` routines in the C library.)
- 
- To deal with segmented pointer issues ``libtiff`` also provides
-:c:func:`_TIFFmemcpy`, :c:func:`_TIFFmemset`, and :c:func:`_TIFFmemmove`
-+:c:func:`_TIFFmemcpy`, :c:func:`_TIFFmemset`, and :c:func:`_TIFFmemcmp`
- routines that mimic the equivalent ANSI C routines, but that are
- intended for use with memory allocated through :c:func:`_TIFFmalloc`
- and :c:func:`_TIFFrealloc`.
- 
-+With ``libtiff`` 4.5 a method was introduced to limit the internal
-+memory allocation that functions are allowed to request per call
-+(see  :c:func:`TIFFOpenOptionsSetMaxSingleMemAlloc` and :c:func:`TIFFOpenExt`).
-+
- Error Handling
- --------------
- 
-@@ -106,6 +110,10 @@ routine that can be specified with a call to :c:func:`TIFFSetErrorHandler`.
- Likewise warning messages are directed to a single handler routine
- that can be specified with a call to :c:func:`TIFFSetWarningHandler`
- 
-+Further application-specific and per-TIFF handle (re-entrant) error handler
-+and warning handler can be set. Please refer to :doc:`/functions/TIFFError`
-+and :doc:`/functions/TIFFOpenOptions`.
-+
- Basic File Handling
- -------------------
- 
-@@ -139,7 +147,7 @@ a ``"w"`` argument:
-     main()
-     {
-         TIFF* tif = TIFFOpen("foo.tif", "w");
-        ... do stuff ...
-+        /* ... do stuff ... */
-         TIFFClose(tif);
-     }
- 
-@@ -157,6 +165,25 @@ to always call :c:func:`TIFFClose` or :c:func:`TIFFFlush` to flush any
- buffered information to a file.  Note that if you call :c:func:`TIFFClose`
- you do not need to call :c:func:`TIFFFlush`.
- 
-+.. warning::
-+
-+    In order to prevent out-of-memory issues when opening a TIFF file
-+    :c:func:`TIFFOpenExt` can be used and then the maximum single memory
-+    limit in byte that ``libtiff`` internal memory allocation functions
-+    are allowed to request per call can be set with
-+    :c:func:`TIFFOpenOptionsSetMaxSingleMemAlloc`.
-+
-+Example
-+
-+::
-+
-+    tmsize_t limit = (256 * 1024 * 1024);
-+    TIFFOpenOptions *opts = TIFFOpenOptionsAlloc();
-+    TIFFOpenOptionsSetMaxSingleMemAlloc(opts, limit);
-+    TIFF *tif = TIFFOpenExt("foo.tif", "w", opts);
-+    TIFFOpenOptionsFree(opts);
-+    /* ... go on here ... */
-+
- TIFF Directories
- ----------------
- 
-- 
-2.40.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0002.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0002.patch
deleted file mode 100644
index 19a1ef727a..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52355-0002.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 16ab4a205cfc938c32686e8d697d048fabf97ed4 Mon Sep 17 00:00:00 2001
-From: Timothy Lyanguzov <theta682@gmail.com>
-Date: Thu, 1 Feb 2024 11:19:06 +0000
-Subject: [PATCH] Fix typo.
-CVE: CVE-2023-52355
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/16ab4a205cfc938c32686e8d697d048fabf97ed4]
-Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
- doc/libtiff.rst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/doc/libtiff.rst b/doc/libtiff.rst
-index d96a860..4fedc3e 100644
--- a/doc/libtiff.rst
-+++ b/doc/libtiff.rst
-@@ -169,7 +169,7 @@ you do not need to call :c:func:`TIFFFlush`.
-     In order to prevent out-of-memory issues when opening a TIFF file
-     :c:func:`TIFFOpenExt` can be used and then the maximum single memory
-    limit in byte that ``libtiff`` internal memory allocation functions
-+    limit in bytes that ``libtiff`` internal memory allocation functions
-     are allowed to request per call can be set with
-     :c:func:`TIFFOpenOptionsSetMaxSingleMemAlloc`.
--
-2.40.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52356.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52356.patch
deleted file mode 100644
index 75f5d8946a..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-52356.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 51558511bdbbcffdce534db21dbaf5d54b31638a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 1 Feb 2024 11:38:14 +0000
-Subject: [PATCH] TIFFReadRGBAStrip/TIFFReadRGBATile: add more validation of
- col/row (fixes #622)
-CVE: CVE-2023-52356
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/51558511bdbbcffdce534db21dbaf5d54b31638a]
-Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
- libtiff/tif_getimage.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-diff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c
-index 41f7dfd..9cd6eee 100644
--- a/libtiff/tif_getimage.c
-+++ b/libtiff/tif_getimage.c
-@@ -3224,6 +3224,13 @@ int TIFFReadRGBAStripExt(TIFF *tif, uint32_t row, uint32_t *raster,
-     if (TIFFRGBAImageOK(tif, emsg) &&
-         TIFFRGBAImageBegin(&img, tif, stop_on_error, emsg))
-     {
-+       if (row >= img.height)
-+        {
-+            TIFFErrorExtR(tif, TIFFFileName(tif),
-+                          "Invalid row passed to TIFFReadRGBAStrip().");
-+            TIFFRGBAImageEnd(&img);
-+            return (0);
-+       }
-         img.row_offset = row;
-         img.col_offset = 0;
-@@ -3301,6 +3308,14 @@ int TIFFReadRGBATileExt(TIFF *tif, uint32_t col, uint32_t row, uint32_t *raster,
-         return (0);
-     }
-+    if (col >= img.width || row >= img.height)
-+    {
-+        TIFFErrorExtR(tif, TIFFFileName(tif),
-+                      "Invalid row/col passed to TIFFReadRGBATile().");
-+        TIFFRGBAImageEnd(&img);
-+        return (0);
-+    }
-+
-     /*
-      * The TIFFRGBAImageGet() function doesn't allow us to get off the
-      * edge of the image, even to fill an otherwise valid tile.  So we
--
-2.40.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6228.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6228.patch
deleted file mode 100644
index 2020508fdf..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6228.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1e7d217a323eac701b134afc4ae39b6bdfdbc96a Mon Sep 17 00:00:00 2001
-From: Su_Laus <sulau@freenet.de>
-Date: Wed, 17 Jan 2024 06:57:08 +0000
-Subject: [PATCH] codec of input image is available, independently from codec
- check of output image and return with error if not.
-Fixes #606.
-CVE: CVE-2023-6228
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/1e7d217a323eac701b134afc4ae39b6bdfdbc96a]
-Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
- tools/tiffcp.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/tools/tiffcp.c b/tools/tiffcp.c
-index aff0626..a4f7f6b 100644
--- a/tools/tiffcp.c
-+++ b/tools/tiffcp.c
-@@ -846,6 +846,8 @@ static int tiffcp(TIFF *in, TIFF *out)
-     if (!TIFFIsCODECConfigured(compression))
-         return FALSE;
-     TIFFGetFieldDefaulted(in, TIFFTAG_COMPRESSION, &input_compression);
-+    if (!TIFFIsCODECConfigured(input_compression))
-+           return FALSE;
-     TIFFGetFieldDefaulted(in, TIFFTAG_PHOTOMETRIC, &input_photometric);
-     if (input_compression == COMPRESSION_JPEG)
-     {
--
-2.40.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
deleted file mode 100644
index 5d15dff1d9..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e1640519208121f916da1772a5efb6ca28971b86 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 31 Oct 2023 15:04:37 +0000
-Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s)
-CVE: CVE-2023-6277
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libtiff/tif_dirread.c | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index fe8d6f8..58a4276 100644
--- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -5306,7 +5306,6 @@ static int EstimateStripByteCounts(TIFF *tif, TIFFDirEntry *dir,
-     {
-         uint64_t space;
-         uint16_t n;
-        filesize = TIFFGetFileSize(tif);
-         if (!(tif->tif_flags & TIFF_BIGTIFF))
-             space = sizeof(TIFFHeaderClassic) + 2 + dircount * 12 + 4;
-         else
-- 
-2.43.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
deleted file mode 100644
index 9fc8182fef..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f500facf7723f1cae725dd288b2daad15e45131c Mon Sep 17 00:00:00 2001
-From: Su_Laus <sulau@freenet.de>
-Date: Mon, 30 Oct 2023 21:21:57 +0100
-Subject: [PATCH 2/3] At image reading, compare data size of some tags / data
- structures (StripByteCounts, StripOffsets, StripArray, TIFF directory) with
- file size to prevent provoked out-of-memory attacks.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-See issue #614.
-Correct declaration of ‘filesize’ shadows a previous local.
-CVE: CVE-2023-6277
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libtiff/tif_dirread.c | 1 -
- 1 file changed, 1 deletion(-)
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index c52d41f..fe8d6f8 100644
--- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -5305,7 +5305,6 @@ static int EstimateStripByteCounts(TIFF *tif, TIFFDirEntry *dir,
-     if (td->td_compression != COMPRESSION_NONE)
-     {
-         uint64_t space;
-        uint64_t filesize;
-         uint16_t n;
-         filesize = TIFFGetFileSize(tif);
-         if (!(tif->tif_flags & TIFF_BIGTIFF))
-- 
-2.43.0
diff --git a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch b/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch
deleted file mode 100644
index d5854a9059..0000000000
--- a/meta/recipes-multimedia/libtiff/tiff/CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From b33baa5d9c6aac8ce49b5180dd48e39697ab7a11 Mon Sep 17 00:00:00 2001
-From: Su_Laus <sulau@freenet.de>
-Date: Fri, 27 Oct 2023 22:11:10 +0200
-Subject: [PATCH 1/3] At image reading, compare data size of some tags / data
- structures (StripByteCounts, StripOffsets, StripArray, TIFF directory) with
- file size to prevent provoked out-of-memory attacks.
-See issue #614.
-CVE: CVE-2023-6277
-Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/merge_requests/545]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libtiff/tif_dirread.c | 90 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 90 insertions(+)
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 2c49dc6..c52d41f 100644
--- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -1308,6 +1308,21 @@ TIFFReadDirEntryArrayWithLimit(TIFF *tif, TIFFDirEntry *direntry,
-     datasize = (*count) * typesize;
-     assert((tmsize_t)datasize > 0);
- 
-+    /* Before allocating a huge amount of memory for corrupted files, check if
-+     * size of requested memory is not greater than file size.
-+     */
-+    uint64_t filesize = TIFFGetFileSize(tif);
-+    if (datasize > filesize)
-+    {
-+        TIFFWarningExtR(tif, "ReadDirEntryArray",
-+                        "Requested memory size for tag %d (0x%x) %" PRIu32
-+                        " is greather than filesize %" PRIu64
-+                        ". Memory not allocated, tag not read",
-+                        direntry->tdir_tag, direntry->tdir_tag, datasize,
-+                        filesize);
-+        return (TIFFReadDirEntryErrAlloc);
-+    }
-+
-     if (isMapped(tif) && datasize > (uint64_t)tif->tif_size)
-         return TIFFReadDirEntryErrIo;
- 
-@@ -5266,6 +5281,20 @@ static int EstimateStripByteCounts(TIFF *tif, TIFFDirEntry *dir,
-     if (!_TIFFFillStrilesInternal(tif, 0))
-         return -1;
- 
-+    /* Before allocating a huge amount of memory for corrupted files, check if
-+     * size of requested memory is not greater than file size. */
-+    uint64_t filesize = TIFFGetFileSize(tif);
-+    uint64_t allocsize = (uint64_t)td->td_nstrips * sizeof(uint64_t);
-+    if (allocsize > filesize)
-+    {
-+        TIFFWarningExtR(tif, module,
-+                        "Requested memory size for StripByteCounts of %" PRIu64
-+                        " is greather than filesize %" PRIu64
-+                        ". Memory not allocated",
-+                        allocsize, filesize);
-+        return -1;
-+    }
-+
-     if (td->td_stripbytecount_p)
-         _TIFFfreeExt(tif, td->td_stripbytecount_p);
-     td->td_stripbytecount_p = (uint64_t *)_TIFFCheckMalloc(
-@@ -5807,6 +5836,20 @@ static uint16_t TIFFFetchDirectory(TIFF *tif, uint64_t diroff,
-             dircount16 = (uint16_t)dircount64;
-             dirsize = 20;
-         }
-+        /* Before allocating a huge amount of memory for corrupted files, check
-+         * if size of requested memory is not greater than file size. */
-+        uint64_t filesize = TIFFGetFileSize(tif);
-+        uint64_t allocsize = (uint64_t)dircount16 * dirsize;
-+        if (allocsize > filesize)
-+        {
-+            TIFFWarningExtR(
-+                tif, module,
-+                "Requested memory size for TIFF directory of %" PRIu64
-+                " is greather than filesize %" PRIu64
-+                ". Memory not allocated, TIFF directory not read",
-+                allocsize, filesize);
-+            return 0;
-+        }
-         origdir = _TIFFCheckMalloc(tif, dircount16, dirsize,
-                                    "to read TIFF directory");
-         if (origdir == NULL)
-@@ -5921,6 +5964,20 @@ static uint16_t TIFFFetchDirectory(TIFF *tif, uint64_t diroff,
-                           "directories not supported");
-             return 0;
-         }
-+        /* Before allocating a huge amount of memory for corrupted files, check
-+         * if size of requested memory is not greater than file size. */
-+        uint64_t filesize = TIFFGetFileSize(tif);
-+        uint64_t allocsize = (uint64_t)dircount16 * dirsize;
-+        if (allocsize > filesize)
-+        {
-+            TIFFWarningExtR(
-+                tif, module,
-+                "Requested memory size for TIFF directory of %" PRIu64
-+                " is greather than filesize %" PRIu64
-+                ". Memory not allocated, TIFF directory not read",
-+                allocsize, filesize);
-+            return 0;
-+        }
-         origdir = _TIFFCheckMalloc(tif, dircount16, dirsize,
-                                    "to read TIFF directory");
-         if (origdir == NULL)
-@@ -5968,6 +6025,8 @@ static uint16_t TIFFFetchDirectory(TIFF *tif, uint64_t diroff,
-             }
-         }
-     }
-+    /* No check against filesize needed here because "dir" should have same size
-+     * than "origdir" checked above. */
-     dir = (TIFFDirEntry *)_TIFFCheckMalloc(
-         tif, dircount16, sizeof(TIFFDirEntry), "to read TIFF directory");
-     if (dir == 0)
-@@ -7164,6 +7223,20 @@ static int TIFFFetchStripThing(TIFF *tif, TIFFDirEntry *dir, uint32_t nstrips,
-             return (0);
-         }
- 
-+        /* Before allocating a huge amount of memory for corrupted files, check
-+         * if size of requested memory is not greater than file size. */
-+        uint64_t filesize = TIFFGetFileSize(tif);
-+        uint64_t allocsize = (uint64_t)nstrips * sizeof(uint64_t);
-+        if (allocsize > filesize)
-+        {
-+            TIFFWarningExtR(tif, module,
-+                            "Requested memory size for StripArray of %" PRIu64
-+                            " is greather than filesize %" PRIu64
-+                            ". Memory not allocated",
-+                            allocsize, filesize);
-+            _TIFFfreeExt(tif, data);
-+            return (0);
-+        }
-         resizeddata = (uint64_t *)_TIFFCheckMalloc(
-             tif, nstrips, sizeof(uint64_t), "for strip array");
-         if (resizeddata == 0)
-@@ -7263,6 +7336,23 @@ static void allocChoppedUpStripArrays(TIFF *tif, uint32_t nstrips,
-     }
-     bytecount = last_offset + last_bytecount - offset;
- 
-+    /* Before allocating a huge amount of memory for corrupted files, check if
-+     * size of StripByteCount and StripOffset tags is not greater than
-+     * file size.
-+     */
-+    uint64_t allocsize = (uint64_t)nstrips * sizeof(uint64_t) * 2;
-+    uint64_t filesize = TIFFGetFileSize(tif);
-+    if (allocsize > filesize)
-+    {
-+        TIFFWarningExtR(tif, "allocChoppedUpStripArrays",
-+                        "Requested memory size for StripByteCount and "
-+                        "StripOffsets %" PRIu64
-+                        " is greather than filesize %" PRIu64
-+                        ". Memory not allocated",
-+                        allocsize, filesize);
-+        return;
-+    }
-+
-     newcounts =
-         (uint64_t *)_TIFFCheckMalloc(tif, nstrips, sizeof(uint64_t),
-                                      "for chopped \"StripByteCounts\" array");
-- 
-2.43.0
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb
index d42ea6a6e5..5a6939d584 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.6.0.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.7.0.bb
@@ -3,28 +3,22 @@ DESCRIPTION = "Library provides support for the Tag Image File Format \
 (TIFF), a widely used format for storing image data.  This library \
 provide means to easily access and create TIFF image files."
 HOMEPAGE = "http://www.libtiff.org/"
-LICENSE = "BSD-2-Clause"
+LICENSE = "libtiff"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3"
 CVE_PRODUCT = "libtiff"
-SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
+SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz"
-           file://CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data.patch \
-           file://CVE-2023-6277-At-image-reading-compare-data-size-of-some-tags-data-2.patch \
-           file://CVE-2023-6277-Apply-1-suggestion-s-to-1-file-s.patch \
-           file://CVE-2023-6228.patch \
-           file://CVE-2023-52355-0001.patch \
-           file://CVE-2023-52355-0002.patch \
-           file://CVE-2023-52356.patch \
-           "
-SRC_URI[sha256sum] = "88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a"
+SRC_URI[sha256sum] = "67160e3457365ab96c5b3286a0903aa6e78bdc44c4bc737d2e486bcecb6ba976"
 # exclude betas
 UPSTREAM_CHECK_REGEX = "tiff-(?P<pver>\d+(\.\d+)+).tar"
 CVE_STATUS[CVE-2015-7313] = "fixed-version: Tested with check from https://security-tracker.debian.org/tracker/CVE-2015-7313 and already 4.3.0 doesn't have the issue"
-CVE_STATUS[CVE-2023-3164] = "cpe-incorrect: Issue only affects the tiffcrop tool not compiled by default since 4.6.0"
+CVE_STATUS[CVE-2023-52356] = "fixed-version: Fixed since 4.7.0, NVD tracks this as version-less vulnerability"
+CVE_STATUS[CVE-2023-6228] = "fixed-version: Fixed since 4.7.0, NVD tracks this as version-less vulnerability"
+CVE_STATUS[CVE-2023-6277] = "fixed-version: Fixed since 4.7.0, NVD tracks this as version-less vulnerability"
 inherit autotools multilib_header
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
index b06029b98b..36f47f9173 100644
--- a/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
+++ b/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
@@ -5,15 +5,13 @@ Subject: [PATCH] configure: Check for clang
 Disable gcc specific options if using clang
+Upstream-Status: Inactive-Upstream [https://gitlab.xiph.org/xiph/vorbis,https://github.com/xiph/vorbis]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
-Upstream-Status: Pending
 configure.ac | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 28b0a14..2d4e984 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -98,6 +98,16 @@ AC_ARG_ENABLE(examples,
@@ -51,6 +49,20 @@ index 28b0a14..2d4e984 100644
 
                # glibc < 2.1.3 has a serious FP bug in the math inline header
                # that will cripple Vorbis.  Look to see if the magic FP stack
-- 
+@@ -178,12 +193,12 @@ else
-2.17.0
+                fi;;
+         powerpc-*-linux*spe)
+                DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+-               CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -D_REENTRANT"
+-               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -D_REENTRANT";;
+                       CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT"
+                       PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT";;
+        powerpc-*-linux*)
+                DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES"
+-               CFLAGS="-O3 -Wall -Wextra -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+-               PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
+               CFLAGS="-O3 -Wall -Wextra -ffast-math -mcpu=750 -D_REENTRANT"
+               PROFILE="-pg -g -O3 -ffast-math -mcpu=750 -D_REENTRANT";;
+        *-*-linux*)
+                DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
+                CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT -fsigned-char"
diff --git a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.7.bb b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.7.bb
index 023bce0abe..d5bf5ff0fa 100644
--- a/meta/recipes-multimedia/libvorbis/libvorbis_1.3.7.bb
+++ b/meta/recipes-multimedia/libvorbis/libvorbis_1.3.7.bb
@@ -13,7 +13,6 @@ DEPENDS = "libogg"
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz \
           file://0001-configure-Check-for-clang.patch \
          "
-SRC_URI[md5sum] = "50902641d358135f06a8392e61c9ac77"
 SRC_URI[sha256sum] = "b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b"
 inherit autotools pkgconfig
diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb b/meta/recipes-multimedia/mpg123/mpg123_1.33.0.bb
index f7786e8588..2905bf0abc 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.32.6.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.33.0.bb
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "ccdd1d0abc31d73d8b435fc658c79049d0a905b30669b6a42a03ad169dc609e6"
+SRC_URI[sha256sum] = "2290e3aede6f4d163e1a17452165af33caad4b5f0948f99429cfa2d8385faa9d"
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -28,7 +28,7 @@ PACKAGECONFIG[jack] = ",,jack"
 PACKAGECONFIG[openal] = ",,openal-soft"
 PACKAGECONFIG[portaudio] = ",,portaudio-v19"
 PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio"
-PACKAGECONFIG[sdl] = ",,libsdl2"
+PACKAGECONFIG[sdl] = ",,virtual/libsdl2"
 # Following are possible sound output modules:
 # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index ae16056d24..695f4b676d 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -71,6 +71,14 @@ inherit bash-completion meson pkgconfig useradd gettext perlnative systemd manpa
 # if using --disable-nls
 USE_NLS = "yes"
+# Helps tests for -msse fail on non-SSE architectures which is all non-x86
+TUNE_CCARGS:append:toolchain-clang = " -Werror=unused-command-line-argument"
+# mix_neon.c:179:9: error: invalid operand in inline asm: 'vld1.s32 ${0:h}, [$2]
+#      vld1.s32 ${1:h}, [$3] '
+TOOLCHAIN:armv7ve = "gcc"
+TOOLCHAIN:armv7a = "gcc"
 EXTRA_OEMESON = "\
                -Dhal-compat=false \
                -Dorc=disabled \
@@ -121,9 +129,10 @@ PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack"
 # able to use pulseaudio autospawn for root as well.
 PACKAGECONFIG[autospawn-for-root] = ",,,"
 PACKAGECONFIG[lirc] = "-Dlirc=enabled,-Dlirc=disabled,lirc"
-PACKAGECONFIG[webrtc] = "-Dwebrtc-aec=enabled,-Dwebrtc-aec=disabled,webrtc-audio-processing"
+PACKAGECONFIG[webrtc] = "-Dwebrtc-aec=enabled,-Dwebrtc-aec=disabled,webrtc-audio-processing-1"
 PACKAGECONFIG[ipv6] = "-Dipv6=true,-Dipv6=false,"
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,"
+PACKAGECONFIG[oss-output] = "-Doss-output=enabled,-Doss-output=disabled,"
 export TARGET_PFPU = "${TARGET_FPU}"
@@ -142,7 +151,7 @@ do_compile:append () {
 do_install:append() {
        install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/04_pulse
+        install -m 0644 ${UNPACKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/04_pulse
 }
 USERADD_PACKAGES = "pulseaudio-server"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb
index 54c79b4097..6c172b4ec7 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_17.0.bb
@@ -1,6 +1,6 @@
 require pulseaudio.inc
-SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
+SRC_URI = "http://www.freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \
           file://0001-client-conf-Add-allow-autospawn-for-root.patch \
           file://0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch \
           file://volatiles.04_pulse \
diff --git a/meta/recipes-multimedia/sbc/sbc_2.0.bb b/meta/recipes-multimedia/sbc/sbc_2.1.bb
index d25be9e80c..8b91e7e65b 100644
--- a/meta/recipes-multimedia/sbc/sbc_2.0.bb
+++ b/meta/recipes-multimedia/sbc/sbc_2.1.bb
@@ -7,16 +7,19 @@ LICENSE:${PN} = "LGPL-2.1-or-later"
 LICENSE:${PN}-examples = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
-                    file://src/sbcenc.c;beginline=1;endline=24;md5=08e7a70b127f4100ff2cd7d629147d8d \
+                    file://src/sbcenc.c;beginline=1;endline=8;md5=cfac6012e2dea914de8b3b7693591622 \
-                    file://sbc/sbc.h;beginline=1;endline=26;md5=0f57d0df22b0d40746bdd29805a4361b"
+                    file://sbc/sbc.h;beginline=1;endline=10;md5=bbf642bd99160e4f2a5bbd5d174a8320 \
+                    "
 DEPENDS = "libsndfile1"
 SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${BP}.tar.xz"
-SRC_URI[sha256sum] = "8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992"
+SRC_URI[sha256sum] = "426633cabd7c798236443516dfa8335b47e004b0ef37ff107e0c7ead3299fcc2"
 inherit autotools pkgconfig
+CFLAGS += "-std=gnu17"
 PACKAGES =+ "${PN}-examples"
 FILES:${PN}-examples += "${bindir}/*"
diff --git a/meta/recipes-multimedia/webp/libwebp_1.4.0.bb b/meta/recipes-multimedia/webp/libwebp_1.5.0.bb
index d922970479..39fe947eea 100644
--- a/meta/recipes-multimedia/webp/libwebp_1.4.0.bb
+++ b/meta/recipes-multimedia/webp/libwebp_1.5.0.bb
@@ -13,8 +13,8 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6e8dee932c26f2dab503abf70c96d8bb \
                    file://PATENTS;md5=c6926d0cb07d296f886ab6e0cc5a85b7"
-SRC_URI = "http://downloads.webmproject.org/releases/webp/${BP}.tar.gz"
+SRC_URI = "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${BP}.tar.gz"
-SRC_URI[sha256sum] = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"
+SRC_URI[sha256sum] = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c"
 UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
diff --git a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
deleted file mode 100644
index cb771fb0bf..0000000000
--- a/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7bc25f4d1aaa5186d2eff3e2326c7245fcd7e7f3 Mon Sep 17 00:00:00 2001
-From: Christopher Larson <chris_larson@mentor.com>
-Date: Tue, 13 Dec 2016 14:22:32 -0700
-Subject: [PATCH] Fix X32 build by disabling asm
-This applies gentoo's x32 patch, adjusted slightly, which disables asm support
-for x32 as well as correcting -m.
-Debian has a different patch which does the same, and there's a superior yet
-out of date patch series on the x264 list which keeps asm support enabled, but
-doesn't successfully build at this time, and my assembly is very rusty.
-Upstream-Status: Pending
-Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
- configure | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-diff --git a/configure b/configure
-index 51b128d..6ea9469 100755
--- a/configure
-+++ b/configure
-@@ -754,7 +754,13 @@ case $host_cpu in
-         AS_EXT=".asm"
-         ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
-         stack_alignment=16
-        [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+        if [ $compiler = GNU ]; then
-+            if cpp_check "" "" "__ILP32__" ; then
-+                CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
-+            else
-+                CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+            fi
-+        fi
-         if [ "$SYS" = MACOSX ]; then
-             ASFLAGS="$ASFLAGS -f macho64 -DPREFIX"
-             if cc_check '' "-arch x86_64"; then
-@@ -773,7 +779,11 @@ case $host_cpu in
-                 RCFLAGS="--target=pe-x86-64 $RCFLAGS"
-             fi
-         else
-            ASFLAGS="$ASFLAGS -f elf64"
-+            if cpp_check "" "" "__ILP32__" ; then
-+                asm=no
-+            else
-+                ASFLAGS="$ASFLAGS -f elf64"
-+            fi
-         fi
-         ;;
-     powerpc*)
diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
deleted file mode 100644
index 065e3b35b7..0000000000
--- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei@gherzan.ro>
-Date: Fri, 2 Feb 2018 15:10:08 +0200
-Subject: [PATCH] dont default to cortex-a9 with neon
-march flag is not in CFLAGS so this will always default to
- -mcpu=cortex-a8 -mfpu=neon.
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
- configure | 3 ---
- 1 file changed, 3 deletions(-)
-diff --git a/configure b/configure
-index 0e3ef23..955b993 100755
--- a/configure
-+++ b/configure
-@@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
- fi
- 
- if [ $asm = auto -a $ARCH = ARM ] ; then
-    # set flags so neon is built by default
-    [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
-
-     cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
-     if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
-         define HAVE_ARMV6
-- 
-2.4.0
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index e7d9e75e8d..3cc3392593 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -8,18 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "nasm-native"
-SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \
+SRC_URI = "git://code.videolan.org/videolan/x264.git;branch=stable;protocol=https \
-           file://don-t-default-to-cortex-a9-with-neon.patch \
-           file://Fix-X32-build-by-disabling-asm.patch \
           "
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "baee400fa9ced6f5481a728138fed6e867b0ff7f"
+SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d"
 PV = "r3039+git"
-S = "${WORKDIR}/git"
 inherit lib_package pkgconfig
 X264_DISABLE_ASM = ""
@@ -41,6 +37,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
                --disable-opencl \
                --enable-pic \
                ${X264_DISABLE_ASM} \
+                --extra-cflags="${TUNE_CCARGS}" \
               '
 do_configure() {
@@ -54,3 +51,5 @@ do_install() {
 }
 AS[unexport] = "1"
+COMPATIBLE_HOST:x86-x32 = "null"