Compare commits
33 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
dd2c3e545f | ||
|
e6ba31d4a8 | ||
|
d0d818509a | ||
|
59f8b4aee2 | ||
|
223fc9b487 | ||
|
46d3a5fab2 | ||
|
9ad698ebd6 | ||
|
114f16e1c9 | ||
|
a6fca941c7 | ||
|
1c866a75e7 | ||
|
3e904a6159 | ||
|
f315829fa9 | ||
|
c48671eec6 | ||
|
d639031bec | ||
|
dc3ca3fae8 | ||
|
a0ab34658c | ||
|
4bc98da068 | ||
|
7c1d808f78 | ||
|
2b9e2aa7e0 | ||
|
2a3cfb4855 | ||
|
cea3baa4e4 | ||
|
4559ff7b0e | ||
|
bd98c89760 | ||
|
8aff90227e | ||
|
790edf220e | ||
|
6efb8a70b6 | ||
|
769d92c670 | ||
|
dd22b974b3 | ||
|
df26f7fc8b | ||
|
24c79d8bc9 | ||
|
47d721749c | ||
|
c6950dc3d6 | ||
|
5443af52ff |
6
.gitignore
vendored
6
.gitignore
vendored
@ -28,3 +28,9 @@ guitarix-0.11.0.tar.bz2
|
||||
/guitarix2-0.35.2.tar.xz
|
||||
/guitarix2-0.36.1.tar.xz
|
||||
/guitarix2-0.37.3.tar.xz
|
||||
/guitarix2-0.38.1.tar.xz
|
||||
/guitarix2-0.39.0.tar.xz
|
||||
/guitarix2-0.40.0.tar.xz
|
||||
/guitarix2-0.42.1.tar.xz
|
||||
/guitarix2-0.43.1.tar.xz
|
||||
/guitarix2-0.44.1.tar.xz
|
||||
|
13
guitarix-cstdint-include.patch
Normal file
13
guitarix-cstdint-include.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/LV2/DSP/gx_common.h b/trunk/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>
|
20
guitarix-mismatched-delete.patch
Normal file
20
guitarix-mismatched-delete.patch
Normal file
@ -0,0 +1,20 @@
|
||||
diff --git a/src/gx_head/engine/gx_resampler.cpp b/trunk/src/gx_head/engine/gx_resampler.cpp
|
||||
index 38eaaec7..adbba7cc 100644
|
||||
--- a/src/gx_head/engine/gx_resampler.cpp
|
||||
+++ b/src/gx_head/engine/gx_resampler.cpp
|
||||
@@ -121,13 +121,13 @@ float *BufferResampler::process(int fs_inp, int ilen, float *input, int fs_outp,
|
||||
inp_data = input;
|
||||
float *p = out_data = new float[out_count];
|
||||
if (Resampler::process() != 0) {
|
||||
- delete p;
|
||||
+ delete[] p;
|
||||
return 0;
|
||||
}
|
||||
inp_data = 0;
|
||||
inp_count = k/2;
|
||||
if (Resampler::process() != 0) {
|
||||
- delete p;
|
||||
+ delete[] p;
|
||||
return 0;
|
||||
}
|
||||
assert(inp_count == 0);
|
13
guitarix-python-3.11-ftbfs.patch
Normal file
13
guitarix-python-3.11-ftbfs.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/wscript b/trunk/wscript
|
||||
index b915199a..f3e4d129 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -534,7 +534,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)
|
194
guitarix.spec
194
guitarix.spec
@ -4,23 +4,28 @@
|
||||
%global altname2 guitarix2
|
||||
|
||||
Name: guitarix
|
||||
Version: 0.37.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Mono amplifier to JACK
|
||||
Group: Applications/Multimedia
|
||||
Version: 0.44.1
|
||||
Release: 7%{?dist}
|
||||
Summary: A virtual guitar amplifier
|
||||
License: GPLv2+
|
||||
URL: http://guitarix.sourceforge.net/
|
||||
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.xz
|
||||
# Patch merged upstream
|
||||
Patch0: %{name}-mismatched-delete.patch
|
||||
# Patch merged upstream
|
||||
Patch1: %{name}-python-3.11-ftbfs.patch
|
||||
# Patch sent upstream by Thomas Rodgers https://github.com/brummer10/guitarix/pull/120
|
||||
Patch2: %{name}-cstdint-include.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python2
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: %{_bindir}/find
|
||||
BuildRequires: %{_bindir}/pathfix.py
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: faust
|
||||
BuildRequires: fftw-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: gtkmm24-devel
|
||||
BuildRequires: fftw-devel >= 3.3.8
|
||||
BuildRequires: gtk3-devel >= 3.22
|
||||
BuildRequires: gtkmm30-devel >= 3.22
|
||||
BuildRequires: jack-audio-connection-kit-devel
|
||||
BuildRequires: ladspa-devel
|
||||
BuildRequires: libsigc++20-devel
|
||||
@ -36,36 +41,26 @@ BuildRequires: lilv-devel
|
||||
BuildRequires: gperf
|
||||
BuildRequires: avahi-gobject-devel
|
||||
BuildRequires: eigen3-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libcurl-devel >= 7.26.0
|
||||
BuildRequires: google-roboto-condensed-fonts
|
||||
BuildRequires: %{_bindir}/sassc
|
||||
BuildRequires: glade-devel
|
||||
BuildRequires: libappstream-glib
|
||||
|
||||
Requires: clearlooks-compact-gnome-theme
|
||||
Requires: jack_capture
|
||||
Requires: jconv
|
||||
Requires: ladspa-%{name}-plugins = %{version}-%{release}
|
||||
Requires: qjackctl
|
||||
Requires: vorbis-tools
|
||||
Requires: google-roboto-condensed-fonts
|
||||
|
||||
%description
|
||||
Guitarix is a simple mono amplifier to be used in a 'JACKified' environment,
|
||||
i.e. a system using the JACK Audio Connection Kit, a professionally-capable
|
||||
audio/MIDI server and master transport control.
|
||||
|
||||
Guitarix provides one JACK input port and two JACK output ports. It is designed
|
||||
to produce nice trash/metal/rock/blues guitar sounds. Controls for bass, treble,
|
||||
gain, compressor, preamp, balance, distortion, freeverb, crybaby (wah) and echo
|
||||
are available. A fixed resonator is used when distortion is disabled. To modify
|
||||
the sound 'pressure', you can use the feedback and feedforward sliders.
|
||||
|
||||
Guitarix includes an experimental tuner and a JACK MIDI output port with 3
|
||||
channels. They are fed by a mix from a pitch tracker and a beat detector. You
|
||||
can pitch the octave (2 octaves up or down), choose the MIDI channel, the MIDI
|
||||
program, the velocity and the sensitivity, which translates into how fast the
|
||||
note will read after the beat detector emits a signal. Values for the beat
|
||||
detector can be set for all channels.
|
||||
Guitarix takes the signal from your guitar as any real amp would do:
|
||||
as a mono-signal from your sound card.
|
||||
The input is processed by a main amp and a rack-section.
|
||||
Both can be routed separately and deliver a processed stereo-signal via Jack.
|
||||
You may fill the rack with effects from more than 25 built-in modules,
|
||||
including stuff from a simple noise gate to brain-slashing modulation f/x
|
||||
like flanger, phaser or auto-wah.
|
||||
|
||||
%package -n libgxw
|
||||
Summary: Guitarix GTK library
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
|
||||
%description -n libgxw
|
||||
@ -73,7 +68,6 @@ This package contains the Guitarix GTK widget library
|
||||
|
||||
%package -n libgxwmm
|
||||
Summary: Guitarix GTK C++ library
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
|
||||
%description -n libgxwmm
|
||||
@ -81,7 +75,6 @@ This package contains the Guitarix GTK C++ widget library
|
||||
|
||||
%package -n libgxw-devel
|
||||
Summary: Development files for libgxw
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
Requires: libgxw%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -91,7 +84,6 @@ widget library
|
||||
|
||||
%package -n libgxwmm-devel
|
||||
Summary: Development files for libgxwmm
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
Requires: libgxwmm%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -101,7 +93,6 @@ library
|
||||
|
||||
%package -n gxw-glade
|
||||
Summary: Guitarix GTK library glade support
|
||||
Group: Development/Libraries
|
||||
License: GPLv2+
|
||||
Requires: glade
|
||||
Requires: libgxw-devel%{?_isa} = %{version}-%{release}
|
||||
@ -112,7 +103,6 @@ with glade
|
||||
|
||||
%package -n ladspa-%{name}-plugins
|
||||
Summary: Collection of Ladspa plug-ins
|
||||
Group: Applications/Multimedia
|
||||
# ladspa/distortion.cpp and ladspa/guitarix-ladspa.cpp are BSD
|
||||
# The rest of ladspa/* is GPLv+
|
||||
License: GPL+ and BSD
|
||||
@ -125,7 +115,6 @@ also be used by any other ladspa host.
|
||||
|
||||
%package -n lv2-%{name}-plugins
|
||||
Summary: Collection of LV2 guitarix plug-ins
|
||||
Group: Applications/Multimedia
|
||||
# ladspa/distortion.cpp and ladspa/guitarix-ladspa.cpp are BSD
|
||||
# The rest of ladspa/* is GPLv+
|
||||
License: GPLv2+
|
||||
@ -137,10 +126,10 @@ This package contains the guitarix amp plug-ins that come together with
|
||||
guitarix, but can also be used by any other ladspa host.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
# Fix unversioned python shebangs
|
||||
pathfix.py -pni %{_bindir}/python2 \
|
||||
%py3_shebang_fix \
|
||||
$(find -name wscript) \
|
||||
waf \
|
||||
tools/make_jsonrpc_methods \
|
||||
@ -153,17 +142,16 @@ rm -fr src/zita-convolver src/zita-resampler
|
||||
sed -i -e 's|-O3||' wscript
|
||||
|
||||
%build
|
||||
./waf -vv configure --prefix=%{_prefix} --libdir=%{_libdir} \
|
||||
--cxxflags="-std=c++0x -fomit-frame-pointer -ftree-loop-linear \
|
||||
-ffinite-math-only -fno-math-errno -fno-signed-zeros -fstrength-reduce \
|
||||
%ifarch %ix86 x86_64
|
||||
-msse \
|
||||
%set_build_flags
|
||||
CXXFLAGS+=" -fomit-frame-pointer -ftree-loop-linear -ffinite-math-only -fno-math-errno -fno-signed-zeros -fstrength-reduce"
|
||||
%ifarch %{ix86}
|
||||
CXXFLAGS+=" -mfxsr"
|
||||
%endif
|
||||
%{optflags}" \
|
||||
--shared-lib --lib-dev \
|
||||
|
||||
./waf -vv configure --prefix=%{_prefix} --libdir=%{_libdir} \
|
||||
--shared-lib --lib-dev --no-ldconfig --glade-support \
|
||||
--ladspa --ladspadir=%{_libdir}/ladspa --lv2dir=%{_libdir}/lv2 \
|
||||
--glade-support --glade-catalog-dir=%{_datadir}/glade/catalogs \
|
||||
--glade-modules-dir=%{_libdir}/glade/modules
|
||||
--cxxflags-release="-DNDEBUG"
|
||||
./waf -vv build %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -176,14 +164,14 @@ desktop-file-install \
|
||||
|
||||
chmod 755 %{buildroot}%{_libdir}/libgxw*.so.0.1
|
||||
rm -rf %{buildroot}%{_libdir}/libgxw*.so
|
||||
ln -s %{_libdir}/libgxwmm.so.0.1 %{buildroot}%{_libdir}/libgxwmm.so
|
||||
ln -s %{_libdir}/libgxw.so.0.1 %{buildroot}%{_libdir}/libgxw.so
|
||||
ln -s libgxwmm.so.0.1 %{buildroot}%{_libdir}/libgxwmm.so
|
||||
ln -s libgxw.so.0.1 %{buildroot}%{_libdir}/libgxw.so
|
||||
chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
|
||||
|
||||
%find_lang %{name}
|
||||
# validate appdata
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.%{name}.%{name}.metainfo.xml
|
||||
|
||||
%ldconfig_scriptlets -n libgxw
|
||||
%ldconfig_scriptlets -n libgxwmm
|
||||
%find_lang %{name}
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
@ -193,12 +181,13 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
|
||||
%{_datadir}/%{altname}/
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_metainfodir}/org.%{name}.%{name}.metainfo.xml
|
||||
|
||||
%files -n libgxw
|
||||
%{_libdir}/libgxw.so.*
|
||||
%{_libdir}/libgxw.so.0*
|
||||
|
||||
%files -n libgxwmm
|
||||
%{_libdir}/libgxwmm.so.*
|
||||
%{_libdir}/libgxwmm.so.0*
|
||||
|
||||
%files -n libgxw-devel
|
||||
%{_libdir}/libgxw.so
|
||||
@ -225,6 +214,99 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
|
||||
%{_libdir}/lv2/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.44.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 0.44.1-6
|
||||
- Rebuilt for Boost 1.81
|
||||
|
||||
* Tue Jan 31 2023 Guido Aulisi <guido.aulisi@gmail.com> - 0.44.1-5
|
||||
- Use shebang fix macro
|
||||
|
||||
* Tue Jan 31 2023 Guido Aulisi <guido.aulisi@gmail.com> - 0.44.1-4
|
||||
- Fix FTBFS with python 3.11 and gcc 13
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.44.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.44.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri May 13 2022 Guido Aulisi <guido.aulisi@gmail.com> - 0.44.1-1
|
||||
- Update to 0.44.1
|
||||
|
||||
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 0.43.1-4
|
||||
- Rebuilt for Boost 1.78
|
||||
|
||||
* Sat Feb 12 2022 Jeff Law <jeffreyalaw@gmail.com> - 0.43.1-3
|
||||
- Re-enable LTO
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.43.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Dec 25 2021 Guido Aulisi <guido.aulisi@gmail.com> - 0.43.1-1
|
||||
- Update to 0.43.1
|
||||
|
||||
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 0.42.1-6
|
||||
- Rebuilt for Boost 1.76
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.42.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue May 04 2021 Guido Aulisi <guido.aulisi@gmail.com> - 0.42.1-4
|
||||
- Fix FTBFS with GCC 11
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.42.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 0.42.1-2
|
||||
- Rebuilt for Boost 1.75
|
||||
|
||||
* Sun Dec 27 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.42.1-1
|
||||
- Update to 0.42.1
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jeff Law <law@redhat.com> - 0.40.0-4
|
||||
- Disable LTO
|
||||
|
||||
* Fri Jun 12 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.40.0-3
|
||||
- Fix FTBFS on i686 (2nd attempt)
|
||||
|
||||
* Fri Jun 12 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.40.0-2
|
||||
- Fix FTBFS on i686
|
||||
|
||||
* Thu Jun 11 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.40.0-1
|
||||
- Update to 0.40.0
|
||||
- Add appdata
|
||||
- Some spec cleanup
|
||||
|
||||
* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 0.39.0-2
|
||||
- Rebuilt for Boost 1.73
|
||||
|
||||
* Sat Feb 29 2020 Guido Aulisi <guido.aulisi@gmail.com> - 0.39.0-1
|
||||
- Update to 0.39.0
|
||||
- Use python3
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.38.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.38.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jun 24 2019 Guido Aulisi <guido.aulisi@gmail.com> - 0.38.1-1
|
||||
- Update to 0.38.1
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.37.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 0.37.3-2
|
||||
- Patched for Boost 1.69.0 header changes
|
||||
|
||||
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 0.37.3-2
|
||||
- Rebuilt for Boost 1.69
|
||||
|
||||
* Sat Sep 08 2018 Nils Philippsen <nils@tiptoe.de> - 0.37.3-1
|
||||
- update to 0.37.3
|
||||
- add BR: libcurl-devel
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (guitarix2-0.37.3.tar.xz) = 9cdd60dc5ba1a5ae018968a132b06ef8f7470fdfa0749c9a439f7c8adb1dfd3907f9d35be0b32d839645145075f2a0eb168db732ebaef7690e12e337ba9793a5
|
||||
SHA512 (guitarix2-0.44.1.tar.xz) = d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
|
||||
|
Loading…
Reference in New Issue
Block a user