[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/, media-video/pipewire/files/

["Sam James" <sam@gentoo.org>]

commit:     b44d0353dbf3af2cb4cd50e0c186eb5e06ce5014
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 23:22:04 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 23:22:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44d0353

media-video/pipewire: backport JACK mix patch

Noted by upstream in release notes update.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pipewire/files/pipewire-0.3.55-jack-mix.patch    | 20 ++++++++++++++++++++
 ...ipewire-9999.ebuild => pipewire-0.3.55-r1.ebuild} |  6 +++++-
 media-video/pipewire/pipewire-9999.ebuild            |  5 ++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch b/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
new file mode 100644
index 000000000000..8667b3a6d167
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch
@@ -0,0 +1,20 @@
+https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/40552a0e914c3aef48ce59ce1bfb9d80516aa893
+
+From 40552a0e914c3aef48ce59ce1bfb9d80516aa893 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+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.
+--- 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/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.55-r1.ebuild
similarity index 98%
copy from media-video/pipewire/pipewire-9999.ebuild
copy to media-video/pipewire/pipewire-0.3.55-r1.ebuild
index 449554e6270c..bf9ff497fa05 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-0.3.55-r1.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 # 1. Please regularly check (even at the point of bumping) Fedora's packaging
 # for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
 #
-# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
 # continue to move quickly. It's not uncommon for fixes to be made shortly
 # after releases.
 
@@ -141,6 +144,7 @@ DOCS=( {README,INSTALL}.md NEWS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	"${FILESDIR}"/${P}-jack-mix.patch
 )
 
 # limitsdfile related code taken from =sys-auth/realtime-base-0.1

diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 449554e6270c..f4d3db600214 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=8
 # 1. Please regularly check (even at the point of bumping) Fedora's packaging
 # for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
 #
-# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
+# 2. Upstream also sometimes amend release notes for the previous release to mention
+# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
+#
+# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
 # continue to move quickly. It's not uncommon for fixes to be made shortly
 # after releases.