diff --git a/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch b/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch new file mode 100644 index 0000000..d59e94f --- /dev/null +++ b/0001-settings-remove-44.1KHz-from-allowed-rates-again.patch @@ -0,0 +1,55 @@ +From 16a7c274989f47b0c0d8ba192a30316b545bd26a Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Fri, 17 Jun 2022 09:02:13 +0200 +Subject: [PATCH] settings: remove 44.1KHz from allowed rates again + +It seems to cause too many problems. It people want rate switching they +can add an override themselves. +--- + src/daemon/minimal.conf.in | 2 +- + src/daemon/pipewire.conf.in | 2 +- + src/pipewire/settings.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in +index 49227dddf..8b3ba7640 100644 +--- a/src/daemon/minimal.conf.in ++++ b/src/daemon/minimal.conf.in +@@ -27,7 +27,7 @@ context.properties = { + + ## Properties for the DSP configuration. + #default.clock.rate = 48000 +- #default.clock.allowed-rates = [ 44100 48000 ] ++ #default.clock.allowed-rates = [ 48000 ] + #default.clock.quantum = 1024 + #default.clock.min-quantum = 32 + #default.clock.max-quantum = 2048 +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index 787e45f42..3b9f611b7 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -27,7 +27,7 @@ context.properties = { + + ## Properties for the DSP configuration. + #default.clock.rate = 48000 +- #default.clock.allowed-rates = [ 44100 48000 ] ++ #default.clock.allowed-rates = [ 48000 ] + #default.clock.quantum = 1024 + default.clock.min-quantum = 16 + #default.clock.max-quantum = 2048 +diff --git a/src/pipewire/settings.c b/src/pipewire/settings.c +index 92d297ca3..c512e9658 100644 +--- a/src/pipewire/settings.c ++++ b/src/pipewire/settings.c +@@ -41,7 +41,7 @@ + #define NAME "settings" + + #define DEFAULT_CLOCK_RATE 48000u +-#define DEFAULT_CLOCK_RATES "[ 44100 48000 ]" ++#define DEFAULT_CLOCK_RATES "[ 48000 ]" + #define DEFAULT_CLOCK_QUANTUM 1024u + #define DEFAULT_CLOCK_MIN_QUANTUM 32u + #define DEFAULT_CLOCK_MAX_QUANTUM 2048u +-- +GitLab + diff --git a/pipewire.changes b/pipewire.changes index a62bce6..eec4b6c 100644 --- a/pipewire.changes +++ b/pipewire.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 22 17:47:19 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to remove 44.1kHz from allowed rates. + This reverts the new behaviour in 0.3.52 which is causing + problems to too many people (boo#1200760): + * 0001-settings-remove-44.1KHz-from-allowed-rates-again.patch + ------------------------------------------------------------------- Thu Jun 9 15:02:18 UTC 2022 - Alexei Sorokin diff --git a/pipewire.spec b/pipewire.spec index 173400f..d04e6eb 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -64,6 +64,8 @@ Source0: %{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-OPENSUSE reduce-meson-dependency.patch Patch0: reduce-meson-dependency.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-settings-remove-44.1KHz-from-allowed-rates-again.patch BuildRequires: docutils BuildRequires: doxygen BuildRequires: fdupes @@ -334,6 +336,7 @@ This package provides a PulseAudio implementation based on PipeWire %if 0%{?sle_version} == 150300 %patch0 -p1 %endif +%patch1 -p1 %build %if %{pkg_vcmp gcc < 8}