Compare commits

...

2 Commits

@ -0,0 +1,8 @@
AUX guitarix-0.41.0-nostrip.patch 1355 BLAKE2B 2c21349bc6cb3a93c4e4ac8275917f62c3e874e6a0b2ee726d4531fd2265c1f4d6d8553f9e35f42a277a4f4854c6d9ce38bb1a8070154d3de6bdf6a3e7f73684 SHA512 16ea3c1a14277abf7a5af306d96fb547c7b49f5d552dd67b7997d2fec515884e7e30c1f3150a25ad28bca0726cf8f135c65d7503012ca1d6e841302566ea6c90
AUX guitarix-0.41.0-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08
AUX guitarix-0.44.1-gcc-13.patch 762 BLAKE2B 33679e1a80ed0f094d71d7525574368a816ec723c5b81974ae600360045a7d748e88a6a08e7f6b15f0b2d7441b6fc431f1ca0cd2bc71fb1abbf51798be949789 SHA512 02c49c0a87f788b781a54c7ff2d0429130dcd93a86fa7fe27f8e55ea444eb31b768b9716de1be28bd59f3f2e4055ec11da5d9d310bdba2ba3b266b013725cff0
AUX guitarix-0.44.1-zita-resampler-1.10.patch 824 BLAKE2B 89a0c980a9f7fa03e4e3de9e34cc6cd4cd07f91bb1702a57e443dfcebf6262213e7da8147c36dec93536f59201d4cf77a8c7f48ae0ca0b5a9bfa023cd9b66d1f SHA512 f889f9a97bd41b9a03a0b9fda4ddabfb7ba36aa847636a1361273ec59d9ad2829ba652f841d2c7dd387545df630ec6b697d0428e7e7da14d2c4d03f7ad292a70
DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
EBUILD guitarix-0.44.1.ebuild 1934 BLAKE2B 67661cb9c0d96465cb41a4be60a19b10060caa9aa4d1d19f652f28b822465b31c254702afad0729ad32e22d2eaa5ca996afb9b9703c46e756fc76bbf6f320c7d SHA512 4d89a2320f84fb81950a0dc7c7f90a1ce047f484c6ac7e5c87cf80d6cc14a6a9a7045edf6adb98d3cee17d234922a0aa3b85e3fd450e612ef461b43b54a74a48
EBUILD guitarix-9999.ebuild 1867 BLAKE2B 638655f7f0187d725978f139d0bff282dc698ba49f275e34cde06b4951cf00d25d289a800ad06131e50646a10a53a9ff6a088fd6d53f6f3469ae36ab9d8604cd SHA512 6eaf0cc3020f54cfc4a7473fcb1006f46f67c5366bbab9c1e1014aed5825189853d99da6327a8d017498a2a592f24778c344ef72ed9e795cfa5cc499b620ec2b
MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826

@ -0,0 +1,38 @@
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

@ -0,0 +1,20 @@
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

@ -0,0 +1,25 @@
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

@ -0,0 +1,29 @@
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

@ -0,0 +1,91 @@
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE='threads(+)'
inherit python-any-r1 waf-utils xdg
DESCRIPTION="Виртуальный гитарный усилитель для 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}"/${PN}-0.41.0-py3.11.patch
"${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch
"${FILESDIR}"/${P}-gcc-13.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[@]}"
}

@ -0,0 +1,89 @@
# Copyright 2019-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
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
DESCRIPTION="Виртуальный гитарный усилитель для Linux"
HOMEPAGE="https://guitarix.org/"
EGIT_REPO_URI="https://github.com/brummer10/${PN}.git"
S="${WORKDIR}/${P}/trunk"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
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 )
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[@]}"
}

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>fordfrog@gentoo.org</email>
<name>Miroslav Šulc</name>
</maintainer>
<maintainer type="person" proxied="yes">
<email>alexander@tsoy.me</email>
<name>Alexander Tsoy</name>
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</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>
<upstream>
<remote-id type="github">brummer10/guitarix</remote-id>
</upstream>
</pkgmetadata>
Loading…
Cancel
Save