From 4d55669232e6c8f6e9813569e7022e8954532d8d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 24 Apr 2024 07:10:23 -0500 Subject: pipewire: Fix move to dynamic-layers Fixes: e70b160 ("pipewire: untie bbappend from meta-multimedia") Signed-off-by: Tom Hochstein --- ...low-pipewire-pulse-can-be-started-by-root.patch | 41 ++++++++++++++++++++++ ...low-pipewire-pulse-can-be-started-by-root.patch | 41 ---------------------- 2 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch delete mode 100644 recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch 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 new file mode 100644 index 00000000..ab34dc2f --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch @@ -0,0 +1,41 @@ +From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001 +From: Shengjiu Wang +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 +--- + 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/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch deleted file mode 100644 index ab34dc2f..00000000 --- a/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 -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf