From fcd82f10801e8d00315f89cab6f04a93a229b10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Wed, 13 Jul 2022 00:40:00 +0200 Subject: [PATCH] pipewire: update to 0.3.55 --- .../pipewire/patches/0.3.55-jack-mix.patch | 26 +++++++++++++++++++ srcpkgs/pipewire/template | 6 ++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/pipewire/patches/0.3.55-jack-mix.patch diff --git a/srcpkgs/pipewire/patches/0.3.55-jack-mix.patch b/srcpkgs/pipewire/patches/0.3.55-jack-mix.patch new file mode 100644 index 000000000000..14cd4feb16fe --- /dev/null +++ b/srcpkgs/pipewire/patches/0.3.55-jack-mix.patch @@ -0,0 +1,26 @@ +From 40552a0e914c3aef48ce59ce1bfb9d80516aa893 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Tue, 12 Jul 2022 15:10:02 +0200 +Subject: [PATCH] jack: only mix when we have input to mix + +Avoids a crash when starting ardour6. +--- + pipewire-jack/src/pipewire-jack.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c +index 2a9ebc40d..04c63984d 100644 +--- a/pipewire-jack/src/pipewire-jack.c ++++ b/pipewire-jack/src/pipewire-jack.c +@@ -4449,7 +4449,7 @@ static void *get_buffer_input_float(struct port *p, jack_nframes_t frames) + } + if (n_ptr == 1) { + ptr = mix_ptr[0]; +- } else { ++ } else if (n_ptr > 1) { + ptr = p->emptyptr; + mix_function(ptr, mix_ptr, n_ptr, ptr_aligned, frames); + p->zeroed = false; +-- +GitLab + diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 63a41a8e5189..e9ff4af833ab 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.54 -revision=2 +version=0.3.55 +revision=1 _pms_version=0.4.1 build_style=meson configure_args=" @@ -34,7 +34,7 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="11a856ac3eb70b7cbeef12407f50d240d212016b6de3bb692e462251571f050e +checksum="666260961a242239a940b7f6130e5e9cb51ad76f9ebf6b5403198ee5efa69344 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire"