From adb884d19b9e1d94fd40cd700edbfc527092330a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 15 Jul 2021 10:37:08 +1000 Subject: [PATCH] Enable media-session.service, requires fedora-release-35-0.10 to enable the service by default (#1976006). --- ...start-media-session-through-pipewire.patch | 25 ------------------- pipewire.spec | 11 ++++---- 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 0001-conf-start-media-session-through-pipewire.patch diff --git a/0001-conf-start-media-session-through-pipewire.patch b/0001-conf-start-media-session-through-pipewire.patch deleted file mode 100644 index 3377226..0000000 --- a/0001-conf-start-media-session-through-pipewire.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c147f500bed62130a078295f7dc8f02946a41f05 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 4 Mar 2021 15:38:16 +0100 -Subject: [PATCH] conf: start media-session through pipewire - ---- - src/daemon/pipewire.conf.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index f326f1b30..488f60219 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -234,7 +234,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ { path = "@session_manager_path@" args = "@session_manager_args@" } - # - # You can optionally start the pulseaudio-server here as well - # but it is better to start it as a systemd service. --- -2.31.1 - diff --git a/pipewire.spec b/pipewire.spec index 71518fe..b0ad223 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -8,7 +8,7 @@ %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 # For rpmdev-bumpspec and releng automation -%global baserelease 3 +%global baserelease 4 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -57,7 +57,6 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{ver ## upstreamable patches ## fedora patches -Patch1001: 0001-conf-start-media-session-through-pipewire.patch BuildRequires: gettext BuildRequires: meson >= 0.49.0 @@ -321,9 +320,6 @@ rm %{buildroot}%{_datadir}/pipewire/media-session.d/with-pulseaudio rm %{buildroot}%{_datadir}/pipewire/pipewire-pulse.conf %endif -# We don't start the media session with systemd yet -rm %{buildroot}%{_userunitdir}/pipewire-media-session.* - %find_lang %{name} # upstream should use udev.pc @@ -377,6 +373,7 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %files media-session %{_bindir}/pipewire-media-session +%{_userunitdir}/pipewire-media-session.service %dir %{_datadir}/pipewire/media-session.d/ %{_datadir}/pipewire/media-session.d/alsa-monitor.conf %{_datadir}/pipewire/media-session.d/bluez-hardware.conf @@ -504,6 +501,10 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Jul 15 2021 Peter Hutterer - 0.3.31-4 +- Enable media-session.service, requires fedora-release-35-0.10 to enable the + service by default (#1976006). + * Mon Jul 05 2021 Neal Gompa - 0.3.31-3 - Add "Conflicts: pipewire-session-manager" to pipewire-media-session to enforce one implementation of the session manager at a time