diff options
author | Tom Hochstein <tom.hochstein@oss.nxp.com> | 2024-04-24 07:10:23 -0500 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@oss.nxp.com> | 2024-04-24 07:10:23 -0500 |
commit | 4d55669232e6c8f6e9813569e7022e8954532d8d (patch) | |
tree | f9b0d419e726d5607c766bdf616d111b205ed157 /dynamic-layers | |
parent | 688b6f804497772785d87d8a22827556ca405995 (diff) | |
download | meta-freescale-4d55669232e6c8f6e9813569e7022e8954532d8d.tar.gz |
pipewire: Fix move to dynamic-layers
Fixes: e70b160 ("pipewire: untie bbappend from meta-multimedia")
Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r-- | dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch | 41 |
1 files changed, 41 insertions, 0 deletions
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 @@ | |||
1 | From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Shengjiu Wang <shengjiu.wang@nxp.com> | ||
3 | Date: Tue, 28 Nov 2023 10:23:42 +0800 | ||
4 | Subject: [PATCH] launch: allow pipewire-pulse can be started by root. | ||
5 | |||
6 | revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse | ||
7 | systemd units for root") | ||
8 | |||
9 | Upstream-Status: Inappropriate [i.MX specific] | ||
10 | Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> | ||
11 | --- | ||
12 | src/daemon/systemd/user/pipewire-pulse.service.in | 1 - | ||
13 | src/daemon/systemd/user/pipewire-pulse.socket | 1 - | ||
14 | 2 files changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in | ||
17 | index 73d22e532..da7728ee3 100644 | ||
18 | --- a/src/daemon/systemd/user/pipewire-pulse.service.in | ||
19 | +++ b/src/daemon/systemd/user/pipewire-pulse.service.in | ||
20 | @@ -14,7 +14,6 @@ Description=PipeWire PulseAudio | ||
21 | # After=pipewire-pulse.socket is not needed, as it is already implicit in the | ||
22 | # socket-service relationship, see systemd.socket(5). | ||
23 | Requires=pipewire-pulse.socket | ||
24 | -ConditionUser=!root | ||
25 | Wants=pipewire.service pipewire-session-manager.service | ||
26 | After=pipewire.service pipewire-session-manager.service | ||
27 | Conflicts=pulseaudio.service | ||
28 | diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket | ||
29 | index 1ae5edafb..d27fb0e26 100644 | ||
30 | --- a/src/daemon/systemd/user/pipewire-pulse.socket | ||
31 | +++ b/src/daemon/systemd/user/pipewire-pulse.socket | ||
32 | @@ -1,6 +1,5 @@ | ||
33 | [Unit] | ||
34 | Description=PipeWire PulseAudio | ||
35 | -ConditionUser=!root | ||
36 | Conflicts=pulseaudio.socket | ||
37 | |||
38 | [Socket] | ||
39 | -- | ||
40 | 2.34.1 | ||
41 | |||