* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2020-08-15 9:30 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-08-15 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 06a2d717fca6791983bc6af5e1320b47b2570079
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Aug 3 20:37:42 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:29:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a2d717
media-sound/guitarix: Version bump to 0.41.0
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/guitarix/Manifest | 1 +
.../guitarix/files/guitarix-0.41.0-nostrip.patch | 47 ++++++++++++
media-sound/guitarix/guitarix-0.41.0.ebuild | 86 ++++++++++++++++++++++
media-sound/guitarix/metadata.xml | 1 +
4 files changed, 135 insertions(+)
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index b5029b9da9f..e7afd4cf70a 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,2 +1,3 @@
DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
+DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch
new file mode 100644
index 00000000000..03850a8acb0
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.41.0-nostrip.patch
@@ -0,0 +1,47 @@
+From f630c226e4d6f342f78a82f6dd6df4fe3e3f3e01 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Fri, 5 Jun 2020 17:21:10 +0300
+Subject: [PATCH] Do not strip lv2 plugins
+
+---
+ waftools/lv2.py | 4 ++--
+ wscript | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/waftools/lv2.py b/waftools/lv2.py
+index 7397f6b7..256d52b1 100644
+--- 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
+
+diff --git a/wscript b/wscript
+index 3e2114d3..0d49cd16 100644
+--- 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/guitarix-0.41.0.ebuild b/media-sound/guitarix/guitarix-0.41.0.ebuild
new file mode 100644
index 00000000000..95583d16f7a
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.41.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:3.0
+ dev-libs/glib:2
+ >=media-libs/libsndfile-1.0.17
+ >=media-libs/zita-convolver-3:=
+ media-libs/zita-resampler
+ >=net-misc/curl-7.26.0
+ >=sci-libs/fftw-3.1.2: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="${COMMON_DEPEND}
+ standalone? (
+ media-fonts/roboto
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/sassc
+ virtual/pkgconfig
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-nostrip.patch
+)
+
+src_configure() {
+ local myconf=(
+ --cxxflags-debug=""
+ --cxxflags-release="-DNDEBUG"
+ --ldflags="${LDFLAGS}"
+ --enable-lfs
+ --lib-dev
+ --no-desktop-update
+ --no-faust
+ --no-ldconfig
+ --shared-lib
+ $(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[@]}"
+}
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index 73245221dba..a17618d6ef1 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -15,6 +15,7 @@
</maintainer>
<use>
<flag name="lv2">Build lv2 plugins</flag>
+ <flag name="nsm">Build NSM (Non Session Manager) support</flag>
<flag name="standalone">Build standalone application</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2023-03-09 7:06 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2023-03-09 7:06 UTC (permalink / raw
To: gentoo-commits
commit: b93c51bc46ea5ab203444b0b90dce8d6801a1537
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Mar 5 20:00:10 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 9 07:06:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b93c51bc
media-sound/guitarix: EAPI 8 and py3.11
Also switch to github repo. SourceForge repo is outdated.
Closes: https://bugs.gentoo.org/897030
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/29944
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../guitarix/files/guitarix-0.41.0-py3.11.patch | 26 ++++++++++++++++++++++
media-sound/guitarix/guitarix-0.44.1.ebuild | 9 ++++----
media-sound/guitarix/guitarix-9999.ebuild | 8 +++----
media-sound/guitarix/metadata.xml | 3 +++
4 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
new file mode 100644
index 000000000000..34a8bc68c824
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
@@ -0,0 +1,26 @@
+From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+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.
+---
+ trunk/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trunk/wscript b/trunk/wscript
+index 947fd3d1..3f1f5cf3 100644
+--- 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/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 05d31784013b..04e6a893b200 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -1,18 +1,16 @@
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
inherit python-any-r1 waf-utils xdg
-MY_P="${PN}2-${PV}"
-
DESCRIPTION="Virtual guitar amplifier for Linux"
HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -65,6 +63,7 @@ DOCS=( changelog README )
PATCHES=(
"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+ "${FILESDIR}"/${PN}-0.41.0-py3.11.patch
)
src_configure() {
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 80afc539188d..0f1305ac3816 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
@@ -11,11 +11,9 @@ EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
inherit python-any-r1 waf-utils xdg git-r3
-MY_P="${PN}2-${PV}"
-
DESCRIPTION="Virtual guitar amplifier for Linux"
HOMEPAGE="https://guitarix.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+EGIT_REPO_URI="https://github.com/brummer10/${PN}.git"
S="${WORKDIR}/${P}/trunk"
LICENSE="GPL-2"
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index 34ccfab7be05..e08a9c3c4ba8 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -18,4 +18,7 @@
<flag name="nsm">Build NSM (Non Session Manager) support</flag>
<flag name="standalone">Build standalone application</flag>
</use>
+ <upstream>
+ <remote-id type="github">brummer10/guitarix</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2023-06-18 4:25 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-06-18 4:25 UTC (permalink / raw
To: gentoo-commits
commit: ed4ab9a75769fb675f622033acab97637fa6b64d
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Jun 17 15:51:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/31510
Signed-off-by: Sam James <sam <AT> 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 <alexander@tsoy.me>
+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 <zita-resampler/resampler.h>
+ #include <zita-resampler/resampler-table.h>
+- #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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2023-06-20 6:26 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2023-06-20 6:26 UTC (permalink / raw
To: gentoo-commits
commit: a2f2a636d2acf27b210b6f56f227094212397114
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Jun 19 06:48:55 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 06:18:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f2a636
media-sound/guitarix: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/908810
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/31542
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../guitarix/files/guitarix-0.44.1-gcc-13.patch | 31 ++++++++++++++++++++++
media-sound/guitarix/guitarix-0.44.1.ebuild | 1 +
2 files changed, 32 insertions(+)
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
new file mode 100644
index 000000000000..ac7324963c26
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.44.1-gcc-13.patch
@@ -0,0 +1,31 @@
+From b52736180b6966f24398f8a5ad179a58173473ec Mon Sep 17 00:00:00 2001
+From: Thomas W Rodgers <rodgert@twrodgers.com>
+Date: Tue, 31 Jan 2023 12:00:58 -0800
+Subject: [PATCH] Do not depend on <cstdint> via transitive inclusion
+
+Guitarix fails to compile with the upcoming version of GCC (GCC13) due
+to a change that removes the transitive inclusion of <cstdint> from
+other standard headers.
+
+See also -
+ https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/HLHKK7P5RB3BLQ5CV4STJGUYBFPC2VTB/
+---
+ src/LV2/DSP/gx_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LV2/DSP/gx_common.h b/src/LV2/DSP/gx_common.h
+index 71108442..132a6839 100644
+--- 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 <cstdint>
+ #include <cstdlib>
+ #include <cmath>
+ #include <iostream>
+--
+2.39.3
+
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 5529fdc46ede..14885014cd74 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -65,6 +65,7 @@ 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
+ "${FILESDIR}"/${P}-gcc-13.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2024-01-05 10:36 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-01-05 10:36 UTC (permalink / raw
To: gentoo-commits
commit: b1d7684da16b55f8e0f3b9283e757167b399951b
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Jan 3 12:32:26 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 10:32:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d7684d
media-sound/guitarix: restore parallel build
Build system messes with the build jobs count, so that waf build
always respects the number of jobs passed to waf configure. And
since waf-utils eclass passes --jobs=1 to waf configure, we are
always building using only 1 job.
Pass --jobs with the correct number of jobs to waf configure as a
workaround.
Closes: https://bugs.gentoo.org/908690
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/34639
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{guitarix-0.41.0-py3.11.patch => guitarix-0.44.1-py3.11.patch} | 0
media-sound/guitarix/guitarix-0.44.1.ebuild | 7 ++++---
media-sound/guitarix/guitarix-9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch
similarity index 100%
rename from media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
rename to media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 60b76beb379f..7296f64747af 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils xdg
+inherit multiprocessing python-any-r1 waf-utils xdg
DESCRIPTION="Virtual guitar amplifier for Linux"
HOMEPAGE="https://guitarix.org/"
@@ -63,8 +63,8 @@ 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
+ "${FILESDIR}"/${P}-py3.11.patch
+ "${FILESDIR}"/${P}-zita-resampler-1.10.patch
"${FILESDIR}"/${P}-gcc-13.patch
)
@@ -82,6 +82,7 @@ src_configure() {
--no-faust
--no-ldconfig
--shared-lib
+ --jobs=$(makeopts_jobs)
$(use_enable nls)
$(usex bluetooth "" "--no-bluez")
$(usex debug "--debug" "")
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index ed2429d53f6d..490d308775b1 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)'
EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
-inherit python-any-r1 waf-utils xdg git-r3
+inherit multiprocessing python-any-r1 waf-utils xdg git-r3
DESCRIPTION="Virtual guitar amplifier for Linux"
HOMEPAGE="https://guitarix.org/"
@@ -79,6 +79,7 @@ src_configure() {
--no-faust
--no-ldconfig
--shared-lib
+ --jobs=$(makeopts_jobs)
$(use_enable nls)
$(usex bluetooth "" "--no-bluez")
$(usex debug "--debug" "")
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/
@ 2024-04-13 7:41 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-04-13 7:41 UTC (permalink / raw
To: gentoo-commits
commit: e88bdc2dd45faf266508f526f9545a1f189f0125
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 07:41:09 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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 <alexander@tsoy.me>
-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 <brummer-@web.de>
-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 <rodgert@twrodgers.com>
-Date: Tue, 31 Jan 2023 12:00:58 -0800
-Subject: [PATCH] Do not depend on <cstdint> via transitive inclusion
-
-Guitarix fails to compile with the upcoming version of GCC (GCC13) due
-to a change that removes the transitive inclusion of <cstdint> 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 <cstdint>
- #include <cstdlib>
- #include <cmath>
- #include <iostream>
---
-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?= <hub@figuiere.net>
-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 <alexander@tsoy.me>
-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 <zita-resampler/resampler.h>
- #include <zita-resampler/resampler-table.h>
-- #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[@]}"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-04-13 7:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-15 9:30 [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/files/, media-sound/guitarix/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-03-09 7:06 Miroslav Šulc
2023-06-18 4:25 Sam James
2023-06-20 6:26 Miroslav Šulc
2024-01-05 10:36 Miroslav Šulc
2024-04-13 7:41 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox