pipewire: Refresh patch

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>

5 files changed, 130 insertions, 46 deletions

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"
-
-SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable"
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-systemd-allow-pipewire-user-services-for-root.patch \
+    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)}"