Merge pull request #2473 from nxp-upstream/multimedia-upgrade-to-6.18.2

Multimedia: Upgrade to 6.18.2
author: Otavio Salvador <otavio@ossystems.com.br> 2026-03-25 08:35:40 -0300
committer: GitHub <noreply@github.com> 2026-03-25 08:35:40 -0300
commit: bb90caa4aa6c88df71f36a1194bf19f2c724d835 (patch)
tree: 26870453575d631fd5cc1b9874f59d7e15440c32
parent: 831eb3251f74c6f478db4503bfe5aacde340833b (diff)
parent: 2a24b8ec37404e9dd22e136faf44d35e55e2b89d (diff)
download: meta-freescale-bb90caa4aa6c88df71f36a1194bf19f2c724d835.tar.gz
51 files changed, 693 insertions, 694 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 13fe9d6ff..564557feb 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -526,20 +526,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:imx-nxp-bsp              ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0:imx-nxp-bsp              ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp  ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:imx-nxp-bsp  ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:imx-nxp-bsp ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:imx-nxp-bsp ??= "1.26.6.imx"
 # GStreamer copied recipes
-PREFERRED_VERSION_gst-devtools:imx-nxp-bsp              ??= "1.26.0.imx"
+PREFERRED_VERSION_gst-devtools:imx-nxp-bsp              ??= "1.26.6.imx"
 PREFERRED_VERSION_gst-examples:imx-nxp-bsp              ??= "1.24.7.imx"
-PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp        ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-libav:imx-nxp-bsp        ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:imx-nxp-bsp ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-python:imx-nxp-bsp       ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-rtsp-server:imx-nxp-bsp  ??= "1.26.6.imx"
-PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.0.imx"
+PREFERRED_VERSION_gstreamer1.0-vaapi:imx-nxp-bsp        ??= "1.26.6.imx"
+# Use libcamera fork for certain SOCs
+PREFERRED_VERSION_libcamera ??= "${PREFERRED_VERSION_LIBCAMERA_IMX}"
+PREFERRED_VERSION_LIBCAMERA_IMX                = ""
+PREFERRED_VERSION_LIBCAMERA_IMX:mx95-nxp-bsp   = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8mm-nxp-bsp  = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8ulp-nxp-bsp = "0.6.0.imx"
+PREFERRED_VERSION_LIBCAMERA_IMX:mx8mq-nxp-bsp  = "0.6.0.imx"
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch
new file mode 100644
index 000000000..bf41f1b4b
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch
@@ -0,0 +1,31 @@
+From 46670dce02361a318fc66e503d32a0ceb53ec1ea Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Mon, 30 Jun 2025 17:56:50 +0900
+Subject: [PATCH] YOCIMX-9095 pipewiresrc: set rank to secondary
+Upstream-Status: Pending
+currently, pipewiresrc cannot been used as default
+video or audio src, so no need primary rank.
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ src/gst/gstpipewire.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/src/gst/gstpipewire.c b/src/gst/gstpipewire.c
+index 5761a099d..15f2ac946 100644
+--- a/src/gst/gstpipewire.c
+++ b/src/gst/gstpipewire.c
+@@ -26,7 +26,7 @@ plugin_init (GstPlugin *plugin)
+ {
+   pw_init (NULL, NULL);
+ 
+-  gst_element_register (plugin, "pipewiresrc", GST_RANK_PRIMARY + 1,
+  gst_element_register (plugin, "pipewiresrc", GST_RANK_SECONDARY + 1,
+       GST_TYPE_PIPEWIRE_SRC);
+   gst_element_register (plugin, "pipewiresink", GST_RANK_NONE,
+       GST_TYPE_PIPEWIRE_SINK);
+-- 
+2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch
deleted file mode 100644
index ab34dc2fa..000000000
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001
-From: Shengjiu Wang <shengjiu.wang@nxp.com>
-Date: Tue, 28 Nov 2023 10:23:42 +0800
-Subject: [PATCH] launch: allow pipewire-pulse can be started by root.
-revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse
-systemd units for root")
-Upstream-Status: Inappropriate [i.MX specific]
-Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
- src/daemon/systemd/user/pipewire-pulse.service.in | 1 -
- src/daemon/systemd/user/pipewire-pulse.socket     | 1 -
- 2 files changed, 2 deletions(-)
-diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in
-index 73d22e532..da7728ee3 100644
--- a/src/daemon/systemd/user/pipewire-pulse.service.in
-+++ b/src/daemon/systemd/user/pipewire-pulse.service.in
-@@ -14,7 +14,6 @@ Description=PipeWire PulseAudio
- # After=pipewire-pulse.socket is not needed, as it is already implicit in the
- # socket-service relationship, see systemd.socket(5).
- Requires=pipewire-pulse.socket
-ConditionUser=!root
- Wants=pipewire.service pipewire-session-manager.service
- After=pipewire.service pipewire-session-manager.service
- Conflicts=pulseaudio.service
-diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket
-index 1ae5edafb..d27fb0e26 100644
--- a/src/daemon/systemd/user/pipewire-pulse.socket
-+++ b/src/daemon/systemd/user/pipewire-pulse.socket
-@@ -1,6 +1,5 @@
- [Unit]
- Description=PipeWire PulseAudio
-ConditionUser=!root
- Conflicts=pulseaudio.socket
- 
- [Socket]
-- 
-2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch
new file mode 100644
index 000000000..da159cfb2
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-systemd-allow-pipewire-user-services-for-root.patch
@@ -0,0 +1,41 @@
+From 5e89cf0818c555dff31a1ef9e02828c2541b7e1f Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@nxp.com>
+Date: Mon, 31 Mar 2025 14:44:23 +0800
+Subject: [PATCH] systemd: allow pipewire user services for root
+Revert commit 9bc29b4b3 ("systemd: Disable pipewire user services for root")
+BT ofono service needs root permission for starting service.
+wireplumber[789]: 5:185m5:185mspa.bluez5: Failed to start HFP/HSP backend ofono
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
+---
+ src/daemon/systemd/user/pipewire.service.in | 1 -
+ src/daemon/systemd/user/pipewire.socket     | 1 -
+ 2 files changed, 2 deletions(-)
+Index: pipewire-1.4.8/src/daemon/systemd/user/pipewire.service.in
+===================================================================
+--- pipewire-1.4.8.orig/src/daemon/systemd/user/pipewire.service.in
+++ pipewire-1.4.8/src/daemon/systemd/user/pipewire.service.in
+@@ -14,7 +14,6 @@ Description=PipeWire Multimedia Service
+ # After=pipewire.socket is not needed, as it is already implicit in the
+ # socket-service relationship, see systemd.socket(5).
+ Requires=pipewire.socket @PW_SERVICE_REQS@
+-ConditionUser=!root
+ 
+ [Service]
+ LockPersonality=yes
+Index: pipewire-1.4.8/src/daemon/systemd/user/pipewire.socket
+===================================================================
+--- pipewire-1.4.8.orig/src/daemon/systemd/user/pipewire.socket
+++ pipewire-1.4.8/src/daemon/systemd/user/pipewire.socket
+@@ -1,6 +1,5 @@
+ [Unit]
+ Description=PipeWire Multimedia System Sockets
+-ConditionUser=!root
+ 
+ [Socket]
+ Priority=6
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
new file mode 100644
index 000000000..ce4d14371
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch
@@ -0,0 +1,51 @@
+From f01c4d27819fc2897b10f7e2bc0f30bd183c45b8 Mon Sep 17 00:00:00 2001
+From: Elliot Chen <elliot.chen@nxp.com>
+Date: Sat, 28 Feb 2026 14:47:22 +0900
+Subject: [PATCH] pipewiresrc: update per-plane stride and offset according to
+ chunk info
+Upstream-Status: Pending
+---
+ meson.build              |  2 +-
+ src/gst/gstpipewiresrc.c | 11 +++++++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+diff --git a/meson.build b/meson.build
+index bca2c7a27..e290217e9 100644
+--- a/meson.build
+++ b/meson.build
+@@ -412,7 +412,7 @@ gst_deps_def = {
+   'gio-unix-2.0': {},
+   'gstreamer-1.0': {'version': '>= 1.10.0'},
+   'gstreamer-base-1.0': {},
+-  'gstreamer-video-1.0': {},
+  'gstreamer-video-1.0': {'version': '>= 1.22.0'},
+   'gstreamer-audio-1.0': {},
+   'gstreamer-allocators-1.0': {},
+ }
+diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
+index b0de17dfd..044c0d583 100644
+--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
+@@ -838,6 +838,17 @@ static GstBuffer *dequeue_buffer(GstPipeWireSrc *pwsrc)
+ 
+       video_size += d->chunk->size;
+     }
+
+    /* If the buffer number is smaller than the plane number,
+     * update the stride and offset for the remain planes.
+     */
+    if (n_datas && n_datas < n_planes) {
+      for (i = n_datas; i < n_planes; i++) {
+        meta->stride[i] = gst_video_format_info_extrapolate_stride (info->finfo, i, b->buffer->datas[0].chunk->stride);
+        meta->offset[i] = meta->offset[i-1] +
+            meta->stride[i-1] * GST_VIDEO_FORMAT_INFO_SCALE_HEIGHT (info->finfo, i-1, GST_VIDEO_INFO_HEIGHT(info));
+      }
+    }
+   }
+ 
+   if (b->buffer->n_datas != gst_buffer_n_memory(data->buf)) {
+-- 
+2.34.1
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
index 865b29349..2c28aca5f 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend
@@ -1,8 +1,12 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:imx-nxp-bsp = " file://0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch"
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-systemd-allow-pipewire-user-services-for-root.patch \
-SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
+    file://0001-YOCIMX-9095-pipewiresrc-set-rank-to-secondary.patch \
+"
+SRC_URI:append:mx95-nxp-bsp = " \
+    file://0003-pipewiresrc-update-per-plane-stride-and-offset-accor.patch \
+"
 DEPENDS:append:mx95-nxp-bsp = " libdrm"
@@ -10,8 +14,6 @@ PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
 PACKAGECONFIG_REMOVE              ?= ""
 PACKAGECONFIG_REMOVE:mx6-nxp-bsp  ?= "gstreamer"
 PACKAGECONFIG_REMOVE:mx7-nxp-bsp  ?= "gstreamer"
-PACKAGECONFIG_REMOVE:mx8-nxp-bsp  ?= "gstreamer"
-PACKAGECONFIG_REMOVE:mx93-nxp-bsp ?= "gstreamer"
 PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch
new file mode 100644
index 000000000..52db25494
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch
@@ -0,0 +1,33 @@
+From 9cebf00856ef24b9a4d6306775013b10da821172 Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@nxp.com>
+Date: Thu, 9 Nov 2023 15:15:04 +0800
+Subject: [PATCH] wpctl: fix set-default Segmentation fault on 32bit platform
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
+---
+ src/tools/wpctl.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+Index: wireplumber-0.5.11/src/tools/wpctl.c
+===================================================================
+--- wireplumber-0.5.11.orig/src/tools/wpctl.c
+++ wireplumber-0.5.11/src/tools/wpctl.c
+@@ -832,9 +832,16 @@ set_default_parse_positional (gint argc,
+ static gboolean
+ set_default_prepare (WpCtl * self, GError ** error)
+ {
+  g_autoptr (WpPlugin) def_nodes_api = wp_plugin_find (self->core, "default-nodes-api");
+  guint32 id;
+
+  if (!translate_id (def_nodes_api, cmdline.set_default.id, &id, error)) {
+    fprintf(stderr, "Translate ID error.\n");
+    return FALSE;
+  }
+   wp_object_manager_add_interest (self->om, WP_TYPE_NODE,
+       WP_CONSTRAINT_TYPE_PW_GLOBAL_PROPERTY,
+-      "object.id", "=u", (guint32) cmdline.set_default.id,
+      "object.id", "=u", id,
+       NULL);
+   wp_object_manager_request_object_features (self->om, WP_TYPE_NODE,
+       WP_PIPEWIRE_OBJECT_FEATURES_MINIMAL);
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf
new file mode 100644
index 000000000..cab02a96d
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/51-bluez-imx.conf
@@ -0,0 +1,16 @@
+monitor.bluez.properties = {
+  ## These features do not work on all headsets, so they are enabled
+  ## by default based on the hardware database. They can also be
+  ## forced on/off for all devices by the following options:
+  bluez5.enable-msbc = true
+ 
+  ## HFP/HSP backend (default: native).
+  ## Available values: any, none, hsphfpd, ofono, native
+  bluez5.hfphsp-backend = "ofono"
+  ## HFP/HSP hardware offload SCO support (default: false).
+  ## Using this feature requires a custom WirePlumber script that
+  ## handles audio routing in a platform-specific way. See
+  ## tests/examples/bt-pinephone.lua for an example.
+  bluez5.hw-offload-sco = true
+}
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf
new file mode 100644
index 000000000..4255174ad
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/files/imx-nxp-bsp/80-disable-logind.conf
@@ -0,0 +1,6 @@
+# Disabling seat monitoring via logind in the BlueZ monitor
+wireplumber.profiles = {
+  main = {
+    monitor.bluez.seat-monitoring = disabled
+  }
+}
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
new file mode 100644
index 000000000..e79e98cfe
--- /dev/null
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
@@ -0,0 +1,18 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append:imx-nxp-bsp = " file://51-bluez-imx.conf \
+                               file://80-disable-logind.conf \
+                               file://0001-wpctl-fix-set-default-Segmentation-fault-on-32bit-pl.patch \
+                             "
+do_install:append:imx-nxp-bsp () {
+    install -d ${D}${datadir}
+    # Install nxp configure file to /usr/share/wireplumber/wireplumber.conf.d
+    install -d ${D}${datadir}/wireplumber/wireplumber.conf.d
+    install -m 0644 ${UNPACKDIR}/51-bluez-imx.conf ${D}${datadir}/wireplumber/wireplumber.conf.d
+    install -m 0644 ${UNPACKDIR}/80-disable-logind.conf ${D}${datadir}/wireplumber/wireplumber.conf.d
+}
+FILES:${PN}:append = " ${datadir}/wireplumber/wireplumber.conf.d"
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index 8d017ab71..000000000
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc/0001-base_type.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e7f6097c9e7cb30f130502cc4804e1a1b01342de Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] base_type.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- usr/include/hantro_VC8000E_enc/base_type.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/usr/include/hantro_VC8000E_enc/base_type.h b/usr/include/hantro_VC8000E_enc/base_type.h
-index 282fc81b8eba..af4212eed2bd 100755
--- a/usr/include/hantro_VC8000E_enc/base_type.h
-+++ b/usr/include/hantro_VC8000E_enc/base_type.h
-@@ -67,6 +67,9 @@ typedef       unsigned int        UInt;
- #define HANTRO_FALSE 0
- #define HANTRO_TRUE  1
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef bool
- typedef enum
- {
-@@ -74,6 +77,7 @@ typedef enum
-   true  = HANTRO_TRUE
- } bool;
- #endif
-+#endif
- 
- enum
- {
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
index 68c2a4979..528b05e17 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.10.1.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.11.0.bb
@@ -2,18 +2,14 @@
 DESCRIPTION = "i.MX VC8000E Encoder library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 inherit fsl-eula-unpack
-SRC_URI = " \
+SRC_URI = " ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+IMX_SRCREV_ABBREV = "5e18a84"
-    file://0001-base_type.h-make-header-compatible-with-c23.patch \
-"
-IMX_SRCREV_ABBREV = "c0244a1"
-SRC_URI[sha256sum] = "713ba375f25490727fcc62bab5d5508f74de03204b4c153464b696b652c5c7df"
+SRC_URI[sha256sum] = "04d2a9c5c75804a11a4500a0133dfc7d8e84f74254cee52c42075f5ecc229550"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 # SCR is the location and name of the Software Content Register file
@@ -36,4 +32,5 @@ do_install () {
 FILES:${PN} = "/"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
index 940b9fa41..d24ab66ea 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.5.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.9.0.bb
@@ -7,9 +7,9 @@ DEPENDS = "imx-vpu-hantro"
 DEPENDS:append:mx8mp-nxp-bsp = " imx-vpu-hantro-vc"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.tar.gz"
-IMX_SRCREV_ABBREV = "3200e68"
+IMX_SRCREV_ABBREV = "a4cefcc"
-SRC_URI[sha256sum] = "e7806a92d4a5ab51b76d9edef5175a95625c4ac3cab467fe1519bb0ce16e6535"
+SRC_URI[sha256sum] = "629087dd3e9ae0f4c00a75a2f2b715b7e24918b7401b26137e9270d6ac0fa90c"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
deleted file mode 100644
index bbfec172a..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-basetype.h-make-header-compatible-with-c23.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e39a6602817e4221ae09ac3d520ca6a0d94814dc Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 16:13:38 +0000
-Subject: [PATCH] basetype.h: make header compatible with c23
-With C23 bool, true and false are built in keywords and cannot be
-redefined.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- h1_encoder/software/inc/basetype.h | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/h1_encoder/software/inc/basetype.h b/h1_encoder/software/inc/basetype.h
-index 55e46a195b3b..6655ec54481b 100755
--- a/h1_encoder/software/inc/basetype.h
-+++ b/h1_encoder/software/inc/basetype.h
-@@ -66,12 +66,16 @@ typedef size_t ptr_t;
- #define PRT_PTR "x"
- #endif
- 
-+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L
-+/* bool, true and false are keywords.  */
-+#else
- #ifndef __cplusplus
- typedef enum {
-         false   = 0,
-         true    = 1
- } bool;
- #endif
-+#endif
- 
- #else /* __symbian__ or __win__ or whatever, customize it to suit well */
- 
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
deleted file mode 100644
index da1af2b9c..000000000
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro/0001-test-md5-convert-to-ansi-c.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 0c5bdd12a6f3ba73e605656828bf429966a997ef Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Wed, 7 May 2025 13:25:26 +0000
-Subject: [PATCH] test: md5: convert to ansi c
-GCC 15 no longer likes this K&R style function declarations.
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- decoder_sw/software/test/common/swhw/md5.c | 15 +++++----------
- decoder_sw/software/test/common/swhw/md5.h |  8 ++++----
- 2 files changed, 9 insertions(+), 14 deletions(-)
-diff --git a/decoder_sw/software/test/common/swhw/md5.c b/decoder_sw/software/test/common/swhw/md5.c
-index c3334bf751fd..20014fbdf268 100755
--- a/decoder_sw/software/test/common/swhw/md5.c
-+++ b/decoder_sw/software/test/common/swhw/md5.c
-@@ -42,8 +42,7 @@
- /*
-  * Note: this code is harmless on little-endian machines.
-  */
-void ByteReverse(buf, longs) unsigned char *buf;
-unsigned longs;
-+void ByteReverse(unsigned char *buf, unsigned longs)
- {
-   uint32 t;
-   do {
-@@ -59,7 +58,7 @@ unsigned longs;
-  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
-  * initialization constants.
-  */
-void MD5Init(ctx) struct MD5Context *ctx;
-+void MD5Init(struct MD5Context *ctx)
- {
-   ctx->buf[0] = 0x67452301;
-   ctx->buf[1] = 0xefcdab89;
-@@ -74,9 +73,7 @@ void MD5Init(ctx) struct MD5Context *ctx;
-  * Update context to reflect the concatenation of another buffer full
-  * of bytes.
-  */
-void MD5Update(ctx, buf, len) struct MD5Context *ctx;
-unsigned char *buf;
-unsigned len;
-+void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
- {
-   uint32 t;
- 
-@@ -124,8 +121,7 @@ unsigned len;
-  * Final wrapup - pad to 64-byte boundary with the bit pattern
-  * 1 0* (64-bit count of bits processed, MSB-first)
-  */
-void MD5Final(digest, ctx) unsigned char digest[16];
-struct MD5Context *ctx;
-+void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
- {
-   unsigned count;
-   unsigned char *p;
-@@ -186,8 +182,7 @@ struct MD5Context *ctx;
-  * reflect the addition of 16 longwords of new data.  MD5Update blocks
-  * the data and converts bytes into longwords for this routine.
-  */
-void MD5Transform(buf, in) uint32 buf[4];
-uint32 in[16];
-+void MD5Transform(uint32 buf[4], uint32 in[16])
- {
-   register uint32 a, b, c, d;
- 
-diff --git a/decoder_sw/software/test/common/swhw/md5.h b/decoder_sw/software/test/common/swhw/md5.h
-index 516400236606..c1d773093b66 100755
--- a/decoder_sw/software/test/common/swhw/md5.h
-+++ b/decoder_sw/software/test/common/swhw/md5.h
-@@ -76,10 +76,10 @@ struct MD5Context {
-   unsigned char in[64];
- };
- 
-extern void MD5Init();
-extern void MD5Update();
-extern void MD5Final();
-extern void MD5Transform();
-+extern void MD5Init(struct MD5Context *ctx);
-+extern void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len);
-+extern void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
-+extern void MD5Transform(uint32 buf[4], uint32 in[16]);
- 
- /*
-  * This is needed to make RSAREF happy on some MS-DOS compilers.
-- 
-2.42.0
diff --git a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
index d766e0191..e5113f1c1 100644
--- a/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.36.0.bb
+++ b/recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.40.0.bb
@@ -1,19 +1,17 @@
-# Copyright (C) 2017-2020 NXP
+# Copyright (C) 2017-2020,2026 NXP
 DESCRIPTION = "i.MX Hantro VPU library"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb372b5d7f12181de23ef480f225f3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 PROVIDES = "virtual/imxvpu"
 SRC_URI = " \
    ${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
-    file://0001-test-md5-convert-to-ansi-c.patch \
-    file://0001-basetype.h-make-header-compatible-with-c23.patch \
 "
-IMX_SRCREV_ABBREV = "194a305"
+IMX_SRCREV_ABBREV = "52c7e45"
-SRC_URI[sha256sum] = "0ef1fb5c6653c08f2d2812c72dedf3e8beb091dd5b3d70d6e26f41bac4ebffa7"
+SRC_URI[sha256sum] = "cdfb28cdec4e26ef84ee8c54be89a1da269eaeb4b51eafe689eb084ac20c7d84"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
@@ -43,7 +41,5 @@ do_install () {
 FILES:${PN} += "/unit_tests"
-RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx8mq-nxp-bsp|mx8mm-nxp-bsp|mx8mp-nxp-bsp)"
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
index d38e97e8f..fabbbb4ff 100644
--- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
+++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 Freescale Semiconductor
-# Copyright 2017-2025 NXP
+# Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Freescale alsa-lib plugins"
@@ -19,9 +19,10 @@ 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}"
+SRC_URI = "${IMXALSA_SRC};branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+IMXALSA_SRC ?= "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https"
-SRCREV = "40e45c8023f95c06c4ea10185ca85db7eb2dfcd8"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "18eb79b6cf13fb988de7d4eef5b22eb60f8e2533"
 CFLAGS:append = " -I${STAGING_INCDIR_IMX}"
diff --git a/recipes-multimedia/bluealsa/bluealsa_%.bbappend b/recipes-multimedia/bluealsa/bluealsa_%.bbappend
new file mode 100644
index 000000000..212dd3b7a
--- /dev/null
+++ b/recipes-multimedia/bluealsa/bluealsa_%.bbappend
@@ -0,0 +1 @@
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
diff --git a/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
index 9a619f5a0..ddbe334db 100644
--- a/recipes-multimedia/gstreamer/gst-devtools_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gst-devtools_1.26.6.bb
@@ -6,13 +6,13 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://validate/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${@get_gst_ver("${PV}")}.tar.xz \
+#S = "${WORKDIR}/gst-devtools-${PV}"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV}.tar.xz \
           file://0001-connect-has-a-different-signature-on-musl.patch \
           "
-S = "${UNPACKDIR}/gst-devtools-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "dec8fc56d578d65c498e65e56efe44994c5d3f4e85dbbdff0242b441b32e19b2"
-SRC_URI[sha256sum] = "eff33d7dc292bb074a2788ea887b6283398ffdefafa49fb7d08efe6658a65648"
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS:${PN} = "git"
@@ -40,9 +40,6 @@ EXTRA_OEMESON += " \
    -Dvalidate=enabled \
    ${@gettext_oemeson(d)} \
 "
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 do_install:append () {
     for fn in ${bindir}/gst-validate-launcher \
@@ -53,3 +50,10 @@ do_install:append () {
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
+########### i.MX overrides ################
+EXTRA_OEMESON:append:mx93-nxp-bsp = " -Dintrospection=disabled "
+EXTRA_OEMESON:append:mx943-nxp-bsp = " -Dintrospection=disabled "
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
deleted file mode 100644
index 828c87dc9..000000000
--- a/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7924016fce2d0b435891a335cdae52fc939c7e3b Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 17 Aug 2017 11:07:02 +0300
-Subject: [PATCH] Make player examples installable
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Denied [Upstream considers these code examples, for now a least]
-https://bugzilla.gnome.org/show_bug.cgi?id=777827
---
- playback/player/gst-play/meson.build | 1 +
- playback/player/gtk/meson.build      | 1 +
- 2 files changed, 2 insertions(+)
-Index: gst-examples/playback/player/gst-play/meson.build
-===================================================================
--- gst-examples.orig/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, dependency('gstreamer-play-1.0'), m_dep])
- 
-Index: gst-examples/playback/player/gtk/meson.build
-===================================================================
--- gst-examples.orig/playback/player/gtk/meson.build
-+++ gst-examples/playback/player/gtk/meson.build
-@@ -20,5 +20,6 @@ if gtk_dep.found()
-        'gtk-video-renderer.h',
-        'gtk-video-renderer.c'],
-       c_args :  extra_c_args,
-+      install: true,
-       dependencies : [gst_dep, gsttag_dep, gstplay_dep, gtk_dep, x11_dep])
- endif
diff --git a/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
deleted file mode 100644
index d165e5d91..000000000
--- a/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Media Player
-Comment=Basic media player
-Icon=video-player
-TryExec=gtk-play
-Exec=gtk-play
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=GTK;AudioVideo;
diff --git a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb b/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
deleted file mode 100644
index 9db0051a1..000000000
--- a/recipes-multimedia/gstreamer/gst-examples_1.24.7.imx.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-# This builds an older version which is compatible with the gstreamer NXP fork 1.24.7.imx,
-# thus the version is appended with '.imx'
-SUMMARY = "GStreamer examples (including gtk-play, gst-play)"
-DESCRIPTION = "GStreamer example applications."
-HOMEPAGE = "https://gitlab.freedesktop.org/gstreamer/gst-examples"
-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 json-glib glib-2.0-native"
-SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;branch=1.24 \
-           file://0001-Make-player-examples-installable.patch \
-           file://gst-player.desktop \
-           "
-SRCREV = "0f1e984e41ce8d6d0758265d35e8b10d5815fde2"
-S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
-inherit meson pkgconfig features_check
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)"
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-do_install:append() {
-        install -m 0644 -D ${UNPACKDIR}/gst-player.desktop ${D}${datadir}/applications/gst-player.desktop
-}
-RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
-RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
-                     gstreamer1.0-plugins-good-meta \
-                     gstreamer1.0-plugins-bad-meta \
-                      ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
-                     ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
-RPROVIDES:${PN} += "gst-player gst-player-bin"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.bb
index 138398d85..e7a4a7dea 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.26.6.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-${@get_gst_ver('${PV}')}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz"
-SRC_URI[sha256sum] = "707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf"
+SRC_URI[sha256sum] = "6e50a6222d509c52b19143f9a7bd3581e22c745d0c4bc27ddb07e1229bcc11b8"
-S = "${UNPACKDIR}/gst-libav-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/gst-libav-${PV}"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base ffmpeg"
@@ -24,11 +24,5 @@ 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/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
new file mode 100644
index 000000000..38282e478
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch
@@ -0,0 +1,30 @@
+From 71b5b04685e6b03b7e2325fed22c83d9c6300f65 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Fri, 6 Feb 2026 17:32:34 +0900
+Subject: [PATCH] MMFMWK-9590 gstcuda: disable gir build for cuda plugin
+ libraries
+This is a workaround to only disable cuda gir build to avoid totally
+disable bad library gir build. mesa-rvgpu-emu patch break cuda gir build
+Upstream-Status: Inappropriate [i.MX specific]
+---
+ gst-libs/gst/cuda/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/gst-libs/gst/cuda/meson.build b/gst-libs/gst/cuda/meson.build
+index 50ae0276ce..5e8a3d209b 100644
+--- a/gst-libs/gst/cuda/meson.build
+++ b/gst-libs/gst/cuda/meson.build
+@@ -157,7 +157,7 @@ gstcuda= library('gstcuda-' + api_version,
+ 
+ gen_sources = []
+ library_def = {'lib': gstcuda}
+-if build_gir
+if false
+   gir_includes = ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0', 'CudaGst-1.0']
+   if gstglproto_dep.found()
+     gir_includes += ['GstGL-1.0']
+-- 
+2.34.1
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
new file mode 100644
index 000000000..029b80e17
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
@@ -0,0 +1,33 @@
+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.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
index 1c4ee72d0..36db56eb8 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.26.6.imx.bb
@@ -5,8 +5,8 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
-require gstreamer1.0-plugins-license.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
 SUMMARY = "'Bad' GStreamer plugins and helper libraries "
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -19,8 +19,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
           "
 SRC_URI[sha256sum] = "e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c"
-S = "${WORKDIR}/gst-plugins-bad-${PV}"
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -181,16 +179,18 @@ DEFAULT_PREFERENCE = "-1"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
 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://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 \
+           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.10.0_2505_L6.12.20"
-SRCREV = "4320364e6be53cae81ac2bca3ce0e09cf8707590"
-S = "${UNPACKDIR}/${BP}"
+SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstcuda-disable-gir-build-for-cuda-plugi.patch"
+GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "81b6888efe936153b88c32b22a12d60bf9395054"
 inherit use-imx-headers
@@ -202,6 +202,8 @@ PACKAGECONFIG_REMOVE ?= " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'gl', d)} \
 "
 PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
+PACKAGECONFIG:remove:mx93-nxp-bsp = "gl"
+PACKAGECONFIG:remove:mx943-nxp-bsp = "gl"
 PACKAGECONFIG:append:mx8-nxp-bsp = " kms tinycompress"
 PACKAGECONFIG:append = " ${PACKAGECONFIG_G2D}"
@@ -220,4 +222,5 @@ EXTRA_OEMESON:remove = " \
 "
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 ########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
new file mode 100644
index 000000000..3f709d84f
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch
@@ -0,0 +1,67 @@
+From f85821d405ba287acc01b1c80205470f086b3d61 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Fri, 6 Feb 2026 15:12:52 +0900
+Subject: [PATCH 1/5] MMFMWK-9590 gstgl-1.0: disable gir build for gl plugin
+ libraries
+This is a workaround to only display gl gir build to avoid totally
+disable base library gir build. mesa-rvgpu-emu patch break gl gir
+build
+Upstream-Status: Inappropriate [i.MX specific]
+---
+ gst-libs/gst/gl/meson.build | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
+index 837cf484e..ef981c8e3 100644
+--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
+@@ -1193,7 +1193,7 @@ if build_gstgl
+     description : 'Streaming media framework, OpenGL plugins libraries (OpenGL Prototypes)',
+   )
+ 
+-  if build_gir
+  if false
+     gir = {
+         'sources' : gl_sources + [gl_enumtypes_h] + [gl_enumtypes_c] + gir_gl_headers,
+         'namespace' : 'GstGL',
+@@ -1239,7 +1239,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (X11 specifics)',
+     )
+     gl_x11_gir = []
+-    if build_gir
+    if false
+ 
+       doc_sources = []
+       foreach s: gl_x11_sources + gl_x11_headers
+@@ -1286,7 +1286,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (Wayland specifics)',
+     )
+     gl_wayland_gir = []
+-    if build_gir
+    if false
+       doc_sources = []
+       foreach s: gl_wayland_sources + gl_wayland_headers
+         doc_sources += s.full_path()
+@@ -1331,7 +1331,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (EGL specifics)',
+     )
+     gl_egl_gir = []
+-    if build_gir
+    if false
+       gir = {
+         'sources' : gl_egl_sources + gl_egl_headers,
+         'namespace' : 'GstGLEGL',
+@@ -1367,7 +1367,7 @@ if build_gstgl
+       description : 'Streaming media framework, OpenGL plugins libraries (Vivante Framebuffer specifics)',
+     )
+     gl_viv_fb_gir = []
+-    if build_gir
+    if false
+       gir = {
+         'sources' : gl_viv_fb_sources + gl_viv_fb_headers,
+         'namespace' : 'GstGLVivFB',
+-- 
+2.34.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
index 5c2492638..0cfa8c064 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bb
@@ -5,7 +5,7 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
 SUMMARY = "'Base' GStreamer plugins and helper libraries"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -20,8 +20,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba
           "
 SRC_URI[sha256sum] = "edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a"
-S = "${WORKDIR}/gst-plugins-base-${PV}"
 DEPENDS += "iso-codes util-linux zlib"
 inherit gobject-introspection
@@ -117,11 +115,12 @@ SRC_URI:remove = " \
    file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch"
 SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
-GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
+SRC_URI:append:mx93-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRC_URI:append:mx943-nxp-bsp = "file://0001-MMFMWK-9590-gstgl-1.0-disable-gir-build-for-gl-plugi.patch"
-SRCREV = "bbe6aa6f5b666fda0b172c3e1f417c7eadb16549"
-S = "${UNPACKDIR}/${BP}"
+GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "48718c61610e3628f3f162bb8d84ae213ae8516f"
 inherit use-imx-headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bbappend
index 528d7e1a3..528d7e1a3 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.0.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.26.6.imx.bbappend
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
deleted file mode 100644
index 54dd92873..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-# This .inc file contains the common setup for the gstreamer1.0-plugins-*
-# plugin set recipes.
-# SUMMARY is set in the actual .bb recipes
-HOMEPAGE = "https://gstreamer.freedesktop.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
-SECTION = "multimedia"
-DEPENDS = "gstreamer1.0 glib-2.0-native"
-inherit gettext meson pkgconfig upstream-version-is-even
-require gstreamer1.0-plugins-packaging.inc
-# Orc enables runtime JIT compilation of data processing routines from Orc
-# bytecode to SIMD instructions for various architectures (currently SSE, MMX,
-# MIPS, Altivec and NEON are supported).
-# This value is used in the PACKAGECONFIG values for each plugin set recipe.
-# By modifying it, Orc can be enabled/disabled in all of these recipes at once.
-GSTREAMER_ORC ?= "orc"
-# workaround to disable orc on mips to fix the build failure
-# {standard input}: Assembler messages:
-# {standard input}:46587: Error: branch out of range
-GSTREAMER_ORC:mips = ""
-PACKAGECONFIG[orc] = "-Dorc=enabled,-Dorc=disabled,orc orc-native"
-# TODO: put this in a gettext.bbclass patch (with variables to allow for
-# configuring the option name and the enabled/disabled values).
-def gettext_oemeson(d):
-    if d.getVar('USE_NLS') == 'no':
-        return '-Dnls=disabled'
-    # Remove the NLS bits if USE_NLS is no or INHIBIT_DEFAULT_DEPS is set
-    if d.getVar('INHIBIT_DEFAULT_DEPS') and not oe.utils.inherits(d, 'cross-canadian'):
-        return '-Dnls=disabled'
-    return '-Dnls=enabled'
-# Not all plugin sets contain examples, so the -Dexamples
-# option needs to be added conditionally.
-GST_PLUGIN_SET_HAS_EXAMPLES ?= "1"
-EXTRA_OEMESON += " \
-    ${@bb.utils.contains('GST_PLUGIN_SET_HAS_EXAMPLES', '1', '-Dexamples=disabled', '', d)} \
-    ${@gettext_oemeson(d)} \
-"
-GIR_MESON_ENABLE_FLAG = "enabled"
-GIR_MESON_DISABLE_FLAG = "disabled"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
index 7c921d97c..269761536 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.6.imx.bb
@@ -5,7 +5,7 @@
 ########### OE-core copy ##################
 # Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
 SUMMARY = "'Good' GStreamer plugins"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -17,7 +17,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go
 SRC_URI[sha256sum] = "b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778"
-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 \
@@ -98,12 +98,16 @@ LIC_FILES_CHKSUM = " \
    file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
 # Enable pulsesink in gstreamer
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}"
+PACKAGECONFIG:append = " pulseaudio"
 # fb implementation of v4l2 uses libdrm
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}"
 DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}"
+# FIXME: imx93/943 DISTRO_FEATURES contains x11 but v4l2 implement by libdrm ?
+DEPENDS:append:mx93-nxp-bsp = " libdrm"
+DEPENDS:append:mx943-nxp-bsp = " libdrm"
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
                file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
                file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \
@@ -111,8 +115,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.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRCREV = "6a0df1aee0ef2477dbacedd79df08c5bcb648e55"
+SRCREV = "447aebbd3c2b12a72f00316d60d7c86600a330f6"
 S = "${UNPACKDIR}/${BP}"
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
deleted file mode 100644
index cc2cedfd5..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) 2018 O.S. Systems Software LTDA.
-DESCRIPTION = "GStreamer 1.0 plugins for i.MX platforms"
-LICENSE = "LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
-SECTION = "multimedia"
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base libimxdmabuffer"
-# add the audioparsers and the videoparsersbad plugins as RDEPENDS ; audioparsers
-# for the uniaudio decoder, videoparsersbad for the VPU video decoder
-# the gstreamer1.0-plugins-imx RDEPENDS is necessary to ensure the -good recipe is
-# built (it is not a compile-time dependency however, hence RDEPENDS and not DEPENDS)
-RDEPENDS:gstreamer1.0-plugins-imx = "gstreamer1.0-plugins-good gstreamer1.0-plugins-bad"
-RDEPENDS:gstreamer1.0-plugins-imx-imxaudio = "gstreamer1.0-plugins-good-audioparsers"
-RDEPENDS:gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparsersbad"
-PV .= "+git${SRCPV}"
-SRCBRANCH ?= "master"
-SRCREV = "ce4f86e60f12c56574f727f3317fa8aa30a11387"
-SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
-inherit pkgconfig meson use-imx-headers
-# libg2d on i.MX8 SoCs with a DPU is emulated via the DPU.
-# That particular libg2d .so depends on libdrm, however.
-# Also, due to behavioral differences, an additional flag
-# is needed to improve performance.
-LIBG2D_DPU_OPTION = "-Dg2d-based-on-dpu=false"
-LIBG2D_DEPENDENCIES = "virtual/libg2d"
-LIBG2D_DPU_OPTION:imxdpu = "-Dg2d-based-on-dpu=true"
-LIBG2D_DEPENDENCIES:imxdpu = "virtual/libg2d libdrm"
-# v4l2-amphion and v4l2-isi are meant for the Amphion Malone
-# VPU decoder and the ISI drivers in older kernels, which had
-# lots of bugs that required nontrivial workarounds. In the
-# kernels in this release, newer drivers are present, which
-# obviate the need for these special elements.
-EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX} -Dv4l2-amphion=disabled -Dv4l2-isi=false"
-PACKAGECONFIG ?= "uniaudiodec"
-PACKAGECONFIG:append:imxgpu2d = " g2d"
-PACKAGECONFIG:append:imxvpu   = " vpu"
-PACKAGECONFIG:append:imxipu   = " ipu"
-PACKAGECONFIG:append:imxpxp   = " pxp"
-# The custom imxv4l2 source and sink elements are only
-# available on the i.MX6.
-# The 2D blitter sinks require an MXC framebuffer, which
-# is not available anymore on the i.MX8 (since these SoCs
-# now use KMS instead of the old Linux framebuffer).
-PACKAGECONFIG:append:mx6-nxp-bsp      = " imx2dvideosink v4l2-mxc-source-sink"
-PACKAGECONFIG:append:mx7-nxp-bsp      = " imx2dvideosink"
-PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}"
-PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled,"
-PACKAGECONFIG[ipu] = "-Dipu=enabled,-Dipu=disabled,"
-PACKAGECONFIG[vpu] = "-Dvpu=enabled,-Dvpu=disabled,libimxvpuapi2"
-PACKAGECONFIG[imx2dvideosink] = "-Dimx2d-videosink=true,-Dimx2d-videosink=false,"
-PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-source-sink=false,"
-PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec"
-PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec"
-require gstreamer1.0-plugins-packaging.inc
-# the following line is required to produce one package for each plugin
-PACKAGES_DYNAMIC = "^${PN}-.*"
-COMPATIBLE_MACHINE = "(mx6dl-nxp-bsp|mx6q-nxp-bsp|mx6sl-nxp-bsp|mx6sx-nxp-bsp|mx6ul-nxp-bsp|mx6ull-nxp-bsp|mx7d-nxp-bsp|mx8-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
deleted file mode 100644
index 8b1c00111..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# This .inc file contains functionality for automatically setting
-# the the license of all plugins according to the GSTREAMER_GPL.
-PACKAGESPLITFUNCS += "set_gstreamer_license"
-python set_gstreamer_license () {
-    import oe.utils
-    pn = d.getVar('PN') + '-'
-    gpl_plugins_names = [pn+plugin for plugin in d.getVar('GSTREAMER_GPL').split()]
-    for pkg in oe.utils.packages_filter_out_system(d):
-        if pkg in gpl_plugins_names:
-            d.setVar('LICENSE:' + pkg, 'GPL-2.0-or-later')
-        else:
-            d.setVar('LICENSE:' + pkg, 'LGPL-2.1-or-later')
-}
-EXTRA_OEMESON += " \
-    ${@bb.utils.contains_any('PACKAGECONFIG', "${GSTREAMER_GPL}", '-Dgpl=enabled', '-Dgpl=disabled', d)} \
-    "
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
deleted file mode 100644
index d77aeed8a..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-# This .inc file contains functionality for automatically splitting
-# built plugins into individual packages for each plugin. A -meta
-# package is also set up that has no files of its own, but contains
-# the names of all plugin packages in its RDEPENDS list.
-#
-# This is mainly used by the gstreamer1.0-plugins-* plugin set recipes,
-# but can be used in any recipe that produces GStreamer plugins.
-# Dynamically generate packages for all enabled plugins
-PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*"
-PACKAGESPLITFUNCS =+ "split_gstreamer10_packages"
-PACKAGESPLITFUNCS += "set_gstreamer10_metapkg_rdepends"
-python split_gstreamer10_packages () {
-    gst_libdir = d.expand('${libdir}/gstreamer-1.0')
-    postinst = d.getVar('plugin_postinst')
-    glibdir = d.getVar('libdir')
-    # GStreamer libraries
-    do_split_packages(d, glibdir, r'^lib(.*)\.so\.*', 'lib%s', 'GStreamer 1.0 %s library', extra_depends='', allow_links=True)
-    # GStreamer plugin shared objects
-    do_split_packages(d, gst_libdir, r'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer 1.0 plugin for %s', postinst=postinst, extra_depends='')
-    # GObject introspection files for GStreamer plugins
-    do_split_packages(d, glibdir+'/girepository-1.0', r'Gst(.*)-1.0\.typelib$', d.expand('${PN}-%s-typelib'), 'GStreamer 1.0 typelib file for %s', postinst=postinst, extra_depends='')
-    # Static GStreamer libraries for development
-    do_split_packages(d, gst_libdir, r'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer 1.0 plugin for %s (static development files)', extra_depends='${PN}-staticdev')
-}
-python set_gstreamer10_metapkg_rdepends () {
-    import os
-    import oe.utils
-    # Go through all generated packages (excluding the main package and
-    # the -meta package itself) and add them to the -meta package as RDEPENDS.
-    pn = d.getVar('PN')
-    metapkg =  pn + '-meta'
-    d.setVar('ALLOW_EMPTY:' + metapkg, "1")
-    d.setVar('FILES:' + metapkg, "")
-    exclude = [ pn, pn + '-meta' ]
-    metapkg_rdepends = []
-    pkgdest = d.getVar('PKGDEST')
-    for pkg in oe.utils.packages_filter_out_system(d):
-        if pkg not in exclude and pkg not in metapkg_rdepends:
-            # See if the package is empty by looking at the contents of its PKGDEST subdirectory.
-            # If this subdirectory is empty, then the package is.
-            # Empty packages do not get added to the meta package's RDEPENDS
-            pkgdir = os.path.join(pkgdest, pkg)
-            if os.path.exists(pkgdir):
-                dir_contents = os.listdir(pkgdir) or []
-            else:
-                dir_contents = []
-            is_empty = len(dir_contents) == 0
-            if not is_empty:
-                metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION:' + metapkg, pn + ' meta package')
-}
-# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
-# so we need them even when empty (like in gst-plugins-good case)
-ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-dev = "1"
-ALLOW_EMPTY:${PN}-staticdev = "1"
-PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
-FILES:${PN} = ""
-FILES:${PN}-apps = "${bindir}"
-FILES:${PN}-glib = "${datadir}/glib-2.0"
-RRECOMMENDS:${PN} += "${PN}-meta"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
index 1f5956ab4..71de57530 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bb
@@ -1,5 +1,5 @@
-require gstreamer1.0-plugins-common.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
-require gstreamer1.0-plugins-license.inc
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
 SUMMARY = "'Ugly GStreamer plugins"
 HOMEPAGE = "https://gstreamer.freedesktop.org/"
@@ -12,11 +12,12 @@ 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-${@get_gst_ver("${PV}")}.tar.xz \
+            https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
            "
-SRC_URI[sha256sum] = "a86b51c8454a813120848c803421f327d8c07aabcae461e0597cc49398c0fcde"
-S = "${UNPACKDIR}/gst-plugins-ugly-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "95032eee4580bb9826c008cbce5a2c3a78b980abb270c96a19b645f77255c491"
+S = "${UNPACKDIR}/gst-plugins-ugly-${PV}"
 DEPENDS += "gstreamer1.0-plugins-base"
@@ -39,11 +40,5 @@ EXTRA_OEMESON += " \
    -Dsidplay=disabled \
 "
-# Drop .imx from PV
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 FILES:${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
 FILES:${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bbappend
index ea144b396..ea144b396 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.0.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.26.6.bbappend
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
index 388ee81e6..89306c928 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-python_1.26.6.bb
@@ -7,8 +7,8 @@ SECTION = "multimedia"
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "e5046a05d77abb15671ad01cd1908d17d62e5a06f5d7841be4342ade2a3fb8db"
+SRC_URI[sha256sum] = "a4b5bfe039b7267fe8cdd48d106ab20cf88cda600f800d84f3d07724079edf1f"
 DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 DEPENDS:append = " gstreamer1.0-plugins-bad"
@@ -17,7 +17,7 @@ RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject"
 PNREAL = "gst-python"
-S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver('${PV}')}"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 EXTRA_OEMESON += "\
    -Dtests=disabled \
@@ -25,11 +25,9 @@ EXTRA_OEMESON += "\
    -Dlibpython-dir=${libdir} \
 "
-inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
+CFLAGS += "-Wno-error=implicit-function-declaration"
-# Drop .imx from PV
+inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check
-def get_gst_ver(v):
-    return oe.utils.trim_version(v, 3)
 FILES:${PN} += "${libdir}/gstreamer-1.0"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
new file mode 100644
index 000000000..9a1d206b6
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch
@@ -0,0 +1,63 @@
+From 0c50b2e474a0887aaefb1ae47af2c9b755cd1a12 Mon Sep 17 00:00:00 2001
+From: Haihua Hu <jared.hu@nxp.com>
+Date: Tue, 8 Jul 2025 17:22:38 +0900
+Subject: [PATCH] YOCIMX-9113 rtsp examples: install test-launch and test-uri
+ into rootfs
+gstreamer community has no plan to install these binary as test tool
+https://discourse.gstreamer.org/t/gst-rtsp-server-examples-are-not-installed-by-default/4806
+Upstream-Status: Inappropriate [i.MX specific]
+Signed-off-by: Haihua Hu <jared.hu@nxp.com>
+---
+ examples/meson.build | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+diff --git a/examples/meson.build b/examples/meson.build
+index 100c3f99f3..5939fb5ff6 100644
+--- a/examples/meson.build
+++ b/examples/meson.build
+@@ -7,7 +7,6 @@ examples = [
+   'test-appsrc2',
+   'test-auth',
+   'test-auth-digest',
+-  'test-launch',
+   'test-mp4',
+   'test-multicast2',
+   'test-multicast',
+@@ -22,11 +21,15 @@ examples = [
+   'test-record',
+   'test-replay-server',
+   'test-sdp',
+-  'test-uri',
+   'test-video',
+   'test-video-rtx',
+ ]
+ 
+install_examples = [
+  'test-launch',
+  'test-uri',
+]
+
+ foreach example : examples
+   executable(example, '@0@.c'.format(example),
+     c_args : rtspserver_args,
+@@ -35,6 +38,14 @@ foreach example : examples
+     install: false)
+ endforeach
+ 
+foreach example : install_examples
+  executable(example, '@0@.c'.format(example),
+    c_args : rtspserver_args,
+    include_directories : rtspserver_incs,
+    dependencies : [gst_dep, gstapp_dep, gstnet_dep, gst_rtsp_server_dep],
+    install: true)
+endforeach
+
+ cgroup_dep = dependency('libcgroup', version : '>= 0.26', required : false)
+ if cgroup_dep.found()
+   executable('test-cgroups', 'test-cgroups.c',
+-- 
+2.34.1
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
index b5dd9a322..9c32413ae 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.26.6.bb
@@ -8,31 +8,35 @@ DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
 PNREAL = "gst-rtsp-server"
-SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${@get_gst_ver("${PV}")}.tar.xz"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI[sha256sum] = "e983c039496e3f75e39696554ce74db4120e2465de17aa1cc37160568e9b40bc"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz \
+           file://0001-YOCIMX-9113-rtsp-examples-install-test-launch-and-te.patch \
+          "
-S = "${UNPACKDIR}/${PNREAL}-${@get_gst_ver("${PV}")}"
+SRC_URI[sha256sum] = "ce4e0b7dde7f17dc4f39ffb2dd3db64b0222d11d58be1c9820c20d30370d6f90"
+S = "${UNPACKDIR}/${PNREAL}-${PV}"
 inherit meson pkgconfig upstream-version-is-even gobject-introspection
 EXTRA_OEMESON += " \
    -Ddoc=disabled \
-    -Dexamples=disabled \
+    -Dexamples=enabled \
    -Dtests=disabled \
 "
 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
+require recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
 CVE_PRODUCT += "gst-rtsp-server"
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
+########### i.MX overrides ################
+EXTRA_OEMESON:append:mx93-nxp-bsp = " -Dintrospection=disabled "
+EXTRA_OEMESON:append:mx943-nxp-bsp = " -Dintrospection=disabled "
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend
deleted file mode 100644
index 3b23818dd..000000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG_GL:imxgpu = "egl"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
index 1d83ca031..559bac064 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.26.6.bb
@@ -9,19 +9,15 @@ 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}-${@get_gst_ver("${PV}")}.tar.xz"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "573931d455f5a96f63db7c8d35d51322b8d287816e8c6a77d84cfbb9fa1351f1"
+SRC_URI[sha256sum] = "d87c57244cecbd17bb030b698dcb67a66225de639f7c5b837391c4a8e5477667"
-S = "${UNPACKDIR}/${REALPN}-${@get_gst_ver('${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
-# 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_1.26.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
index 5b315ed7f..e602ff35c 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.26.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.26.6.imx.bb
@@ -20,8 +20,6 @@ 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}"
 SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
           file://run-ptest \
           file://0001-tests-respect-the-idententaion-used-in-meson.patch \
@@ -93,17 +91,15 @@ LIC_FILES_CHKSUM = " \
 # Use i.MX fork of GST for customizations
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
-                  file://0001-tests-respect-the-idententaion-used-in-meson.patch \
+                file://0001-tests-respect-the-idententaion-used-in-meson.patch \
-                  file://0002-tests-add-support-for-install-the-tests.patch \
+                file://0002-tests-add-support-for-install-the-tests.patch \
-                  file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \
+                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://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \
 "
 SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
 GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRCREV = "dba94b66ed28cc6537608a68c31c8be52f6f53a5"
+SRCREV = "524a14c8906597f4fd302190adbd3a8af3572866"
-S = "${UNPACKDIR}/${BP}"
 PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
deleted file mode 100644
index cb314b38d..000000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-gplay2-fix-termio.h-no-longer-existing.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b88aec4d7a8c8993c8c75f002a1f2af1635337d1 Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sat, 9 Aug 2025 08:20:50 +0000
-Subject: [PATCH] gplay2: fix termio.h no longer existing
-glibc 2.42 removed the long deprecated termio.h header which
-in 2.41 only included termios.h and sys/ioctl.h. [1]
-Replacing it with sys/ioctl.h seems to provide all the needed
-declaration for successfully compiling.
-[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS#l91
-Upstream-Status: Pending
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
- tools/gplay2/gplay2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c
-index 9e406b9ea8c7..98b3ee5cf666 100755
--- a/tools/gplay2/gplay2.c
-+++ b/tools/gplay2/gplay2.c
-@@ -26,7 +26,7 @@
-  */
- 
- 
-#include <termio.h>
-+#include <sys/ioctl.h>
- #include <unistd.h>
- #include <pthread.h>
- #include <stdio.h>
-- 
-2.42.0
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index 2ba8fdd1d..48d84cead 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -1,8 +1,7 @@
 # Copyright (C) 2014,2016 Freescale Semiconductor
-# Copyright 2017-2021 NXP
+# Copyright 2017-2025 NXP
 # Copyright (C) 2012-2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Gstreamer freescale plugins"
 SECTION = "multimedia"
 LICENSE = "GPL-2.0-only & LGPL-2.0-only & LGPL-2.1-only"
@@ -15,11 +14,13 @@ DEPENDS = " \
    imx-codec \
    imx-parser \
    ${DEPENDS_IMXGPU} \
+    libinput \
 "
 DEPENDS:append:mx6-nxp-bsp = " imx-lib"
 DEPENDS:append:mx7-nxp-bsp = " imx-lib"
 DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
 DEPENDS:append:mx93-nxp-bsp = " imx-lib"
+DEPENDS:append:mx943-nxp-bsp = " imx-lib"
 DEPENDS:append:imxvpu = " imx-vpuwrap"
 DEPENDS:append:imxfbdev:imxgpu = " libdrm"
 DEPENDS_IMXGPU        = ""
@@ -34,14 +35,13 @@ RREPLACES:${PN}  = "gst1.0-fsl-plugin"
 RPROVIDES:${PN}  = "gst1.0-fsl-plugin"
 RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
-PV = "4.10.0+git${SRCPV}"
+PV = "4.10.3+git${SRCPV}"
+SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}"
+IMXGST_SRC ?= "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "0565fc515612908a353e8378e24f97de17cc56a6"
-SRC_URI = " \
-    git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
-    file://0001-gplay2-fix-termio.h-no-longer-existing.patch \
-"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
-SRCREV = "6861aec99901375f5ebcd5170ce1f5232cd38fd6"
 inherit meson pkgconfig use-imx-headers
@@ -60,7 +60,7 @@ EXTRA_OEMESON = "-Dplatform=${PLATFORM} \
                 -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
-PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine ${PN}-libplayengine"
+PACKAGES =+ "${PN}-tools ${PN}-libgstfsl"
 # Add codec list that the beep plugin run-time depended
 BEEP_RDEPENDS = "imx-codec-aac imx-codec-mp3 imx-codec-oggvorbis"
@@ -86,12 +86,9 @@ FILES:${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}"
 FILES:${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
 FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/pkgconfig/*.pc"
-FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
+FILES:${PN}-tools += "${bindir}/* ${libdir}/librecorder_engine-1.0${SOLIBS}"
-FILES:${PN}-gplay = "${bindir}/gplay-1.0"
-FILES:${PN}-libgplaycore = "${libdir}/libgplaycore-1.0${SOLIBS}"
 FILES:${PN}-libgstfsl = "${libdir}/libgstfsl-1.0${SOLIBS}"
-FILES:${PN}-grecorder = "${bindir}/grecorder-1.0"
-FILES:${PN}-librecorder-engine = "${libdir}/librecorder_engine-1.0${SOLIBS}"
+INSANE_SKIP:${PN} = "build-deps"
-FILES:${PN}-libplayengine = "${libdir}/libplayengine-1.0${SOLIBS}"
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
index cf4e4d182..eca003737 100644
--- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
+++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.11.0.bb
@@ -2,13 +2,13 @@
 DESCRIPTION = "NXP Multimedia opencl converter lib"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 DEPENDS = "virtual/libopencl1"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "b81b785"
+IMX_SRCREV_ABBREV = "84ed303"
-SRC_URI[sha256sum] = "a4dee08d5949d41cb9c61d44ce0b5a055b9416129216f9d36d0bc6d9e512ab64"
+SRC_URI[sha256sum] = "e8813c18e3f65caab2036c1f608b8b7def8314b0f01c830ea696cb1aeb92cc7c"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
 inherit fsl-eula-unpack autotools pkgconfig meson
diff --git a/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
index 60add6e33..d8f002e64 100644
--- a/recipes-multimedia/imx-parser/imx-parser_4.10.0.bb
+++ b/recipes-multimedia/imx-parser/imx-parser_4.10.3.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Freescale Multimedia parser libs"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 # For backwards compatibility
 PROVIDES += "libfslparser"
@@ -14,10 +14,10 @@ RPROVIDES:${PN} = "libfslparser"
 RCONFLICTS:${PN} = "libfslparser"
 SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
-IMX_SRCREV_ABBREV = "e8a7ec7"
+IMX_SRCREV_ABBREV = "65603f3"
 S = "${UNPACKDIR}/${BP}-${IMX_SRCREV_ABBREV}"
-SRC_URI[sha256sum] = "90b4b7f7c3cffc9d57774dbb06e37d810a2618e059f30244e1b4155fb9bc82d5"
+SRC_URI[sha256sum] = "03079bb0fa989dc50fadb66a0fcc7cf65423833c3def04085603d4b66e8f8c70"
 inherit fsl-eula-unpack autotools pkgconfig
diff --git a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
index 1ad735152..dae99cb13 100644
--- a/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
+++ b/recipes-multimedia/imx-vpuwrap/imx-vpuwrap_git.bb
@@ -5,14 +5,15 @@
 DESCRIPTION = "Freescale Multimedia VPU wrapper"
 LICENSE = "Proprietary"
 SECTION = "multimedia"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac"
 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}"
+SRC_URI = "${IMX_VPUWRAP_SRC};branch=${SRCBRANCH}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+IMX_VPUWRAP_SRC ?= "git://github.com/NXP/imx-vpuwrap.git;protocol=https"
-SRCREV = "feeb9109a027d3a0f040b0bddb5f79a1daad3587"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+SRCREV = "1d2136e39789edb1eff730043caf2305ee2c173e"
 inherit autotools pkgconfig
diff --git a/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
new file mode 100644
index 000000000..6b811b5f1
--- /dev/null
+++ b/recipes-multimedia/libcamera/libcamera_0.6.0.imx.bb
@@ -0,0 +1,115 @@
+# This recipe is for the i.MX fork of libcamera. For ease of
+# maintenance, the top section is a verbatim copy of an OE-core
+# recipe. The second section customizes the recipe for i.MX.
+########### meta-openembedded copy ##################
+# Upstream hash: f4b9dfa0c903bc94c344c657917a3fbb229c322f
+SUMMARY = "Linux libcamera framework"
+SECTION = "libs"
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "\
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"
+SRC_URI = " \
+        git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV} \
+"
+SRCREV = "3e6f5d83e397e11cccd3844e121463748f56de39"
+PE = "1"
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
+PACKAGES =+ "${PN}-gst ${PN}-pycamera"
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[dng] = ",,tiff"
+PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11"
+PACKAGECONFIG[raspberrypi] = ",,libpisp"
+# Raspberry Pi requires the meta-raspberrypi layer
+# These values are coming from the project's meson.build file,
+# which lists the supported values by arch.
+ARM_PIPELINES = "${@bb.utils.contains('PACKAGECONFIG', 'raspberrypi', 'rpi/pisp,rpi/vc4,', '', d)}"
+ARM_PIPELINES .= "imx8-isi,mali-c55,simple,uvcvideo"
+LIBCAMERA_PIPELINES ??= "auto"
+LIBCAMERA_PIPELINES:arm ??= "${ARM_PIPELINES}"
+LIBCAMERA_PIPELINES:aarch64 ??= "${ARM_PIPELINES}"
+EXTRA_OEMESON = " \
+    -Dpipelines=${LIBCAMERA_PIPELINES} \
+    -Dv4l2=true \
+    -Dcam=enabled \
+    -Dlc-compliance=disabled \
+    -Dtest=false \
+    -Ddocumentation=disabled \
+"
+RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}"
+inherit meson pkgconfig python3native
+do_configure:prepend() {
+    sed -i -e 's|py_compile=True,||' ${S}/utils/codegen/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
+}
+do_install:append() {
+    chrpath -d ${D}${libdir}/libcamera.so
+    chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so
+}
+do_package:append() {
+    bb.build.exec_func("do_package_recalculate_ipa_signatures", d)
+}
+do_package_recalculate_ipa_signatures() {
+    local modules
+    for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do
+        module="${module%.sign}"
+        if [ -f "${module}" ] ; then
+            modules="${modules} ${module}"
+        fi
+    done
+    ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}"
+}
+FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so"
+FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
+FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera"
+# libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
+# both 32 and 64 bit file APIs.
+GLIBC_64BIT_TIME_FLAGS = ""
+########### End of meta-openembedded copy ###########
+########### i.MX overrides ################
+SRC_URI:remove = "git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master;tag=v${PV}"
+SRC_URI:prepend = "${LIBCAMERA_SRC};branch=${SRCBRANCH} "
+LIBCAMERA_SRC ?= "git://github.com/nxp-imx/libcamera.git;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "3e6f5d83e397e11cccd3844e121463748f56de39"
+PACKAGECONFIG = "gst pycamera dng"
+ARM_PIPELINES .= ",nxp/neo"
+EXTRA_OEMESON += " \
+    --python.platlibdir=${PYTHON_SITEPACKAGES_DIR} \
+"
+# Qt installs native tools to /usr/libexec, but this is not in PATH
+PATH:prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'qt', '${STAGING_LIBEXECDIR_NATIVE}:', '', d)}"
+COMPATIBLE_MACHINE = "(mx95-nxp-bsp|mx8mm-nxp-bsp|mx8ulp-nxp-bsp|mx8mq-nxp-bsp)"
+########### End of i.MX overrides #########
diff --git a/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
new file mode 100644
index 000000000..88b9a1d0e
--- /dev/null
+++ b/recipes-multimedia/libcamera/neo-ipa-uguzzi_0.2.6.bb
@@ -0,0 +1,35 @@
+SUMMARY = "uGuzzi IPA for the libcamera NXP NEO pipeline"
+DESCRIPTION = "\
+An Image Processing Algorithm library for libcamera, for i.MX95 ISP, \
+based on proprietary MM Solutions EAD uGuzzi 3A library"
+SECTION = "libs"
+LICENSE = "Apache-2.0 & BSD-2-Clause & GPL-2.0-or-later & LGPL-2.1-or-later & MIT & Proprietary"
+# Put EULA on separate line for automated recipe updates
+LIC_FILES_CHKSUM = "file://LICENSES/LA_OPT_NXP_Software_License.txt;md5=bc649096ad3928ec06a8713b8d787eac"
+LIC_FILES_CHKSUM += " \
+    file://COPYING;md5=6462e06298403caf09a22e67a7cc551a \
+    file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://LICENSES/BSD-2-Clause.txt;md5=63d6ee386b8aaba70b1bf15a79ca50f2 \
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=3c328714bf889b2c3c7cd842e3e4893b \
+    file://LICENSES/MIT.txt;md5=38aa75cf4c4c87f018227d5ec9638d75 "
+DEPENDS = "libcamera"
+SRC_URI = "${NEO_IPA_UGUZZI_SRC};branch=${SRCBRANCH}"
+NEO_IPA_UGUZZI_SRC ?= "git://github.com/nxp-imx/neo-ipa-uguzzi;protocol=https"
+SRCBRANCH = "lf-6.18.2_1.0.0"
+SRCREV = "3c3b18e397a81fac2babe14dca01f4ada1ecc8b2"
+inherit meson pkgconfig
+FILES:${PN} += "${libdir}/libcamera ${datadir}/libcamera"
+# Libraries are unversioned
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+# Pre-built binaries are already stripped, so skip the QA test
+INSANE_SKIP:${PN} = "already-stripped"
+COMPATIBLE_MACHINE = "(mx95-generic-bsp)"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
index 7afa44cb1..f29011601 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb
@@ -9,12 +9,13 @@ inherit pkgconfig
 DEPENDS += "alsa-lib nxp-afe"
-PV = "2.0+git"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
+PV = "2.0+${SRCPV}"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+NXPAFE_VOICESEEKER_SRC ?= "git://github.com/nxp-imx/imx-voiceui.git;protocol=https"
-SRC_URI = "git://github.com/nxp-imx/imx-voiceui.git;protocol=https;branch=${SRCBRANCH}"
+SRC_URI = "${NXPAFE_VOICESEEKER_SRC};branch=${SRCBRANCH}"
-SRCREV = "737c156469eeede28fe1a0777c968becf6fea886" 
+SRCREV = "94639a8ea4a65a218f60b900269a7dc4bf97fefb"
 EXTRA_CONF = "--enable-armv8 --bindir=/unit_tests/ --libdir=${libdir}"
diff --git a/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
index a401bedeb..5ac5d374a 100644
--- a/recipes-multimedia/nxp-afe/nxp-afe_git.bb
+++ b/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -6,20 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
 PV = "1.0+git"
-SRCBRANCH = "MM_04.10.0_2505_L6.12.20"
+SRCBRANCH = "MM_04.10.03_2512_L6.18.2"
-SRC_URI = " git://github.com/nxp-imx/nxp-afe.git;protocol=https;branch=${SRCBRANCH}"
+NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https"
+SRC_URI = " ${NXPAFE_SRC};branch=${SRCBRANCH}"
-SRCREV = "c6b8fee21376e724b8441f3cf6c04dee69b5242e"
+SRCREV = "7d518eb0b18f7c7faadeb3c3397f8b73f0012f3e"
 DEPENDS += "alsa-lib"
 TARGET_CC_ARCH += "${LDFLAGS}"
-do_compile() {
-        oe_runmake clean
-        oe_runmake all
-}
 do_install() {
        install -d ${D}${libdir}/nxp-afe
        install -d ${D}/unit_tests/nxp-afe
@@ -33,3 +29,4 @@ do_install() {
 FILES:${PN} += "/unit_tests"
 INSANE_SKIP:${PN} += "dev-so"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
author	Otavio Salvador <otavio@ossystems.com.br>	2026-03-25 08:35:40 -0300
committer	GitHub <noreply@github.com>	2026-03-25 08:35:40 -0300
commit	bb90caa4aa6c88df71f36a1194bf19f2c724d835 (patch)
tree	26870453575d631fd5cc1b9874f59d7e15440c32
parent	831eb3251f74c6f478db4503bfe5aacde340833b (diff)
parent	2a24b8ec37404e9dd22e136faf44d35e55e2b89d (diff)
download	meta-freescale-bb90caa4aa6c88df71f36a1194bf19f2c724d835.tar.gz