From d993571e2ee444d08f4e9e90d493ee37338657e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Apr 2024 12:04:20 +0100 Subject: gentoo auto-resync : 13:04:2024 - 12:04:19 --- media-sound/guitarix/Manifest | 7 -- .../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, 231 deletions(-) delete mode 100644 media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch delete mode 100644 media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch delete mode 100644 media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch delete mode 100644 media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch delete mode 100644 media-sound/guitarix/files/guitarix-0.44.1-zita-resampler-1.10.patch delete mode 100644 media-sound/guitarix/guitarix-0.44.1.ebuild (limited to 'media-sound/guitarix') diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index d1c51533b0bc..5a2de553d854 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -1,13 +1,6 @@ -AUX guitarix-0.41.0-nostrip.patch 1355 BLAKE2B 2c21349bc6cb3a93c4e4ac8275917f62c3e874e6a0b2ee726d4531fd2265c1f4d6d8553f9e35f42a277a4f4854c6d9ce38bb1a8070154d3de6bdf6a3e7f73684 SHA512 16ea3c1a14277abf7a5af306d96fb547c7b49f5d552dd67b7997d2fec515884e7e30c1f3150a25ad28bca0726cf8f135c65d7503012ca1d6e841302566ea6c90 -AUX guitarix-0.44.1-fix-flto.patch 590 BLAKE2B 87a630bba5906a08b199bfa42261ae6c861f28ff3ced7de8bbc88ccfcfc0fc0fa2d19cffb73b5c98a21b81d03ee7da077e512dbb26db7e338a9532da5b5e5ca8 SHA512 4a062576a98b8d3a4fdcb54b4724e0c932875e914c05bf74e11d2566627590d7f38af6e9fb0d93c135e626a2fd742cffcc16c9ab4cbc5381a47354f8167cdce8 -AUX guitarix-0.44.1-gcc-13.patch 762 BLAKE2B 33679e1a80ed0f094d71d7525574368a816ec723c5b81974ae600360045a7d748e88a6a08e7f6b15f0b2d7441b6fc431f1ca0cd2bc71fb1abbf51798be949789 SHA512 02c49c0a87f788b781a54c7ff2d0429130dcd93a86fa7fe27f8e55ea444eb31b768b9716de1be28bd59f3f2e4055ec11da5d9d310bdba2ba3b266b013725cff0 -AUX guitarix-0.44.1-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08 -AUX guitarix-0.44.1-zita-resampler-1.10.patch 824 BLAKE2B 89a0c980a9f7fa03e4e3de9e34cc6cd4cd07f91bb1702a57e443dfcebf6262213e7da8147c36dec93536f59201d4cf77a8c7f48ae0ca0b5a9bfa023cd9b66d1f SHA512 f889f9a97bd41b9a03a0b9fda4ddabfb7ba36aa847636a1361273ec59d9ad2829ba652f841d2c7dd387545df630ec6b697d0428e7e7da14d2c4d03f7ad292a70 AUX guitarix-0.45.0-fix-flto.patch 381 BLAKE2B 1a0d782d3ecd653c1beaf63faa7ef2e649b669dada3934f8c304663f0a774c00c4ec0e93479e5a1d9bd7307aa3fd1f015038c8d050c960560d660f113e455c43 SHA512 498371093849c5e3e53f3196d2e2ea7e8d28a187e4c4671f03f59ea33597482c54f56d047a02f221d73ebab0f1161c4115eea057daad8406a93f366bea7a654c AUX guitarix-0.45.0-nostrip.patch 1107 BLAKE2B d50c7e2694920dfb011a21777ab4582910d455d26d3bd9561180d80e823ee841ea470a5bc8b79e6f7e12fab6752326f9d00af0b94d0d8980a6b9d17fc79293fa SHA512 3570027b6e16d74082a2203b06d8283319c48a026150d4d8609a70c245ff91d6c40a85c236c6390a6925e4c863752f70c4e31c977440e75fd8bf3d15a8670d11 -DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1 DIST guitarix2-0.45.0.tar.xz 75575216 BLAKE2B dfe65b3cdab6cf30c808b65d4d9280617d5b9b9d0227bb6b60b68ac52e64fb34903fdfb3084ebf790630b60a54cfd1f0b170b209b8dfb5c0f23f1d8084e3c342 SHA512 be894076f5b016cb8feb243294e8277f893f7e7054c91353f1a82e9b41ef1bc8c97714c4b6cf9765ee6ab1cff91d02f3a0abe525985922dcde788011a88b9cf4 -EBUILD guitarix-0.44.1.ebuild 2048 BLAKE2B 392db5bd19e1837cea890ed160213bbdb87adcfeb93ebb4e735f70c6a31242f87f1982c33fcc647297dbe010359995f370b575dc485f28f9431c8aa5d4f8c5c4 SHA512 ca59987753bfb03b4fb6d1fce355bcb917c6016cd71d4b9f164b8296c1ba005f3ff6c9d5d9465e1a4e932880f87a02dfd223b133104274b0a50eb8dbff0cbbe8 EBUILD guitarix-0.45.0.ebuild 1959 BLAKE2B 1010ac5aed8e8178a559ea184ea1850496ed6a7e90c9e36921f2c602c7a5fc42acb4ad21ded65b6c9cc451abeaba12a79ab10d9c0c61a04db84ed8af6e83c901 SHA512 c953e63774a45e52c6483a0b49087f67f151b92c6b19e88d35cbb84dfcc8762b29a298a443884c091ba043265f6bda99c8948baf23c9494fd96a822ef2b4d39c EBUILD guitarix-9999.ebuild 1950 BLAKE2B 64757e3d79c108eb8527a694ffa3f7ce17053859f6b7a520c75f5bd615ed809ce359c47ff6b36793134f94b0d2fd800e9e05a2a01393200223eda861d47e3772 SHA512 2fa5d8b501f080fb670b9a3d73c016539a39810427c78cc6c283d9fc9e3d9a7f6659e519cdb49eba889d6018d5252c68278ef9dc9ce9f1696fb938b1cfb74cfd MISC metadata.xml 785 BLAKE2B 6336ddc95e9ef9c46a0e16b963abc12b4fd9fd2048712fbc041901f7c4940c18d010df3dd23092717a4635522bec8486ca18e4d1728c4cfd12fffaf0fe591c83 SHA512 4ec6c6198959646bb85147109a1d9c9af6f1ed296486f4d573524733a06434832daa817964c8e3c28db0ec317b6991840ca3232ee64473cd73aca16803a9b573 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[@]}" -} -- cgit v1.2.3