diff --git a/.gitignore b/.gitignore index cdf8c41..011c8b6 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /pipewire-0.3.21.tar.gz /pipewire-0.3.22.tar.gz /pipewire-0.3.23.tar.gz +/pipewire-0.3.24.tar.gz diff --git a/0001-conf-start-media-session-through-pipewire.patch b/0001-conf-start-media-session-through-pipewire.patch index efde25e..57ebb7a 100644 --- a/0001-conf-start-media-session-through-pipewire.patch +++ b/0001-conf-start-media-session-through-pipewire.patch @@ -1,22 +1,22 @@ -From 8fb25faa9d66dc1125efd1ca401c88cc96f797db Mon Sep 17 00:00:00 2001 +From daf929aa0a50b06218b3269bdde3282549ef70c4 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 4 Mar 2021 15:38:16 +0100 -Subject: [PATCH 1/2] conf: start media-session through pipewire +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 ed4ee3b29..b4053f9de 100644 +index 281671c7c..af89fdc05 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -203,7 +203,7 @@ context.exec = { +@@ -204,7 +204,7 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@"@media_session_path@" = { args = "" } -+ "@media_session_path@" = { args = "" } +- @comment@{ path = "@media_session_path@" args = "" } ++ { path = "@media_session_path@" args = "" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. diff --git a/0002-alsa-pass-the-right-direction-to-ucm_set_port.patch b/0002-alsa-pass-the-right-direction-to-ucm_set_port.patch deleted file mode 100644 index ea0c036..0000000 --- a/0002-alsa-pass-the-right-direction-to-ucm_set_port.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 74a8dde7d67f83bbb657d3889ed588110151f362 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Mon, 8 Mar 2021 17:40:32 +0100 -Subject: [PATCH 2/2] alsa: pass the right direction to ucm_set_port() - -The function requires true for playback ports and false otherwise. - -See #867 ---- - spa/plugins/alsa/acp/acp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/spa/plugins/alsa/acp/acp.c b/spa/plugins/alsa/acp/acp.c -index b348e0ee4..640c46d60 100644 ---- a/spa/plugins/alsa/acp/acp.c -+++ b/spa/plugins/alsa/acp/acp.c -@@ -1774,7 +1774,8 @@ int acp_device_set_port(struct acp_device *dev, uint32_t port_index, uint32_t fl - mixer_volume_init(impl, d); - - sync_mixer(d, p); -- res = pa_alsa_ucm_set_port(d->ucm_context, p, true); -+ res = pa_alsa_ucm_set_port(d->ucm_context, p, -+ dev->direction == ACP_DIRECTION_PLAYBACK); - } else { - pa_alsa_port_data *data; - --- -2.26.2 - diff --git a/pipewire.spec b/pipewire.spec index 93d7427..4838cf6 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -1,6 +1,6 @@ %global majorversion 0 %global minorversion 3 -%global microversion 23 +%global microversion 24 %global apiversion 0.3 %global spaversion 0.2 @@ -8,7 +8,7 @@ %global libversion %{soversion}.%(bash -c '((intversion = (%{minorversion} * 100) + %{microversion})); echo ${intversion}').0 # For rpmdev-bumpspec and releng automation -%global baserelease 2 +%global baserelease 1 #global snapdate 20210107 #global gitcommit b17db2cebc1a5ab2c01851d29c05f79cd2f262bb @@ -57,7 +57,6 @@ Source0: https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/%{version}/p ## fedora patches Patch0: 0001-conf-start-media-session-through-pipewire.patch -Patch1: 0002-alsa-pass-the-right-direction-to-ucm_set_port.patch BuildRequires: gettext BuildRequires: meson >= 0.49.0 @@ -246,11 +245,16 @@ This package provides a PulseAudio implementation based on PipeWire %build %meson \ - -D docs=true -D man=true -D gstreamer=true -D systemd=true \ - -D gstreamer-device-provider=false -D sdl2=disabled \ - %{!?with_jack:-D jack=false -D pipewire-jack=false} \ - %{!?with_alsa:-D pipewire-alsa=false} \ - %{?with_vulkan:-D vulkan=true} + -D docs=enabled -D man=enabled -D gstreamer=enabled -D systemd=enabled \ + -D gstreamer-device-provider=disabled -D sdl2=disabled \ + -D libcamera=disabled -D audiotestsrc=disabled -D videotestsrc=disabled \ + -D volume=disabled -D bluez5-codec-aptx=disabled \ +%ifarch s390x + -D bluez5-codec-ldac=disabled \ +%endif + %{!?with_jack:-D jack=disabled -D pipewire-jack=disabled} \ + %{!?with_alsa:-D pipewire-alsa=disabled} \ + %{?with_vulkan:-D vulkan=enabled} %meson_build %install @@ -440,6 +444,9 @@ systemctl --no-reload preset --global pipewire.socket >/dev/null 2>&1 || : %endif %changelog +* Thu Mar 18 2021 Wim Taymans - 0.3.24-1 +- Update to 0.3.24 + * Tue Mar 09 2021 Wim Taymans - 0.3.23-2 - Add patch to enable UCM Microphones diff --git a/sources b/sources index e12722a..f895690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pipewire-0.3.23.tar.gz) = 3594c53aaaeca2087cf8eadac41e16146674430a7f45288bd51e6d84660af908557b3faf15cf9ac3c2095e85d1a4cf871e645724bf3f9ea87438a7442b870791 +SHA512 (pipewire-0.3.24.tar.gz) = be1fd3b15aae4fc276dd7e4be385cd58e6e9626d6e0a42b7bc3eb46ba324759c05320547aa857510ecf24b1628b76555222d342350d6406ad4d7b536cb3db497