From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C832158094 for ; Tue, 12 Jul 2022 23:23:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEE83E07B3; Tue, 12 Jul 2022 23:23:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 896E4E07B3 for ; Tue, 12 Jul 2022 23:23:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BB4C3410A1 for ; Tue, 12 Jul 2022 23:23:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5424474 for ; Tue, 12 Jul 2022 23:23:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657668142.b44d0353dbf3af2cb4cd50e0c186eb5e06ce5014.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/, media-video/pipewire/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/files/pipewire-0.3.55-jack-mix.patch media-video/pipewire/pipewire-0.3.55-r1.ebuild media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/files/ media-video/pipewire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b44d0353dbf3af2cb4cd50e0c186eb5e06ce5014 X-VCS-Branch: master Date: Tue, 12 Jul 2022 23:23:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb8658fd-65b4-4ede-9b17-2b0a5e043c61 X-Archives-Hash: 71a70f916078a7f8ddde275816266b64 commit: b44d0353dbf3af2cb4cd50e0c186eb5e06ce5014 Author: Sam James gentoo org> AuthorDate: Tue Jul 12 23:22:04 2022 +0000 Commit: Sam James gentoo 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 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 +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.