* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2020-06-25 8:08 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-06-25 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 87f9cc330ef992ed179dbed9bc9de84b73359497
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jun 5 14:40:59 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 08:07:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f9cc33
media-sound/guitarix: Version bump to 0.40.0
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/guitarix/Manifest | 1 +
.../files/guitarix-0.40.0-noexecstack.patch | 26 +++++++
.../guitarix/files/guitarix-0.40.0-nostrip.patch | 24 +++++++
media-sound/guitarix/guitarix-0.40.0.ebuild | 84 ++++++++++++++++++++++
4 files changed, 135 insertions(+)
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 734522f2aef..b5029b9da9f 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1 +1,2 @@
DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
+DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
new file mode 100644
index 00000000000..f64a21f26b5
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
@@ -0,0 +1,26 @@
+From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
+From: brummer10 <brummer-@web.de>
+Date: Fri, 5 Jun 2020 06:41:30 +0200
+Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
+ by Alexander Tsoy
+
+---
+ trunk/src/LV2/xputty/resources/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
+index a2f0402c..3c383393 100644
+--- a/src/LV2/xputty/resources/wscript
++++ b/src/LV2/xputty/resources/wscript
+@@ -41,7 +41,7 @@ def img2obj(task):
+ src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
+ cmd = ("cd src/LV2/xputty/resources/ \
+ && for f in %s; do\
+- %s -r -b binary ${f}.png -o ${f}.o; \
++ %s -r -b binary -z noexecstack ${f}.png -o ${f}.o; \
+ done " % (src, env.LD[0]) )
+ # Logs.debug("runner: system command -> %s" % cmd)
+ ret = task.exec_command(cmd, shell=True)
+--
+2.26.2
+
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
new file mode 100644
index 00000000000..2bc77f443b1
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
@@ -0,0 +1,24 @@
+From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 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
+
+---
+ trunk/wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 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.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
new file mode 100644
index 00000000000..8b4b9f2d5da
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.40.0.ebuild
@@ -0,0 +1,84 @@
+# 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="http://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="bluetooth debug lv2 nls +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 )
+ 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}-noexecstack.patch
+ "${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 standalone "" "--no-standalone")
+ $(usex zeroconf "" "--no-avahi")
+ )
+ waf-utils_src_configure "${myconf[@]}"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2020-11-13 9:00 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2020-11-13 9:00 UTC (permalink / raw
To: gentoo-commits
commit: cd154d93e1a5509b4694ca35fff170740c20554b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 09:00:07 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 09:00:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd154d93
media-sound/guitarix: removed obsolete 0.39.0 & 0.40.0
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/guitarix/Manifest | 2 -
.../files/guitarix-0.40.0-noexecstack.patch | 26 -------
.../guitarix/files/guitarix-0.40.0-nostrip.patch | 24 ------
media-sound/guitarix/guitarix-0.39.0.ebuild | 77 --------------------
media-sound/guitarix/guitarix-0.40.0.ebuild | 85 ----------------------
5 files changed, 214 deletions(-)
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index e7afd4cf70a..5b7603f1c81 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,3 +1 @@
-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.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
deleted file mode 100644
index f64a21f26b5..00000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
-From: brummer10 <brummer-@web.de>
-Date: Fri, 5 Jun 2020 06:41:30 +0200
-Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
- by Alexander Tsoy
-
----
- trunk/src/LV2/xputty/resources/wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
-index a2f0402c..3c383393 100644
---- a/src/LV2/xputty/resources/wscript
-+++ b/src/LV2/xputty/resources/wscript
-@@ -41,7 +41,7 @@ def img2obj(task):
- src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
- cmd = ("cd src/LV2/xputty/resources/ \
- && for f in %s; do\
-- %s -r -b binary ${f}.png -o ${f}.o; \
-+ %s -r -b binary -z noexecstack ${f}.png -o ${f}.o; \
- done " % (src, env.LD[0]) )
- # Logs.debug("runner: system command -> %s" % cmd)
- ret = task.exec_command(cmd, shell=True)
---
-2.26.2
-
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
deleted file mode 100644
index 2bc77f443b1..00000000000
--- a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 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
-
----
- trunk/wscript | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 2699325f..f2d8f86d 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.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
deleted file mode 100644
index 68859634043..00000000000
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 +standalone zeroconf"
-REQUIRED_USE="|| ( lv2 standalone )"
-
-COMMON_DEPEND="dev-cpp/eigen:3
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- 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+:2
- lv2? ( media-libs/lv2 )
- standalone? (
- dev-libs/boost:=
- media-libs/liblrdf
- media-libs/lilv
- virtual/jack
- bluetooth? ( net-wireless/bluez )
- zeroconf? ( net-dns/avahi )
- )
-"
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
- x11-themes/gtk-engines
- standalone? (
- media-fonts/roboto
- )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-
-DOCS=( changelog README )
-
-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 standalone "" "--no-standalone")
- $(usex zeroconf "" "--no-avahi")
- )
- waf-utils_src_configure "${myconf[@]}"
-}
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
deleted file mode 100644
index 7a7c6a6d452..00000000000
--- a/media-sound/guitarix/guitarix-0.40.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 +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 )
- 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}-noexecstack.patch
- "${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 standalone "" "--no-standalone")
- $(usex zeroconf "" "--no-avahi")
- )
- waf-utils_src_configure "${myconf[@]}"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2021-04-27 14:04 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2021-04-27 14:04 UTC (permalink / raw
To: gentoo-commits
commit: aac513b177a376c8eb245e408a65d80919c554fa
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 14:02:54 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 14:03:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac513b1
media-sound/guitarix: Fix build with glib-2.68
Closes: https://bugs.gentoo.org/784395
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/guitarix-0.42.1-fix-build-with-glib-2.68.patch | 13 +++++++++++++
media-sound/guitarix/guitarix-0.42.1.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch b/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
new file mode 100644
index 00000000000..345f5e9a0aa
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.42.1-fix-build-with-glib-2.68.patch
@@ -0,0 +1,13 @@
+diff --git a/src/headers/gx_system.h b/src/headers/gx_system.h
+index d334ecfc..88d97567 100644
+--- a/src/headers/gx_system.h
++++ b/src/headers/gx_system.h
+@@ -132,7 +132,7 @@ inline T *atomic_get(T*& p) {
+
+ template <class T>
+ inline bool atomic_compare_and_exchange(T **p, T *oldv, T *newv) {
+- return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void* volatile*>(p), static_cast<void*>(oldv), newv);
++ return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void**>(p), static_cast<void*>(oldv), newv);
+ }
+
+
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
index 3a9ca22629b..19a6df94df7 100644
--- a/media-sound/guitarix/guitarix-0.42.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -65,6 +65,7 @@ DOCS=( changelog README )
PATCHES=(
"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+ "${FILESDIR}"/${P}-fix-build-with-glib-2.68.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2024-03-11 9:33 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-03-11 9:33 UTC (permalink / raw
To: gentoo-commits
commit: e14adfc9b7e7e269bc1fa962a4c628935424fd87
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 09:32:51 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:32:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e14adfc9
media-sound/guitarix: fixed build with lto
Closes: https://bugs.gentoo.org/926429
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../guitarix/files/guitarix-0.44.1-fix-flto.patch | 16 ++++++++++++++++
media-sound/guitarix/guitarix-0.44.1.ebuild | 1 +
2 files changed, 17 insertions(+)
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
new file mode 100644
index 000000000000..695c89c4de7a
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.44.1-fix-flto.patch
@@ -0,0 +1,16 @@
+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/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 7296f64747af..87ecb97ee87f 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}"/${P}-py3.11.patch
"${FILESDIR}"/${P}-zita-resampler-1.10.patch
"${FILESDIR}"/${P}-gcc-13.patch
+ "${FILESDIR}"/${P}-fix-flto.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2024-03-11 9:55 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-03-11 9:55 UTC (permalink / raw
To: gentoo-commits
commit: 82d7fff2376298a0eb07fbd238cab4be31f05923
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 09:55:26 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 09:55:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d7fff2
media-sound/guitarix: bump to 0.45.0
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/guitarix/Manifest | 1 +
.../guitarix/files/guitarix-0.45.0-fix-flto.patch | 11 +++
.../guitarix/files/guitarix-0.45.0-nostrip.patch | 30 +++++++
media-sound/guitarix/guitarix-0.45.0.ebuild | 94 ++++++++++++++++++++++
4 files changed, 136 insertions(+)
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 4849f9e8b355..e406bbe9448d 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1 +1,2 @@
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.45.0-fix-flto.patch b/media-sound/guitarix/files/guitarix-0.45.0-fix-flto.patch
new file mode 100644
index 000000000000..8f832da0c102
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.45.0-fix-flto.patch
@@ -0,0 +1,11 @@
+--- a/waftools/cpu_optimization.py
++++ b/waftools/cpu_optimization.py
+@@ -168,7 +168,7 @@ 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):
+ conf.env['LTO'] = True
+ cxxflags.append ("-ffat-lto-objects")
+
diff --git a/media-sound/guitarix/files/guitarix-0.45.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.45.0-nostrip.patch
new file mode 100644
index 000000000000..e26256ae7aa0
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.45.0-nostrip.patch
@@ -0,0 +1,30 @@
+--- 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"], bld.env['OS_LV2_CXXFLAGS'])
+ return tg
+
+--- a/wscript
++++ b/wscript
+@@ -418,7 +418,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
diff --git a/media-sound/guitarix/guitarix-0.45.0.ebuild b/media-sound/guitarix/guitarix-0.45.0.ebuild
new file mode 100644
index 000000000000..c4af772b55e0
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.45.0.ebuild
@@ -0,0 +1,94 @@
+# 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"
+S="${WORKDIR}"
+
+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.45.0-nostrip.patch
+ "${FILESDIR}"/${PN}-0.45.0-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
* [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/
@ 2024-04-18 7:49 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2024-04-18 7:49 UTC (permalink / raw
To: gentoo-commits
commit: e29a900dbc7617552d88dd76008c0f3539c00910
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Apr 17 21:31:15 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 07:46:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29a900d
media-sound/guitarix: Version bump to 0.46.0
Closes: https://bugs.gentoo.org/926899
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/36299
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/guitarix/Manifest | 1 +
.../guitarix/files/guitarix-0.46.0-nostrip.patch | 30 +++++++
media-sound/guitarix/guitarix-0.46.0.ebuild | 92 ++++++++++++++++++++++
3 files changed, 123 insertions(+)
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index e367b57bdbcb..6389e2a32b17 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1 +1,2 @@
DIST guitarix2-0.45.0.tar.xz 75575216 BLAKE2B dfe65b3cdab6cf30c808b65d4d9280617d5b9b9d0227bb6b60b68ac52e64fb34903fdfb3084ebf790630b60a54cfd1f0b170b209b8dfb5c0f23f1d8084e3c342 SHA512 be894076f5b016cb8feb243294e8277f893f7e7054c91353f1a82e9b41ef1bc8c97714c4b6cf9765ee6ab1cff91d02f3a0abe525985922dcde788011a88b9cf4
+DIST guitarix2-0.46.0.tar.xz 77670776 BLAKE2B b650d53f4e73539419bbe194e07ee770494f80b547d407f5a269c035b91fbf3e0fe078a9e82da21f773d69395523f70fc179be7942f08e2b8689b220414c9925 SHA512 cdb8eccdd230bade493cf0b7fd2a6e748fcaf3c3fd6b5ed5fbd6134d08be9518c93400625d63e386b436fcef3e1738cae543256b09941445436d7f2bf41649a0
diff --git a/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
new file mode 100644
index 000000000000..7bb46c88eb16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.46.0-nostrip.patch
@@ -0,0 +1,30 @@
+--- 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"], bld.env['OS_LV2_CXXFLAGS'])
+ return tg
+
+--- a/wscript
++++ b/wscript
+@@ -404,7 +404,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.gxload('cpu_optimization')
diff --git a/media-sound/guitarix/guitarix-0.46.0.ebuild b/media-sound/guitarix/guitarix-0.46.0.ebuild
new file mode 100644
index 000000000000..bd63bf337a24
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.46.0.ebuild
@@ -0,0 +1,92 @@
+# 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.46.0-nostrip.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-18 7:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-11 9:33 [gentoo-commits] repo/gentoo:master commit in: media-sound/guitarix/, media-sound/guitarix/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-04-18 7:49 Miroslav Šulc
2024-03-11 9:55 Miroslav Šulc
2021-04-27 14:04 Matt Turner
2020-11-13 9:00 Miroslav Šulc
2020-06-25 8:08 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox