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 3A8C0158009 for ; Sun, 18 Jun 2023 04:25:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 774F4E08F4; Sun, 18 Jun 2023 04:25:09 +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 2C8A8E0909 for ; Sun, 18 Jun 2023 04:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CCBA335D6D for ; Sun, 18 Jun 2023 04:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDD14A91 for ; Sun, 18 Jun 2023 04:25:06 +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: <1687062295.ed4ab9a75769fb675f622033acab97637fa6b64d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch media-sound/guitarix/guitarix-0.44.1.ebuild X-VCS-Directories: media-sound/guitarix/ media-sound/guitarix/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ed4ab9a75769fb675f622033acab97637fa6b64d X-VCS-Branch: master Date: Sun, 18 Jun 2023 04:25:06 +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: e102a218-31ea-4de2-bc8f-8ad9b69d5df4 X-Archives-Hash: 40d2c9ac898563806d3c9b6165c0c5db commit: ed4ab9a75769fb675f622033acab97637fa6b64d Author: Alexander Tsoy tsoy me> AuthorDate: Sat Jun 17 15:51:35 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 18 04:24:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4ab9a7 media-sound/guitarix: fix build w/ >=zita-resampler-1.10 Closes: https://bugs.gentoo.org/900609 Signed-off-by: Alexander Tsoy tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/31510 Signed-off-by: Sam James gentoo.org> .../guitarix-0.44.1-zita-resampler-1.10.patch | 35 ++++++++++++++++++++++ media-sound/guitarix/guitarix-0.44.1.ebuild | 1 + 2 files changed, 36 insertions(+) diff --git a/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch b/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch new file mode 100644 index 000000000000..1eed9bafda27 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch @@ -0,0 +1,35 @@ +From 4c15aea1425ef19a5d68387e60abfab830fed20b Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy +Date: Thu, 15 Jun 2023 22:05:29 +0300 +Subject: [PATCH] Fix major version detection of zita-resampler >=1.10 + +https://github.com/brummer10/guitarix/pull/129 + +Fixes #122 +--- + waftools/zita-resampler.py | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/waftools/zita-resampler.py b/waftools/zita-resampler.py +index 1cd49a2a..ba5bbc7c 100644 +--- a/waftools/zita-resampler.py ++++ b/waftools/zita-resampler.py +@@ -18,10 +18,11 @@ def configure(conf): + code=""" + #include + #include +- #if ZITA_RESAMPLER_MAJOR_VERSION != %d +- #error +- #endif +- int main(){ return 0; } ++ int main() { ++ int maj = zita_resampler_major_version(); ++ if (maj == %d) { return 0; }; ++ return 1; ++ } + """ % expected_zita_resampler_version + conf.check_cxx( + fragment=code, +-- +2.39.3 + diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild index 04e6a893b200..5529fdc46ede 100644 --- a/media-sound/guitarix/guitarix-0.44.1.ebuild +++ b/media-sound/guitarix/guitarix-0.44.1.ebuild @@ -64,6 +64,7 @@ DOCS=( changelog README ) PATCHES=( "${FILESDIR}"/${PN}-0.41.0-nostrip.patch "${FILESDIR}"/${PN}-0.41.0-py3.11.patch + "${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch ) src_configure() {