gstreamer: Update 6.6.3-1.0.0 to 6.6.23-2.0.0

Upgrade gstreamer and all related recipes to 1.24.0, syncing with
meta-imx layer.

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>

30 files changed, 184 insertions, 710 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b94be957..8ef1e281 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -510,28 +510,28 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp   ?= "imx-gst1.0-plugin"
 
 # GStreamer forked recipes
-PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx"
 
 # GStreamer copied recipes
-PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp              ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.22.5.imx"
-PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp              ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp       ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp  ??= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp        ??= "1.22.5.imx"
+PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp              ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp       ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp              ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp        ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp       ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp  ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:mx9-nxp-bsp        ??= "1.24.0.imx"
 
 # GStreamer downgrade ffmpeg
 PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb
index cca80cc2..ab542cb5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.24.0.imx.bb
@@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
                     file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
                     "
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.5.tar.xz"
-SRC_URI[sha256sum] = "8583f0c1f4fcb01eed11fa1e3c21126543a8bd739ed4fc1db31f756a5ab01d9a"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
+SRC_URI[sha256sum] = "ab775d5b9a7c84176b29822b68c7a34731280039a20b7db5eb639eddd1466178"
 
-S = "${WORKDIR}/gst-libav-1.22.5"
+S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
 
@@ -24,5 +24,11 @@ EXTRA_OEMESON += " \
     -Dtests=disabled \
 "
 
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+
 FILES:${PN} += "${libdir}/gstreamer-1.0/*.so"
 FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
deleted file mode 100644
index 029b80e1..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3bc5d48257032b6bbee532aad15062fbbcc43bfe 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
-
-When Yocto build is performed, opencv searches for data dir using simple
-'test' command, this fails because pkg-config provides an absolute
-path on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR
-in order for the 'test' utility to pick up the absolute path.
-
-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 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index 1d86b90..b5c8b95 100644
---- a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -87,6 +87,9 @@ if opencv_found
-   opencv_prefix = opencv_dep.get_variable('prefix')
-   gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"']
- 
-+  pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip()
-+  opencv_prefix = pkgconf_sysroot + opencv_prefix
-+
-   # Check the data dir used by opencv for its xml data files
-   # Use prefix from pkg-config to be compatible with cross-compilation
-   r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false)
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
index 39c1bfe1..b3ea80a5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb
@@ -184,11 +184,13 @@ DEPENDS:append:imxgpu2d = " virtual/libg2d"
 
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
                    file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
-                   file://0002-avoid-including-sys-poll.h-directly.patch"
+                   file://0002-avoid-including-sys-poll.h-directly.patch \
+                   file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.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.03_2312_L6.6.y"
-SRCREV = "9de821c50b4dd7af2407d9c3d078020704510a20"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98"
 
 S = "${WORKDIR}/git"
 
@@ -222,8 +224,11 @@ EXTRA_OEMESON += " \
     -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
 
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+EXTRA_OEMESON:remove = " \
+    -Dkate=disabled \
+"
 
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 # it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE
 #
 TOOLCHAIN = "gcc"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
deleted file mode 100644
index 3ab4bab4..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstallocator-Fix-typcasts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 90b94ff95c72487054fd283fb7cb5ebd13822b3f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 7 Aug 2023 18:56:05 -0700
-Subject: [PATCH] gstallocator: Fix typcasts
-
-These are found when building with clang+musl
-| ../git/gst-libs/gst/allocators/gstallocatorphymem.c:228:10: error: incompatible pointer to integer conversion returning 'gpointer' (aka 'void *') from a function with result type 'guintptr
-' (aka 'unsigned long') [-Wint-conversion]
-|   228 |   return gst_phymem_get_phy (mem);
-|       |          ^~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/gst-plugins-base/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gst-libs/gst/allocators/gstallocatorphymem.c | 2 +-
- gst-libs/gst/gl/gstglphymemory.c             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gst-libs/gst/allocators/gstallocatorphymem.c b/gst-libs/gst/allocators/gstallocatorphymem.c
-index f3c3306c7..f8a4511ab 100755
---- a/gst-libs/gst/allocators/gstallocatorphymem.c
-+++ b/gst-libs/gst/allocators/gstallocatorphymem.c
-@@ -225,7 +225,7 @@ static guintptr
- gst_allocator_phymem_get_phys_addr (GstPhysMemoryAllocator * allocator,
-     GstMemory * mem)
- {
--  return gst_phymem_get_phy (mem);
-+  return (guintptr)gst_phymem_get_phy (mem);
- }
- 
- static void
-diff --git a/gst-libs/gst/gl/gstglphymemory.c b/gst-libs/gst/gl/gstglphymemory.c
-index d82c9a66a..1d8be0a5d 100644
---- a/gst-libs/gst/gl/gstglphymemory.c
-+++ b/gst-libs/gst/gl/gstglphymemory.c
-@@ -337,7 +337,7 @@ gst_gl_physical_memory_setup_buffer (GstAllocator * allocator,
-     GST_VIDEO_INFO_HEIGHT (info),
-     viv_fmt,
-     memblk->vaddr,
--    memblk->paddr,
-+    (guint)memblk->paddr,
-     FALSE
-   };
- 
--- 
-2.41.0
-
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend
index ca6636b8..a834192e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend
@@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
 # does not depend on the viv-fb feature. It used to, but that was actually a bug
 # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is
 # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".)
-PACKAGECONFIG_GL:append:mx6-nxp-bsp = " viv-fb "
-PACKAGECONFIG_GL:append:mx7ulp-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
index 944cf8f5..348a30dc 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb
@@ -116,10 +116,10 @@ SRC_URI:remove = " \
     file://0003-viv-fb-Make-sure-config.h-is-included.patch \
     file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 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.03_2312_L6.6.y"
-SRCREV = "c4333767ea122c182ba4e14cababe8dbe2a1b882"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
index 1234f3ad..5d5a2425 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb
@@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
 
 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.03_2312_L6.6.y"
-SRCREV = "d361360510c97dc23abbfcdd22dff8214890527d"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3"
 
 # set 32bit compile timer for 32-bit platform
 GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index 5bf60e62..f09a5bc7 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -15,7 +15,7 @@ RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser
 PV .= "+git${SRCPV}"
 
 SRCBRANCH ?= "master"
-SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288"
+SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
index bdc802c2..19e9ce04 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.24.0.imx.bb
@@ -12,11 +12,11 @@ LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LICENSE_FLAGS = "commercial"
 
 SRC_URI = " \
-            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.5.tar.xz \
+            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${@get_gst_ver("${PV}")}.tar.xz \
             "
-SRC_URI[sha256sum] = "2680473b218158f18467cac3e1c50291b7ff4e0710dd350a59eaacbc29c09a54"
+SRC_URI[sha256sum] = "c5d1cbdf71ab0c675bca236f70edfa1feb3f813fd4bfff563308f466d8805ca5"
 
-S = "${WORKDIR}/gst-plugins-ugly-1.22.5"
+S = "${WORKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
 
 DEPENDS += "gstreamer1.0-plugins-base"
 
@@ -24,10 +24,9 @@ GST_PLUGIN_SET_HAS_EXAMPLES = "0"
 
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
+    a52dec mpeg2dec \
 "
 
-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"
@@ -41,5 +40,10 @@ EXTRA_OEMESON += " \
     -Dsidplay=disabled \
 "
 
-FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+
 FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch
new file mode 100644
index 00000000..fd6b1c16
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python/0001-meson.build-Fix-missing-python_opt.patch
@@ -0,0 +1,47 @@
+From 8d7e2eaed10e2928358805f613223a6a149790d6 Mon Sep 17 00:00:00 2001
+From: Hiago De Franco <hiago.franco@toradex.com>
+Date: Wed, 31 Jul 2024 11:51:06 -0300
+Subject: [PATCH] meson.build: Fix missing python_opt
+
+'python_opt' was not declared earlier, giving the following build error:
+
+| Message: python_abi_flags =
+|
+| ../gst-python-1.24.0/meson.build:84:16: ERROR: Unknown variable "python_opt".
+
+Remove it and keep the error message.
+
+Upstream-Status: Inappropriate [oe specific]
+
+The patch already exists upstream, but this is related to another fix [1]
+not suitable for OE. Moreover, the backport does not apply since
+the patch was added to the gstreamer monorepo.
+
+[1] https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6734?
+
+Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
+---
+ meson.build | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f240b6fd8aca..53f7a43702c7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -80,12 +80,7 @@ foreach loc: pylib_locs
+   endforeach
+ endforeach
+ if pylib_fname == ''
+-  error_msg = 'Could not find python library to load'
+-  if python_opt.enabled()
+-    error(error_msg)
+-  else
+-    message(error_msg)
+-  endif
++  message('Could not find python library to load')
+ endif
+ 
+ pygi_override_dir = get_option('pygi-overrides-dir')
+-- 
+2.39.2
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
index ebad6b64..0ba9a1ae 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.24.0.imx.bb
@@ -7,15 +7,18 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-1.22.5.tar.xz"
-SRC_URI[sha256sum] = "bf05232415cf6018142ae51dd3b897bb73432687b5ce1786bf46edc6298ce5b0"
+SRC_URI = "\
+    https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz \
+    file://0001-meson.build-Fix-missing-python_opt.patch \
+    "
+SRC_URI[sha256sum] = "041c2255c1ea9936c777dcb08a36ecaa6a24a69a12fc46ef53f1530d46c59f9d"
 
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 
 PNREAL = "gst-python"
 
-S = "${WORKDIR}/${PNREAL}-1.22.5"
+S = "${WORKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
 
 EXTRA_OEMESON += "\
     -Dtests=disabled \
@@ -25,6 +28,10 @@ EXTRA_OEMESON += "\
 
 inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
 
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+
 FILES:${PN} += "${libdir}/gstreamer-1.0"
 
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
index 5dae5ebb..c866d233 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.24.0.imx.bb
@@ -8,11 +8,11 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 
 PNREAL = "gst-rtsp-server"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-1.22.5.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
 
-SRC_URI[sha256sum] = "f343eb54964ebd4d8c071be5eecad586f28feb0156e036e06b148d0e7febb1c0"
+SRC_URI[sha256sum] = "5b0fa6b12ba95b1d336a4b274cbe19e982aa3e6819f1d97bfd8e0102b103ed9b"
 
-S = "${WORKDIR}/${PNREAL}-1.22.5"
+S = "${WORKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
 
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 
@@ -25,7 +25,14 @@ EXTRA_OEMESON += " \
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
 
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+
 # Starting with 1.8.0 gst-rtsp-server includes dependency-less plugins as well
 require gstreamer1.0-plugins-packaging.inc
 
 CVE_PRODUCT += "gst-rtsp-server"
+
+COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
index d44b70a8..dde7b5b1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.24.0.imx.bb
@@ -9,15 +9,19 @@ REALPN = "gstreamer-vaapi"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.22.5.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-1.24.0.tar.xz"
 
-SRC_URI[sha256sum] = "a9a550267c9584df0e8c70434d30476e8fd0018b733c1c1ee33deaf422bdb24b"
+SRC_URI[sha256sum] = "6b1f3b91ca65dedc67dc67a25dc1d1e464f11825a27ab9c7ac7c1bda67f03596"
 
-S = "${WORKDIR}/${REALPN}-1.22.5"
+S = "${WORKDIR}/${REALPN}-${@get_gst_ver('${PV}')}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 
 inherit meson pkgconfig features_check upstream-version-is-even
 
+# Drop .imx from PV
+def get_gst_ver(v):
+    return oe.utils.trim_version(v, 3)
+
 REQUIRED_DISTRO_FEATURES ?= "opengl"
 
 EXTRA_OEMESON += " \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
index 568e38cb..456f0762 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch
@@ -1,4 +1,4 @@
-From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001
+From 330e15374bb30ac29ee72c4b3de79c17b1157112 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
@@ -14,16 +14,16 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
  meson.build                  |  4 ++++
  meson_options.txt            |  1 +
- tests/check/meson.build      | 22 +++++++++++++++++++++-
+ tests/check/meson.build      | 21 ++++++++++++++++++++-
  tests/check/template.test.in |  3 +++
- 4 files changed, 29 insertions(+), 1 deletion(-)
+ 4 files changed, 28 insertions(+), 1 deletion(-)
  create mode 100644 tests/check/template.test.in
 
 diff --git a/meson.build b/meson.build
-index f9f591d..3906fb3 100644
+index 540d6d290e10..0267f22a79ea 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -606,6 +606,10 @@ if bashcomp_dep.found()
+@@ -624,6 +624,10 @@ if bashcomp_dep.found()
    endif
  endif
  
@@ -35,10 +35,10 @@ index f9f591d..3906fb3 100644
  
  pkgconfig = import('pkgconfig')
 diff --git a/meson_options.txt b/meson_options.txt
-index 7363bdb..a34ba37 100644
+index 340fb5801d02..5b87f68e8d7f 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 +47,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 e9501feb2af5..fd5a99611e3d 100644
 --- a/tests/check/meson.build
 +++ b/tests/check/meson.build
-@@ -124,10 +124,16 @@ test_defines = [
+@@ -125,10 +125,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 +68,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
+@@ -151,6 +157,8 @@ foreach t : core_tests
        include_directories : [configinc],
        link_with : link_with_libs,
        dependencies : gst_deps + test_deps,
@@ -77,10 +77,10 @@ index 16caac7..f2d400f 100644
      )
  
      env = environment()
-@@ -161,6 +169,18 @@ foreach t : core_tests
+@@ -161,6 +169,17 @@ foreach t : core_tests
+     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
      env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
      env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer')
- 
 +    if installed_tests_enabled
 +      test_conf = configuration_data()
 +      test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
@@ -92,16 +92,18 @@ index 16caac7..f2d400f 100644
 +        configuration: test_conf
 +      )
 +    endif
-+
+ 
      test(test_name, exe, env: env, timeout : 3 * 60)
    endif
- endforeach
 diff --git a/tests/check/template.test.in b/tests/check/template.test.in
 new file mode 100644
-index 0000000..f701627
+index 000000000000..f701627f87a6
 --- /dev/null
 +++ b/tests/check/template.test.in
 @@ -0,0 +1,3 @@
 +[Test]
 +Type=session
 +Exec=@installed_tests_dir@/@program@
+-- 
+2.39.2
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
index 10a6dcc6..83f3870c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch
@@ -1,4 +1,4 @@
-From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001
+From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 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 3/4] tests: use a dictionaries for environment
@@ -10,14 +10,14 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
- subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++-------
- 1 file changed, 13 insertions(+), 8 deletions(-)
+ tests/check/meson.build | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
 
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 00a138a568..48ec2532f8 100644
---- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
-@@ -161,14 +161,19 @@ foreach t : core_tests
+diff --git a/tests/check/meson.build b/tests/check/meson.build
+index fd5a99611e3d..330abaaeadd5 100644
+--- a/tests/check/meson.build
++++ b/tests/check/meson.build
+@@ -161,14 +161,20 @@ foreach t : core_tests
        install: installed_tests_enabled,
      )
  
@@ -42,9 +42,10 @@ index 00a138a568..48ec2532f8 100644
 +      'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner',
 +      'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer',
 +    }
- 
++
      if installed_tests_enabled
        test_conf = configuration_data()
+       test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir))
 -- 
-2.33.1
+2.39.2
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
index efa004f8..0a312389 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch
@@ -1,4 +1,4 @@
-From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001
+From 616c489d4ff1e7ed878bc3760180ba994fbd1974 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 4/4] tests: add helper script to run the installed_tests
@@ -11,16 +11,16 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-
 
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---
- subprojects/gstreamer/tests/check/meson.build   | 17 +++++++++++++++++
- .../gstreamer/tests/check/template.sh.in        |  9 +++++++++
- .../gstreamer/tests/check/template.test.in      |  2 +-
+ tests/check/meson.build      | 17 +++++++++++++++++
+ tests/check/template.sh.in   |  9 +++++++++
+ tests/check/template.test.in |  2 +-
  3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100755 subprojects/gstreamer/tests/check/template.sh.in
+ create mode 100644 tests/check/template.sh.in
 
-diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
-index 48ec2532f8..7dc4990d4e 100644
---- a/subprojects/gstreamer/tests/check/meson.build
-+++ b/subprojects/gstreamer/tests/check/meson.build
+diff --git a/tests/check/meson.build b/tests/check/meson.build
+index 330abaaeadd5..5d383b14dc29 100644
+--- a/tests/check/meson.build
++++ b/tests/check/meson.build
 @@ -185,6 +185,23 @@ foreach t : core_tests
          install_dir: installed_tests_metadir,
          configuration: test_conf
@@ -45,11 +45,11 @@ index 48ec2532f8..7dc4990d4e 100644
      endif
  
      test(test_name, exe, env: env, timeout : 3 * 60)
-diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in
-new file mode 100755
-index 0000000000..cf7d31b0ea
+diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in
+new file mode 100644
+index 000000000000..cf7d31b0ea5f
 --- /dev/null
-+++ b/subprojects/gstreamer/tests/check/template.sh.in
++++ b/tests/check/template.sh.in
 @@ -0,0 +1,9 @@
 +#!/bin/sh
 +
@@ -60,15 +60,15 @@ index 0000000000..cf7d31b0ea
 +GST_REGISTRY=@GST_REGISTRY@
 +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@"
 +exec @TEST@
-diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in
-index f701627f87..b74ef6ad73 100644
---- a/subprojects/gstreamer/tests/check/template.test.in
-+++ b/subprojects/gstreamer/tests/check/template.test.in
+diff --git a/tests/check/template.test.in b/tests/check/template.test.in
+index f701627f87a6..b74ef6ad732a 100644
+--- a/tests/check/template.test.in
++++ b/tests/check/template.test.in
 @@ -1,3 +1,3 @@
  [Test]
  Type=session
 -Exec=@installed_tests_dir@/@program@
 +Exec=@installed_tests_dir@/@program@.sh
 -- 
-2.33.1
+2.39.2
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
deleted file mode 100644
index f51df6d2..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001
-From: Claudius Heine <ch@denx.de>
-Date: Wed, 2 Feb 2022 13:47:02 +0100
-Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase
-
-This testcase seems to be flaky, and upstream marked it as such:
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778
-
-This patch removes the testcase to avoid it interfering with out ptest.
-
-Signed-off-by: Claudius Heine <ch@denx.de>
-
-Upstream-Status: Inappropriate [needs proper upstream fix]
----
- tests/check/gst/gstbin.c        | 69 -------------------
- 1 file changed, 69 deletions(-)
-
-diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c
-index e366d5fe20..ac29d81474 100644
---- a/tests/check/gst/gstbin.c
-+++ b/tests/check/gst/gstbin.c
-@@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children)
- 
- GST_END_TEST;
- 
--GST_START_TEST (test_watch_for_state_change)
--{
--  GstElement *src, *sink, *bin;
--  GstBus *bus;
--  GstStateChangeReturn ret;
--
--  bin = gst_element_factory_make ("bin", NULL);
--  fail_unless (bin != NULL, "Could not create bin");
--
--  bus = g_object_new (gst_bus_get_type (), NULL);
--  gst_object_ref_sink (bus);
--  gst_element_set_bus (GST_ELEMENT_CAST (bin), bus);
--
--  src = gst_element_factory_make ("fakesrc", NULL);
--  fail_if (src == NULL, "Could not create fakesrc");
--  sink = gst_element_factory_make ("fakesink", NULL);
--  fail_if (sink == NULL, "Could not create fakesink");
--
--  gst_bin_add (GST_BIN (bin), sink);
--  gst_bin_add (GST_BIN (bin), src);
--
--  fail_unless (gst_element_link (src, sink), "could not link src and sink");
--
--  /* change state, spawning two times three messages */
--  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
--  fail_unless (ret == GST_STATE_CHANGE_ASYNC);
--  ret =
--      gst_element_get_state (GST_ELEMENT (bin), NULL, NULL,
--      GST_CLOCK_TIME_NONE);
--  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
--
--  pop_state_changed (bus, 6);
--  pop_async_done (bus);
--  pop_latency (bus);
--
--  fail_unless (gst_bus_have_pending (bus) == FALSE,
--      "Unexpected messages on bus");
--
--  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING);
--  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
--
--  pop_state_changed (bus, 3);
--
--  /* this one might return either SUCCESS or ASYNC, likely SUCCESS */
--  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
--  gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE);
--
--  pop_state_changed (bus, 3);
--  if (ret == GST_STATE_CHANGE_ASYNC) {
--    pop_async_done (bus);
--    pop_latency (bus);
--  }
--
--  fail_unless (gst_bus_have_pending (bus) == FALSE,
--      "Unexpected messages on bus");
--
--  gst_bus_set_flushing (bus, TRUE);
--
--  ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
--  fail_unless (ret == GST_STATE_CHANGE_SUCCESS);
--
--  /* clean up */
--  gst_object_unref (bus);
--  gst_object_unref (bin);
--}
--
--GST_END_TEST;
--
- GST_START_TEST (test_state_change_error_message)
- {
-   GstElement *src, *sink, *bin;
-@@ -1956,7 +1888,6 @@ gst_bin_suite (void)
-   tcase_add_test (tc_chain, test_message_state_changed);
-   tcase_add_test (tc_chain, test_message_state_changed_child);
-   tcase_add_test (tc_chain, test_message_state_changed_children);
--  tcase_add_test (tc_chain, test_watch_for_state_change);
-   tcase_add_test (tc_chain, test_state_change_error_message);
-   tcase_add_test (tc_chain, test_add_linked);
-   tcase_add_test (tc_chain, test_add_self);
--- 
-2.33.1
-
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
index ce7b3f1d..33b3c65c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb
@@ -26,8 +26,8 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x
            file://run-ptest \
            file://0001-tests-respect-the-idententaion-used-in-meson.patch \
            file://0002-tests-add-support-for-install-the-tests.patch \
-           file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
-           file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
+           file://0003-tests-use-a-dictionaries-for-environment.patch \
+           file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \
            "
 SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61"
 
@@ -95,8 +95,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.03_2312_L6.6.y"
-SRCREV = "1a43c16272a7f4274eb8260e03206a57f317d823"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
deleted file mode 100644
index bdcb3f48..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 090fb758a63b7d362d9bee8b8a665d1346c83f83 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:15:22 -0700
-Subject: [PATCH 01/10] aiurdemux: Fix type of USER_DATA_LOCATION
-
-It should be char pointer not integer
-Fixe
-plugins/aiurdemux/aiurdemux.c:198:47: error: incompatible integer to pointer conversion initializin
-g 'const gchar *' (aka 'const char *') with an expression of type 'int' [-Wint-conversion]
-  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-                                              ^~
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/aiurdemux/aiurdemux.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/aiurdemux/aiurdemux.c b/plugins/aiurdemux/aiurdemux.c
-index 532b439..39c50ea 100755
---- a/plugins/aiurdemux/aiurdemux.c
-+++ b/plugins/aiurdemux/aiurdemux.c
-@@ -195,7 +195,7 @@ static AiurDemuxTagEntry g_user_data_entry[] = {
-       "Track Number : %s\n"},
-   {USER_DATA_TOTALTRACKNUMBER, USER_DATA_FORMAT_UTF8, GST_TAG_TRACK_COUNT,
-       "Track Count : %s\n"},
--  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, -1,
-+  {USER_DATA_LOCATION, USER_DATA_FORMAT_UTF8, (const gchar*)-1,
-       "Location : %s\n"},
-   {USER_DATA_KEYWORDS, USER_DATA_FORMAT_UTF8, GST_TAG_KEYWORDS,
-       "Keywords : %s\n"},
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
deleted file mode 100644
index d3fdf924..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f8b8322cd4c3a69e5cb47b5cb33abe860e89d6ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:33:54 -0700
-Subject: [PATCH 02/10] aiurdemux.h: Include glib/gprintf.h for g_printf
- prototype
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/aiurdemux/aiurdemux.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/aiurdemux/aiurdemux.h b/plugins/aiurdemux/aiurdemux.h
-index 1d7d0a0..f7fcb2e 100755
---- a/plugins/aiurdemux/aiurdemux.h
-+++ b/plugins/aiurdemux/aiurdemux.h
-@@ -39,7 +39,7 @@
- #include <gst/gst.h>
- #include <gst/base/gstadapter.h>
- #include <gst/tag/tag.h>
--
-+#include <glib/gprintf.h>
- //#include "mfw_gst_utils.h"
- 
- #include "fsl_parser.h"
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
deleted file mode 100644
index a690b497..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0003-grecorder-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 19e6a541d2026386c9cfdeca0eebd269fef2536c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:29:01 -0700
-Subject: [PATCH 03/10] grecorder: Fix build with clang
-
-Add missing includes for APIs from libc and glib
-Add prototype declaration for post_message before
-using it in macros later in the same source file
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tools/grecorder/grecorder.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c
-index c8eff2f..89aa801 100644
---- a/tools/grecorder/grecorder.c
-+++ b/tools/grecorder/grecorder.c
-@@ -23,10 +23,11 @@
- #include <semaphore.h>
- #include <pthread.h>
- #include <signal.h>
-+#include <unistd.h> /* sleep */
- #include <getopt.h>
- #define __USE_LARGEFILE64
- #include <sys/statvfs.h>
--
-+#include <glib/gprintf.h> /* g_print */
- #include "recorder_engine.h"
- 
- #define LOG_ERROR printf
-@@ -168,6 +169,8 @@ static RecorderMessage latest_message = MESSAGE_NULL;
- 
- static volatile sig_atomic_t quit_flag = 0;
- 
-+static void post_message (RecorderMessage message);
-+
- static void signal_handler(int signum)
- {
-   quit_flag = 1;
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
deleted file mode 100644
index 292ab63f..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 141f8f692ae2c7e6d41a2d78113c806602122ad5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:51:27 -0700
-Subject: [PATCH 04/10] gstimxcommon: Return 0 instead of NULL for a functions
- returning unsigned long
-
-Fixes
-gstimxcommon.c:113:10: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion]
-  return NULL;
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libs/gstimxcommon.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/libs/gstimxcommon.c b/libs/gstimxcommon.c
-index 27fd913..803c6e5 100644
---- a/libs/gstimxcommon.c
-+++ b/libs/gstimxcommon.c
-@@ -35,13 +35,13 @@ unsigned long phy_addr_from_fd(int dmafd)
-   int ret, fd;
- 
-   if (dmafd < 0)
--    return NULL;
-+    return 0;
-   
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- #ifdef USE_ION
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
--    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_dma_data data = {
-@@ -58,18 +58,18 @@ unsigned long phy_addr_from_fd(int dmafd)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
--    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
--  return NULL;
-+  return 0;
- #endif /* USE_ION */
- #else
-   struct dma_buf_phys dma_phys;
- 
-   ret = ioctl(dmafd, DMA_BUF_IOCTL_PHYS, &dma_phys);
-   if (ret < 0)
--    return NULL;
-+    return 0;
- 
-   return dma_phys.phys;
- #endif
-@@ -86,7 +86,7 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
-   fd = open(dev_ion, O_RDWR);
-   if(fd < 0) {
--    return NULL;
-+    return 0;
-   }
- 
-   struct ion_phys_virt_data data = {
-@@ -103,13 +103,13 @@ unsigned long phy_addr_from_vaddr(void *vaddr, int size)
-   ret = ioctl(fd, ION_IOC_CUSTOM, &custom);
-   close(fd);
-   if (ret < 0)
--    return NULL;
-+    return 0;
- 
-   return data.phys;
- #else
--  return NULL;
-+  return 0;
- #endif
- #else
--  return NULL;
-+  return 0;
- #endif
- }
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
deleted file mode 100644
index 5f67ba1b..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0005-aiurstreamcache-Include-gst-gstinfo.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 379b0492a4b53fd8fd42c734d04fd62df2e0465f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:16:48 -0700
-Subject: [PATCH 05/10] aiurstreamcache: Include gst/gstinfo.h
-
-Its needed for various GST_* defines
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/aiurdemux/aiurstreamcache.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/aiurdemux/aiurstreamcache.c b/plugins/aiurdemux/aiurstreamcache.c
-index d566268..e114a9d 100755
---- a/plugins/aiurdemux/aiurstreamcache.c
-+++ b/plugins/aiurdemux/aiurstreamcache.c
-@@ -33,6 +33,7 @@
-  * Changelog:
-  *
-  */
-+ #include <gst/gstinfo.h>
- 
- GST_DEBUG_CATEGORY_EXTERN (aiurdemux_debug);
- #define GST_CAT_DEFAULT aiurdemux_debug
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
deleted file mode 100644
index ae3d1061..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0006-Fix-typecast-warnings-found-with-clang.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 02e16c4de3f138f0ebabf699e840bb86c98be599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 20:45:23 -0700
-Subject: [PATCH 06/10] Fix typecast warnings found with clang
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libs/device-2d/imx_2d_device_g2d.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c
-index 2672e0b..6a36f6a 100755
---- a/libs/device-2d/imx_2d_device_g2d.c
-+++ b/libs/device-2d/imx_2d_device_g2d.c
-@@ -425,7 +425,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-       goto err;
-     }
-     if (paddr) {
--      src->mem->paddr = paddr;
-+      src->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -435,7 +435,7 @@ static gint imx_g2d_blit(Imx2DDevice *device,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
--      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       ret = -1;
-@@ -474,10 +474,11 @@ static gint imx_g2d_blit(Imx2DDevice *device,
- 
-   if (src->fd[1] >= 0)
-   {
--    if (!src->mem->user_data)
--      src->mem->user_data = g2d->src.base.planes[1] = phy_addr_from_fd (src->fd[1]);
--    else
--      g2d->src.base.planes[1] = src->mem->user_data;
-+    if (!src->mem->user_data) {
-+      g2d->src.base.planes[1] = (gint)phy_addr_from_fd (src->fd[1]);
-+      src->mem->user_data = (gpointer *)g2d->src.base.planes[1];
-+    } else
-+      g2d->src.base.planes[1] = (unsigned long)src->mem->user_data;
-   }
-   switch (src->interlace_type) {
-     case IMX_2D_INTERLACE_INTERLEAVED:
-@@ -693,7 +694,7 @@ static gint imx_g2d_fill_color(Imx2DDevice *device, Imx2DFrame *dst,
-   if (!dst->mem->paddr) {
-     paddr = phy_addr_from_fd (dst->fd[0]);
-     if (paddr) {
--      dst->mem->paddr = paddr;
-+      dst->mem->paddr = (guint8*)paddr;
-     } else {
-       GST_ERROR ("Can't get physical address.");
-       return -1;
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
deleted file mode 100644
index 1983838a..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0007-gstimxv4l2-Fix-typecasting-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1a2069403e227d4d40fc99257d1be077f65bdc8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:54:18 -0700
-Subject: [PATCH 07/10] gstimxv4l2: Fix typecasting errors
-
-Fixes
-gstimxv4l2.c:1702:22: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-conversion]
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libs/v4l2_core/gstimxv4l2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index 1dc826b..bf2620a 100755
---- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1699,7 +1699,7 @@ gint gst_imx_v4l2_register_buffer (gpointer v4l2handle, PhyMemBlock *memblk)
-   v4l2buf->type = handle->type;
-   v4l2buf->memory = handle->memory_mode;
-   v4l2buf->index = handle->allocated;
--  v4l2buf->m.userptr = memblk->paddr;
-+  v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-   v4l2buf->length = memblk->size;
-   handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
deleted file mode 100644
index 211bade1..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0008-beepdec-Declare-beep_register_external_typefinders.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e86c20fee52f79a270a1913c5f0be98fb3f5cb77 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Mar 2023 20:18:18 -0700
-Subject: [PATCH 08/10] beepdec: Declare beep_register_external_typefinders
-
-Fixes
-plugins/beepdec/beep.c:45:3: error: call to undeclared function 'beep_register_external_typefinders'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-  beep_register_external_typefinders (plugin);
-  ^
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/beepdec/beep.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/beepdec/beep.c b/plugins/beepdec/beep.c
-index 3543352..e174bb3 100755
---- a/plugins/beepdec/beep.c
-+++ b/plugins/beepdec/beep.c
-@@ -37,7 +37,7 @@
- #endif
- #include "beepdec.h"
- #include "gstimxcommon.h"
--
-+extern gboolean beep_register_external_typefinders (GstPlugin * plugin);
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
deleted file mode 100644
index 567d1026..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8a3d7f26c73bdfe050d3331b30ae2f5917dc6723 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 19:59:22 -0700
-Subject: [PATCH 09/10] gstimxv4l2.c: Fix incompatible integer to pointer
- conversion returning
-
-Fixes
-gstimxv4l2.c:1587:24: error: incompatible pointer to integer conversion assigning to 'unsigned long' from 'guint8 *' (aka 'unsigned char *') [-Wint-c
-onversion]
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libs/v4l2_core/gstimxv4l2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
-index bf2620a..0fd7452 100755
---- a/libs/v4l2_core/gstimxv4l2.c
-+++ b/libs/v4l2_core/gstimxv4l2.c
-@@ -1576,7 +1576,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
- 
-     if (handle->allocated >= MAX_BUFFER) {
-       GST_ERROR ("No more v4l2 buffer for allocating.\n");
--      return -1;
-+      return NULL;
-     }
- 
-     v4l2buf = &handle->buffer_pair[handle->allocated].v4l2buffer;
-@@ -1584,7 +1584,7 @@ static void * gst_imx_v4l2_find_buffer(gpointer v4l2handle, PhyMemBlock *memblk)
-     v4l2buf->type = handle->type;
-     v4l2buf->memory = handle->memory_mode;
-     v4l2buf->index = handle->allocated;
--    v4l2buf->m.userptr = memblk->paddr;
-+    v4l2buf->m.userptr = (unsigned long)memblk->paddr;
-     v4l2buf->length = memblk->size;
-     handle->buffer_pair[handle->allocated].vaddr = memblk->vaddr;
- 
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
deleted file mode 100644
index e9b1a093..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0010-provide-declaration-for-aiur_register_external_typef.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2144da90e64547d9e346f8e721a0d2155ed610b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 12 Mar 2023 21:09:49 -0700
-Subject: [PATCH 10/10] provide declaration for
- aiur_register_external_typefinders
-
-Upstream-Status: Submitted [https://github.com/nxp-imx/imx-gst1.0-plugin/pull/4]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- plugins/aiurdemux/aiur.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/aiurdemux/aiur.c b/plugins/aiurdemux/aiur.c
-index 2a52465..681ae2e 100755
---- a/plugins/aiurdemux/aiur.c
-+++ b/plugins/aiurdemux/aiur.c
-@@ -41,6 +41,8 @@
- #include "aiurdemux.h"
- #include "gstimxcommon.h"
- 
-+extern gboolean aiur_register_external_typefinders (GstPlugin * plugin);
-+
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
--- 
-2.39.2
-
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 7a94b42f..d5ba00ed 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -34,23 +34,13 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
 
-PV = "4.8.3+git${SRCPV}"
+PV = "4.9.0+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 \
-           file://0002-aiurdemux.h-Include-glib-gprintf.h-for-g_printf-prot.patch \
-           file://0003-grecorder-Fix-build-with-clang.patch \
-           file://0004-gstimxcommon-Return-0-instead-of-NULL-for-a-function.patch \
-           file://0005-aiurstreamcache-Include-gst-gstinfo.h.patch \
-           file://0006-Fix-typecast-warnings-found-with-clang.patch \
-           file://0007-gstimxv4l2-Fix-typecasting-errors.patch \
-           file://0008-beepdec-Declare-beep_register_external_typefinders.patch \
-           file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \
-           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.03_2312_L6.6.y"
-SRCREV = "91c7fec888cf8932c91e354331aad94975cae3ff"
+SRCBRANCH = "MM_04.09.00_2405_L6.6.y"
+SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96"
 
 S = "${WORKDIR}/git"