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 1AE44158041 for ; Sat, 13 Apr 2024 07:41:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60744E2A35; Sat, 13 Apr 2024 07:41:28 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45842E2A35 for ; Sat, 13 Apr 2024 07:41:28 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85B6B343303 for ; Sat, 13 Apr 2024 07:41:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED8A616B3 for ; Sat, 13 Apr 2024 07:41:25 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1712994069.e88bdc2dd45faf266508f526f9545a1f189f0125.fordfrog@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/Manifest media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch 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/files/ media-sound/guitarix/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: e88bdc2dd45faf266508f526f9545a1f189f0125 X-VCS-Branch: master Date: Sat, 13 Apr 2024 07:41:25 +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: 9a85532b-ef8a-4686-a879-730c97156d92 X-Archives-Hash: 5e077dcddd9ecf6e313842a03702cbf5 commit: e88bdc2dd45faf266508f526f9545a1f189f0125 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Apr 13 07:41:09 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Apr 13 07:41:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88bdc2d media-sound/guitarix: dropped obsolete 0.44.1 Bug: https://bugs.gentoo.org/929124 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/guitarix/Manifest | 1 - .../guitarix/files/guitarix-0.41.0-nostrip.patch | 38 --------- .../guitarix/files/guitarix-0.44.1-fix-flto.patch | 16 ---- .../guitarix/files/guitarix-0.44.1-gcc-13.patch | 25 ------ .../guitarix/files/guitarix-0.44.1-py3.11.patch | 20 ----- .../guitarix-0.44.1-zita-resampler-1.10.patch | 29 ------- media-sound/guitarix/guitarix-0.44.1.ebuild | 96 ---------------------- 7 files changed, 225 deletions(-) diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index e406bbe9448d..e367b57bdbcb 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -1,2 +1 @@ -DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1 DIST guitarix2-0.45.0.tar.xz 75575216 BLAKE2B dfe65b3cdab6cf30c808b65d4d9280617d5b9b9d0227bb6b60b68ac52e64fb34903fdfb3084ebf790630b60a54cfd1f0b170b209b8dfb5c0f23f1d8084e3c342 SHA512 be894076f5b016cb8feb243294e8277f893f7e7054c91353f1a82e9b41ef1bc8c97714c4b6cf9765ee6ab1cff91d02f3a0abe525985922dcde788011a88b9cf4 diff --git a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch deleted file mode 100644 index 74ac61950671..000000000000 --- a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f630c226e4d6f342f78a82f6dd6df4fe3e3f3e01 Mon Sep 17 00:00:00 2001 -From: Alexander Tsoy -Date: Fri, 5 Jun 2020 17:21:10 +0300 -Subject: [PATCH] Do not strip lv2 plugins - ---- a/waftools/lv2.py -+++ b/waftools/lv2.py -@@ -40,7 +40,7 @@ def lv2_add_common(tg, target, install_path, defines=None, linkflags=None, cxxfl - @Configure.conf - def lv2(bld, *k, **kw): - lv2_base, dst = get_lv2_base(bld, kw) -- tg = bld.shlib(features='strip', *k, **kw) -+ tg = bld.shlib(*k, **kw) - cxxflags = [] - if not bld.env['OPT'] and bld.env['SSE2']: - cxxflags = [ "-msse2", "-mfpmath=sse"] -@@ -57,7 +57,7 @@ def lv2_gui(bld, *k, **kw): - if not bld.env['LV2GUI']: - return None - lv2_base, dst = get_lv2_base(bld, kw) -- tg = bld.shlib(features='strip', *k, **kw) -+ tg = bld.shlib(*k, **kw) - lv2_add_common(tg, lv2_base+'_gui', dst, ["LV2_GUI"], ['-fvisibility=hidden','-Wl,-z,relro,-z,now','-Wl,--exclude-libs,ALL']) - return tg - ---- a/wscript -+++ b/wscript -@@ -375,7 +375,6 @@ def configure(conf): - conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')) - conf.env['BIN_NAME'] = APPNAME - if opt.lv2: -- conf.gxload('strip') - conf.gxload('lv2') - conf.env['LADSPA'] = opt.ladspa - conf.env['NEW_LADSPA'] = opt.new_ladspa --- -2.26.2 - diff --git a/media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch b/media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch deleted file mode 100644 index 695c89c4de7a..000000000000 --- a/media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch +++ /dev/null @@ -1,16 +0,0 @@ -From ecea56a6fa388cfcf29aaff3817ddc0e3518637f Mon Sep 17 00:00:00 2001 -From: brummer10 -Date: Sat, 9 Mar 2024 09:12:36 +0100 -Subject: [PATCH] Fix issue #149 build system: LTO detection fails if - -flto=auto or similar is used - ---- a/waftools/cpu_optimization.py -+++ b/waftools/cpu_optimization.py -@@ -168,6 +168,6 @@ def configure(conf): - conf.env['OPT'] = False - cpu_model = append_optimization_flags(conf, cxxflags) - -- if '-flto' in cxxflags: -+ if any(x.startswith('-flto') for x in cxxflags): - cxxflags.append ("-ffat-lto-objects") - diff --git a/media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch b/media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch deleted file mode 100644 index 6f581521de33..000000000000 --- a/media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b52736180b6966f24398f8a5ad179a58173473ec Mon Sep 17 00:00:00 2001 -From: Thomas W Rodgers -Date: Tue, 31 Jan 2023 12:00:58 -0800 -Subject: [PATCH] Do not depend on via transitive inclusion - -Guitarix fails to compile with the upcoming version of GCC (GCC13) due -to a change that removes the transitive inclusion of from -other standard headers. - -See also - - https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/HLHKK7P5RB3BLQ5CV4STJGUYBFPC2VTB/ ---- a/src/LV2/DSP/gx_common.h -+++ b/src/LV2/DSP/gx_common.h -@@ -22,7 +22,7 @@ - #ifndef SRC_HEADERS_GX_COMMON_H_ - #define SRC_HEADERS_GX_COMMON_H_ - -- -+#include - #include - #include - #include --- -2.39.3 - diff --git a/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch deleted file mode 100644 index f419c2ed7ce7..000000000000 --- a/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= -Date: Wed, 11 Jan 2023 18:55:36 -0500 -Subject: [PATCH] waf: python 3.11 removed the 'U' open mode - -Python3 deprecated it already by making this the default behaviour. ---- a/wscript -+++ b/wscript -@@ -537,7 +537,7 @@ def sub_file(task): - dst_fname = task.outputs[0].abspath() - lst = task.generator.sub_list - -- with open(src_fname, 'rU') as f: -+ with open(src_fname, 'r') as f: - txt = f.read() - for (key, val) in lst: - re_pat = re.compile(key, re.M) --- -2.39.2 - 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 deleted file mode 100644 index fe13dc9f0464..000000000000 --- a/media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 ---- 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 deleted file mode 100644 index fe90a06e00ab..000000000000 --- a/media-sound/guitarix/guitarix-0.44.1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_REQ_USE='threads(+)' - -inherit multiprocessing python-any-r1 waf-utils xdg - -DESCRIPTION="Virtual guitar amplifier for Linux" -HOMEPAGE="https://guitarix.org/" -SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf" -REQUIRED_USE="|| ( lv2 standalone )" - -DEPEND=" - dev-cpp/eigen:3 - dev-cpp/glibmm:2 - dev-cpp/gtkmm:3.0 - dev-libs/glib:2 - media-libs/libsndfile - media-libs/zita-convolver:= - media-libs/zita-resampler - net-misc/curl - sci-libs/fftw:3.0= - x11-libs/gtk+:3 - lv2? ( media-libs/lv2 ) - standalone? ( - dev-libs/boost:= - media-libs/liblrdf - media-libs/lilv - virtual/jack - bluetooth? ( net-wireless/bluez ) - nsm? ( media-libs/liblo ) - zeroconf? ( net-dns/avahi ) - ) -" -# roboto fonts are required for correct ui rendering -RDEPEND=" - ${DEPEND} - standalone? ( - media-fonts/roboto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - standalone? ( - dev-lang/sassc - nls? ( - dev-util/intltool - sys-devel/gettext - ) - ) -" - -DOCS=( changelog README ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.41.0-nostrip.patch - "${FILESDIR}"/${P}-py3.11.patch - "${FILESDIR}"/${P}-zita-resampler-1.10.patch - "${FILESDIR}"/${P}-gcc-13.patch - "${FILESDIR}"/${P}-fix-flto.patch -) - -src_configure() { - export -n {CXX,LD}FLAGS - - local myconf=( - --cxxflags="${CXXFLAGS}" - --cxxflags-debug="" - --cxxflags-release="-DNDEBUG" - --ldflags="${LDFLAGS}" - --enable-lfs - --lib-dev - --no-desktop-update - --no-faust - --no-ldconfig - --shared-lib - --jobs=$(makeopts_jobs) - $(use_enable nls) - $(usex bluetooth "" "--no-bluez") - $(usex debug "--debug" "") - $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui") - $(usex nsm "" "--no-nsm") - $(usex standalone "" "--no-standalone") - $(usex zeroconf "" "--no-avahi") - ) - waf-utils_src_configure "${myconf[@]}" -}