From 414650e8065c08ed5c5d5f60090d805526a7150a Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sat, 4 Nov 2023 06:56:49 -0700
Subject: recipes-multimedia: Update for NXP release 6.1.36-2.1.0

Updated:
- imx-alsa-plugins_git.bb
- gstreamer1.0-plugins-bad_1.22.0.imx.bb
- gstreamer1.0-plugins-base_1.22.0.imx.bb
- gstreamer1.0-plugins-good_1.22.0.imx.bb
- gstreamer1.0_1.22.0.imx.bb
- imx-gst1.0-plugin_git.bb
- imx-vpuwrap_git.bb

Upgraded:
- imx-codec:         4.8.0 -> 4.8.1
- imx-dsp:           2.0.5 -> 2.1.5
- imx-dsp-codec-ext: 2.0.5 -> 2.1.5
- imx-parser:        4.8.0 -> 4.8.1

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-multimedia/alsa/imx-alsa-plugins_git.bb    |   2 +-
 .../gstreamer1.0-plugins-bad_1.22.0.imx.bb         |   4 +-
 .../gstreamer1.0-plugins-base_1.22.0.imx.bb        |   4 +-
 .../gstreamer1.0-plugins-good_1.22.0.imx.bb        |   4 +-
 .../gstreamer/gstreamer1.0_1.22.0.imx.bb           |   4 +-
 .../gstreamer/imx-gst1.0-plugin_git.bb             |   6 +-
 recipes-multimedia/imx-codec/imx-codec_4.8.0.bb    | 121 ---------------------
 recipes-multimedia/imx-codec/imx-codec_4.8.1.bb    | 121 +++++++++++++++++++++
 .../imx-dsp/imx-dsp-codec-ext_2.0.5.bb             |  27 -----
 .../imx-dsp/imx-dsp-codec-ext_2.1.5.bb             |  27 +++++
 recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb        |  56 ----------
 recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb        |  57 ++++++++++
 recipes-multimedia/imx-parser/imx-parser_4.8.0.bb  |  44 --------
 recipes-multimedia/imx-parser/imx-parser_4.8.1.bb  |  44 ++++++++
 recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb  |   6 +-
 15 files changed, 264 insertions(+), 263 deletions(-)
 delete mode 100644 recipes-multimedia/imx-codec/imx-codec_4.8.0.bb
 create mode 100644 recipes-multimedia/imx-codec/imx-codec_4.8.1.bb
 delete mode 100644 recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.5.bb
 create mode 100644 recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb
 delete mode 100644 recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb
 create mode 100644 recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb
 delete mode 100644 recipes-multimedia/imx-parser/imx-parser_4.8.0.bb
 create mode 100644 recipes-multimedia/imx-parser/imx-parser_4.8.1.bb

diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index 5f6965345..8c5413c12 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig use-imx-headers
 PV = "1.0.26+${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
 SRCREV = "b2ba082e70333f187972ee4e85f63f9d2f608331"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb
index 189925713..85c57ad79 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb
@@ -187,8 +187,8 @@ SRC_URI:remove  = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plu
                    file://0002-avoid-including-sys-poll.h-directly.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "3c2f0b5794e699437964f2c337463f57b1e17f51"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "fd7a399c3a9c43b5675bc2497ad8a23540bf720e"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb
index d8c652872..d64e115a1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb
@@ -116,8 +116,8 @@ SRC_URI:remove = " \
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
 SRC_URI:append = " file://0001-gstallocator-Fix-typcasts.patch"
 GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "aaaf7df211523b1835659ae85c510e5615d451d7"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "f7c109c3b09645266ad41139253f32cf70a7d692"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb
index a594e0c2a..9f854e155 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb
@@ -106,8 +106,8 @@ SRC_URI:remove  = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-pl
                    file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
 GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "84704602fe5d6d5012085e63fa8a7232af13c9b7"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "ca3ef27dd4020393bfda546a25a3fa28314276e1"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb
index 9201246a5..dec059920 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb
@@ -93,8 +93,8 @@ LIC_FILES_CHKSUM = " \
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "e39d4ce54e78cb090cf4e5cd56f431c365c5b0f4"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "95112902507718085231a933cdfe54e3997d1b28"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 1e2ffbde5..c27c79d06 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -22,7 +22,7 @@ RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
 
-PV = "4.8.0+git${SRCPV}"
+PV = "4.8.1+git${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
            file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \
@@ -37,8 +37,8 @@ SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=
            file://0010-provide-declaration-for-aiur_register_external_typef.patch \
            file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \
            "
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "2df72651dcc0ecff9db7c0a96d59c5ca2b9be9d4"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "903c03e8611a107508b1f60e4736df208e72247d"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.0.bb b/recipes-multimedia/imx-codec/imx-codec_4.8.0.bb
deleted file mode 100644
index a0d6fdff0..000000000
--- a/recipes-multimedia/imx-codec/imx-codec_4.8.0.bb
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright 2017 NXP-2023
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "Freescale Multimedia codec libs"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-# Backward compatibility
-PROVIDES += "libfslcodec"
-
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "e33477360b20f1338cf3899c2bd7813e"
-SRC_URI[sha256sum] = "ad767de5c50f8d64f9583b52fb42e8b94c5c17f9e75e426b9e4d3053b483b486"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
-# Support Chips&Media VPU only
-PACKAGECONFIG_VPU               = ""
-PACKAGECONFIG_VPU:mx6q-nxp-bsp  = "vpu"
-PACKAGECONFIG_VPU:mx6dl-nxp-bsp = "vpu"
-PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu"
-
-# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point
-EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \
-                   bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d), d)}"
-
-do_install:append() {
-    # LTIB move the files around or gst-fsl-plugin won't find them
-    for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do
-            mv $p ${D}${libdir}
-    done
-    rmdir ${D}${libdir}/imx-mm/video-codec
-
-    # Fixup ownership of files
-    chown -R root:root ${D}
-}
-
-python __set_insane_skip() {
-    # Ensure we have PACKAGES expanded
-    bb.build.exec_func("read_subpackage_metadata", d)
-
-    for p in d.getVar('PACKAGES').split():
-        # Even though we are packaging libraries those are plugins so we
-        # shouldn't rename the packages to follow its sonames.
-        d.setVar("DEBIAN_NOAUTONAME:%s" % p, "1")
-
-        # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-        # the source we cannot fix it. Disable the insane check for now.
-        if p == 'imx-codec-test-bin':
-            # FIXME: includes the DUT .so files so we need to deploy those
-            d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel libdir")
-        else:
-            d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel")
-}
-
-do_package_qa[prefuncs] += "__set_insane_skip"
-
-python __split_libfslcodec_plugins() {
-    codecdir = bb.data.expand('${libdir}', d)
-    do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*',
-                      aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*',
-                      output_pattern='imx-codec-%s',
-                      description='Freescale i.MX Codec (%s)',
-                      extra_depends='')
-    pkgs = d.getVar('PACKAGES').split()
-    for pkg in pkgs:
-        meta = pkg[10:]
-        if meta != '':
-            d.setVar('RREPLACES:%s' % pkg, ' libfslcodec-%s' % meta)
-            d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec-%s' % meta)
-            d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec-%s' % meta)
-        else :
-            d.setVar('RREPLACES:%s' % pkg, ' libfslcodec')
-            d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec')
-            d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec')
-}
-
-python __set_metapkg_rdepends() {
-    # Allow addition of all codecs in a image; useful specially for
-    # debugging.
-    codec_pkgs = oe.utils.packages_filter_out_system(d)
-    codec_pkgs = filter(lambda x: x not in ['imx-codec-test-bin', 'imx-codec-test-source'],
-                        codec_pkgs)
-    d.appendVar('RDEPENDS:imx-codec-meta', ' ' + ' '.join(codec_pkgs))
-}
-
-PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends"
-
-# We need to ensure we don't have '-src' package overrided
-PACKAGE_DEBUG_SPLIT_STYLE = 'debug-without-src'
-
-PACKAGES_DYNAMIC = "${PN}-*"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-PACKAGES += "${PN}-meta ${PN}-test-bin ${PN}-test-source"
-
-ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-meta = "1"
-
-# Ensure we get warnings if we miss something
-FILES:${PN} = ""
-
-FILES:${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \
-                    ${libdir}/imx-mm/*/*/*${SOLIBSDEV} \
-                    ${libdir}/pkgconfig/*.pc ${includedir}/imx-mm/*"
-
-FILES:${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin"
-
-FILES:${PN}-test-source += "${datadir}/imx-mm/*"
-
-# FIXME: The wrap and lib names does not match
-FILES:${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*"
-FILES:${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*"
-FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb b/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb
new file mode 100644
index 000000000..778e4c8c6
--- /dev/null
+++ b/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb
@@ -0,0 +1,121 @@
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright 2017 NXP-2023
+# Copyright 2018 (C) O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Freescale Multimedia codec libs"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+# Backward compatibility
+PROVIDES += "libfslcodec"
+
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "a47f6407459ab4889e1bd9651b9dd40b"
+SRC_URI[sha256sum] = "0d0668dadbd69c40c1d0e29cbf4082df008a7cb7ec7e5cfe7d8f228395bdaf58"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+PACKAGECONFIG ??= "${PACKAGECONFIG_VPU}"
+# Support Chips&Media VPU only
+PACKAGECONFIG_VPU               = ""
+PACKAGECONFIG_VPU:mx6q-nxp-bsp  = "vpu"
+PACKAGECONFIG_VPU:mx6dl-nxp-bsp = "vpu"
+PACKAGECONFIG[vpu] = "--enable-vpu,--disable-vpu,virtual/imxvpu"
+
+# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point
+EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \
+                   bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '', d), d)}"
+
+do_install:append() {
+    # LTIB move the files around or gst-fsl-plugin won't find them
+    for p in $(find ${D}${libdir}/imx-mm -mindepth 2 -maxdepth 2 -not -type d); do
+            mv $p ${D}${libdir}
+    done
+    rmdir ${D}${libdir}/imx-mm/video-codec
+
+    # Fixup ownership of files
+    chown -R root:root ${D}
+}
+
+python __set_insane_skip() {
+    # Ensure we have PACKAGES expanded
+    bb.build.exec_func("read_subpackage_metadata", d)
+
+    for p in d.getVar('PACKAGES').split():
+        # Even though we are packaging libraries those are plugins so we
+        # shouldn't rename the packages to follow its sonames.
+        d.setVar("DEBIAN_NOAUTONAME:%s" % p, "1")
+
+        # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+        # the source we cannot fix it. Disable the insane check for now.
+        if p == 'imx-codec-test-bin':
+            # FIXME: includes the DUT .so files so we need to deploy those
+            d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel libdir")
+        else:
+            d.setVar("INSANE_SKIP:%s" % p, "ldflags textrel")
+}
+
+do_package_qa[prefuncs] += "__set_insane_skip"
+
+python __split_libfslcodec_plugins() {
+    codecdir = bb.data.expand('${libdir}', d)
+    do_split_packages(d, codecdir, '^lib_([^_]*).*_arm.*_elinux\.so\..*',
+                      aux_files_pattern='${libdir}/imx-mm/audio-codec/wrap/lib_%sd_wrap_arm*_elinux.so.*',
+                      output_pattern='imx-codec-%s',
+                      description='Freescale i.MX Codec (%s)',
+                      extra_depends='')
+    pkgs = d.getVar('PACKAGES').split()
+    for pkg in pkgs:
+        meta = pkg[10:]
+        if meta != '':
+            d.setVar('RREPLACES:%s' % pkg, ' libfslcodec-%s' % meta)
+            d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec-%s' % meta)
+            d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec-%s' % meta)
+        else :
+            d.setVar('RREPLACES:%s' % pkg, ' libfslcodec')
+            d.setVar('RPROVIDES:%s' % pkg, ' libfslcodec')
+            d.setVar('RCONFLICTS:%s' % pkg, ' libfslcodec')
+}
+
+python __set_metapkg_rdepends() {
+    # Allow addition of all codecs in a image; useful specially for
+    # debugging.
+    codec_pkgs = oe.utils.packages_filter_out_system(d)
+    codec_pkgs = filter(lambda x: x not in ['imx-codec-test-bin', 'imx-codec-test-source'],
+                        codec_pkgs)
+    d.appendVar('RDEPENDS:imx-codec-meta', ' ' + ' '.join(codec_pkgs))
+}
+
+PACKAGESPLITFUNCS =+ "__split_libfslcodec_plugins __set_metapkg_rdepends"
+
+# We need to ensure we don't have '-src' package overrided
+PACKAGE_DEBUG_SPLIT_STYLE = 'debug-without-src'
+
+PACKAGES_DYNAMIC = "${PN}-*"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+PACKAGES += "${PN}-meta ${PN}-test-bin ${PN}-test-source"
+
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-meta = "1"
+
+# Ensure we get warnings if we miss something
+FILES:${PN} = ""
+
+FILES:${PN}-dev += "${libdir}/imx-mm/*/*${SOLIBSDEV} \
+                    ${libdir}/imx-mm/*/*/*${SOLIBSDEV} \
+                    ${libdir}/pkgconfig/*.pc ${includedir}/imx-mm/*"
+
+FILES:${PN}-test-bin += "${datadir}/imx-mm/*/examples/*/bin"
+
+FILES:${PN}-test-source += "${datadir}/imx-mm/*"
+
+# FIXME: The wrap and lib names does not match
+FILES:${PN}-oggvorbis += "${libdir}/imx-mm/audio-codec/wrap/lib_vorbisd_wrap_arm*_elinux.so.*"
+FILES:${PN}-nb += "${libdir}/imx-mm/audio-codec/wrap/lib_nbamrd_wrap_arm*_elinux.so.*"
+FILES:${PN}-wb += "${libdir}/imx-mm/audio-codec/wrap/lib_wbamrd_wrap_arm*_elinux.so.*"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.5.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.5.bb
deleted file mode 100644
index bef448a20..000000000
--- a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.5.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2018-2023 NXP
-
-DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "2f79f786604ef4d12d1682610353555a"
-SRC_URI[sha256sum] = "b138fcda29be9ed7939d05365af3ac94b0fa6e35e56593168a9d4eed58498a8f"
-
-EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp"
-EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp"
-EXTRA_OECONF:append:mx8dx-nxp-bsp = " --enable-imx8qmqxp"
-EXTRA_OECONF:append:mx8mp-nxp-bsp = " --enable-imx8m"
-EXTRA_OECONF:append:mx8ulp-nxp-bsp = " --enable-imx8ulp"
-
-# Fix strip command failed: 'Unable to recognise the format of the input file'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INSANE_SKIP:${PN} = "arch dev-so ldflags"
-
-FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
-COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb
new file mode 100644
index 000000000..b0ba6c064
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb
@@ -0,0 +1,27 @@
+# Copyright 2018-2023 NXP
+
+DESCRIPTION = "i.MX DSP Codec Wrapper and Lib owned by NXP"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "4619cebbad2f312b950a9ad2b2e30e24"
+SRC_URI[sha256sum] = "89ac92b348aa70c81dcbf6a9ee4bc99bec56a491a89f5ba9854eab77e5fd4298"
+
+EXTRA_OECONF:append:mx8qm-nxp-bsp = " --enable-imx8qmqxp"
+EXTRA_OECONF:append:mx8qxp-nxp-bsp = " --enable-imx8qmqxp"
+EXTRA_OECONF:append:mx8dx-nxp-bsp = " --enable-imx8qmqxp"
+EXTRA_OECONF:append:mx8mp-nxp-bsp = " --enable-imx8m"
+EXTRA_OECONF:append:mx8ulp-nxp-bsp = " --enable-imx8ulp"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INSANE_SKIP:${PN} = "arch dev-so ldflags"
+
+FILES:${PN} += "${libdir}/imx-mm/audio-codec ${datadir}/imx-mm"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb
deleted file mode 100644
index 9bba10c57..000000000
--- a/recipes-multimedia/imx-dsp/imx-dsp_2.0.5.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2017-2023 NXP
-
-DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-
-SRC_URI[md5sum] = "536180f4d50982a6a3df9cdb0bf9e28b"
-SRC_URI[sha256sum] = "c16f077411f3af412b2b58312b041eea5eb0fadc0271d7d2322860cc40089445"
-
-EXTRA_OECONF = " \
-    -datadir=${base_libdir}/firmware \
-    --bindir=/unit_tests \
-    ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
-"
-
-HIFI4_PLATFORM               ?= "HIFI4_PLATFORM_IS_UNDEFINED"
-HIFI4_PLATFORM:mx8qm-nxp-bsp  = "imx8qmqxp"
-HIFI4_PLATFORM:mx8qxp-nxp-bsp = "imx8qmqxp"
-HIFI4_PLATFORM:mx8dx-nxp-bsp  = "imx8qmqxp"
-HIFI4_PLATFORM:mx8mp-nxp-bsp  = "imx8mp"
-HIFI4_PLATFORM:mx8ulp-nxp-bsp = "imx8ulp"
-
-UNSUPPORTED_TESTS                = "dsp_tflm"
-UNSUPPORTED_TESTS:mx8ulp-nxp-bsp = ""
-
-do_install:append () {
-    # Remove firmware not for this platform
-    find ${D}/${base_libdir}/firmware/imx/dsp -name hifi4_*.bin -not -name *${HIFI4_PLATFORM}* -exec rm {} \;
-    # Set the expected generic name for the firmware
-    mv ${D}/${base_libdir}/firmware/imx/dsp/hifi4_${HIFI4_PLATFORM}.bin ${D}/${base_libdir}/firmware/imx/dsp/hifi4.bin
-    # Remove unit tests not for this platform
-    for unsupported_test in ${UNSUPPORTED_TESTS}; do
-        find ${D}/unit_tests/DSP -name $unsupported_test* -exec rm {} \;
-    done
-}
-
-FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \
-               ${libdir}/imx-mm/audio-codec/wrap \
-               ${base_libdir}/firmware/imx/dsp \
-               /unit_tests \
-"
-RDEPENDS:${PN} += "imx-dsp-codec-ext"
-
-INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so"
-
-# Fix strip command failed: 'Unable to recognise the format of the input file'
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb b/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb
new file mode 100644
index 000000000..5fbdf15ee
--- /dev/null
+++ b/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb
@@ -0,0 +1,57 @@
+# Copyright 2017-2023 NXP
+
+DESCRIPTION = "i.MX DSP Wrapper, Firmware Binary, Codec Libraries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+
+SRC_URI[md5sum] = "2b2581a4b24735f4e449a161a334e04d"
+SRC_URI[sha256sum] = "11f4e89c0d3c61ac591aa3e00e345d7cc8d0d2627a915253f920cdcf4492a7d5"
+
+EXTRA_OECONF = " \
+    -datadir=${base_libdir}/firmware \
+    --bindir=/unit_tests \
+    ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', '', d)} \
+"
+
+HIFI4_PLATFORM               ?= "HIFI4_PLATFORM_IS_UNDEFINED"
+HIFI4_PLATFORM:mx8qm-nxp-bsp  = "imx8qmqxp"
+HIFI4_PLATFORM:mx8qxp-nxp-bsp = "imx8qmqxp"
+HIFI4_PLATFORM:mx8dx-nxp-bsp  = "imx8qmqxp"
+HIFI4_PLATFORM:mx8mp-nxp-bsp  = "imx8mp"
+HIFI4_PLATFORM:mx8ulp-nxp-bsp = "imx8ulp"
+
+UNSUPPORTED_TESTS                = "dsp_tflm"
+UNSUPPORTED_TESTS:mx8ulp-nxp-bsp = ""
+
+do_install:append () {
+    # Remove firmware not for this platform
+    find ${D}/${base_libdir}/firmware/imx/dsp -name hifi4_*.bin -not -name *${HIFI4_PLATFORM}* -exec rm {} \;
+    # Set the expected generic name for the firmware
+    mv ${D}/${base_libdir}/firmware/imx/dsp/hifi4_${HIFI4_PLATFORM}.bin ${D}/${base_libdir}/firmware/imx/dsp/hifi4.bin
+    # Remove unit tests not for this platform
+    for unsupported_test in ${UNSUPPORTED_TESTS}; do
+        find ${D}/unit_tests/DSP -name $unsupported_test* -exec rm {} \;
+    done
+}
+
+FILES:${PN} = "${libdir}/imx-mm/audio-codec/dsp \
+               ${libdir}/imx-mm/audio-codec/wrap \
+               ${base_libdir}/firmware/imx/dsp \
+               /unit_tests \
+"
+RDEPENDS:${PN} += "imx-dsp-codec-ext"
+
+INSANE_SKIP:${PN} = "already-stripped arch ldflags dev-so"
+
+# Fix strip command failed: 'Unable to recognise the format of the input file'
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx8qm-nxp-bsp|mx8qxp-nxp-bsp|mx8dx-nxp-bsp|mx8mp-nxp-bsp|mx8ulp-nxp-bsp)"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.8.0.bb
deleted file mode 100644
index aacd943b9..000000000
--- a/recipes-multimedia/imx-parser/imx-parser_4.8.0.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2017-2023 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "Freescale Multimedia parser libs"
-LICENSE = "Proprietary"
-SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-# For backwards compatibility
-PROVIDES += "libfslparser"
-RREPLACES:${PN} = "libfslparser"
-RPROVIDES:${PN} = "libfslparser"
-RCONFLICTS:${PN} = "libfslparser"
-
-SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "46c0636293e387a8b3e4c7d08bd35e02"
-SRC_URI[sha256sum] = "804414bfa016461687d4f077feb29deb6e4bdcd018e1da9691ae55284bb65b7f"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point
-EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \
-                  bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '--enable-fsw', d), d)}"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-python __set_insane_skip() {
-    # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-    # the source we cannot fix it. Disable the insane check for now.
-    # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
-    for p in d.getVar('PACKAGES').split():
-        d.setVar("INSANE_SKIP:%s" % p, "ldflags dev-so textrel")
-}
-
-do_package_qa[prefuncs] += "__set_insane_skip"
-
-# FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
-FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
-
-INHIBIT_SYSROOT_STRIP = "1"
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb b/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb
new file mode 100644
index 000000000..98a7cd99a
--- /dev/null
+++ b/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb
@@ -0,0 +1,44 @@
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright (C) 2017-2023 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "Freescale Multimedia parser libs"
+LICENSE = "Proprietary"
+SECTION = "multimedia"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+# For backwards compatibility
+PROVIDES += "libfslparser"
+RREPLACES:${PN} = "libfslparser"
+RPROVIDES:${PN} = "libfslparser"
+RCONFLICTS:${PN} = "libfslparser"
+
+SRC_URI = "${FSL_MIRROR}/${BP}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "c7a8aae8114d0756ed858000b78e9d8e"
+SRC_URI[sha256sum] = "73b8ce76507f25d72192862a939405625086a6631fba6f58e4e6bef2614fd202"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+# Choose between 32-bit and 64-bit binaries and between Soft Float-Point and Hard Float-Point
+EXTRA_OECONF = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '--enable-armv8', \
+                  bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--enable-fhw', '--enable-fsw', d), d)}"
+
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+python __set_insane_skip() {
+    # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+    # the source we cannot fix it. Disable the insane check for now.
+    # FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
+    for p in d.getVar('PACKAGES').split():
+        d.setVar("INSANE_SKIP:%s" % p, "ldflags dev-so textrel")
+}
+
+do_package_qa[prefuncs] += "__set_insane_skip"
+
+# FIXME: gst-fsl-plugin looks for the .so files so we need to deploy those
+FILES:${PN} += "${libdir}/imx-mm/*/*${SOLIBS} ${libdir}/imx-mm/*/*${SOLIBSDEV}"
+
+INHIBIT_SYSROOT_STRIP = "1"
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index 38061011c..78c1b8887 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -5,14 +5,14 @@
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
 
 DEPENDS = "virtual/imxvpu"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 
 SRC_URI = "git://github.com/NXP/imx-vpuwrap.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.08.00_2305_L6.1.y"
-SRCREV = "a9cd0835da0ecce55d94510d028371b473090fcc"
+SRCBRANCH = "MM_04.08.01_2308_L6.1.y"
+SRCREV = "1fe7cb6e94898f35e8b3b3afdbf5d6bf064cc126"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf


From 4646d0b9323ed89ea36a34df078c59c4b2059843 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sat, 4 Nov 2023 07:48:15 -0700
Subject: pulseaudio: Configure for i.MX 9 series

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 69a9ec6bc..93f71e8f6 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -11,6 +11,8 @@ SRC_URI_IMX:mx7-nxp-bsp = " \
     file://0100-pulseaudio-remove-the-control-for-speaker-headphone-widge.patch"
 SRC_URI_IMX:mx8-nxp-bsp = " \
     ${SRC_URI_IMX:mx6-nxp-bsp}"
+SRC_URI_IMX:mx9-nxp-bsp = " \
+    ${SRC_URI_IMX:mx6-nxp-bsp}"
 
 CACHED_CONFIGUREVARS:append:mx6-nxp-bsp = " ax_cv_PTHREAD_PRIO_INHERIT=no"
 
@@ -24,3 +26,4 @@ do_install:append() {
 PACKAGE_ARCH:mx6-nxp-bsp = "${MACHINE_SOCARCH}"
 PACKAGE_ARCH:mx7-nxp-bsp = "${MACHINE_SOCARCH}"
 PACKAGE_ARCH:mx8-nxp-bsp = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:mx9-nxp-bsp = "${MACHINE_SOCARCH}"
-- 
cgit v1.2.3-54-g00ecf