Update to 0.40.0

Add appdata
Some spec cleanup

.gitignore

@@ -30,3 +30,4 @@ guitarix-0.11.0.tar.bz2
 /guitarix2-0.37.3.tar.xz
 /guitarix2-0.38.1.tar.xz
 /guitarix2-0.39.0.tar.xz
+/guitarix2-0.40.0.tar.xz

guitarix-format-string.patch

@@ -0,0 +1,12 @@
+diff --git a/trunk/src/LV2/xputty/xfilepicker.cpp b/trunk/src/LV2/xputty/xfilepicker.cpp
+index 5c4b4db7..605dde02 100644
+--- a/src/LV2/xputty/xfilepicker.cpp
++++ b/src/LV2/xputty/xfilepicker.cpp
+@@ -191,6 +191,6 @@ void fp_init(FilePicker *filepicker, const char *path) {
+     filepicker->selected_file = NULL;
+     filepicker->path = NULL;
+     filepicker->filter = NULL;
+-    asprintf(&filepicker->path, path);
++    asprintf(&filepicker->path, "%s", path);
+     assert(filepicker->path != NULL);
+ }

guitarix.appdata.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>guitarix.desktop</id>
+  <name>guitarix</name>
+  <summary>A virtual guitar amplifier</summary>
+  <developer_name>Hermann Meyer, Andreas Degert, Pete Shorthose, Markus Schmidt</developer_name>
+  <description>
+    <p>Guitarix takes the signal from your guitar as any real amp would do: as a mono-signal from your sound card.</p>
+    <p>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.</p>
+    <p>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.</p>
+  </description>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <url type="bugtracker">https://sourceforge.net/p/guitarix/bugs/</url>
+  <url type="help">https://www.reddit.com/r/Guitarix/</url>
+  <url type="homepage">https://guitarix.org/</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption/>
+      <image height="767" width="524">https://guitarix.org/images/screenshots/Guitarix_0.35.0.jpg</image>
+    </screenshot>
+  </screenshots>
+</component>

guitarix.spec

@@ -3,16 +3,16 @@
 %global altname gx_head
 %global altname2 guitarix2
 
-# Workaround for rhbz#1721348
-%define __brp_strip_static_archive %{nil}
-
 Name:           guitarix
-Version:        0.39.0
+Version:        0.40.0
-Release:        2%{?dist}
+Release:        1%{?dist}
-Summary:        Mono amplifier to JACK
+Summary:        A virtual guitar amplifier
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
 Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.xz
+Source1:        %{name}.appdata.xml
+# Fix backported from upstream commit 2609ca14
+Patch0:         %{name}-format-string.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  python3
@@ -20,9 +20,9 @@ BuildRequires:  %{_bindir}/find
 BuildRequires:  %{_bindir}/pathfix.py
 BuildRequires:  desktop-file-utils
 BuildRequires:  faust
-BuildRequires:  fftw-devel
+BuildRequires:  fftw-devel >= 3.3.8
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel >= 3.22
-BuildRequires:  gtkmm24-devel
+BuildRequires:  gtkmm30-devel >= 3.22
 BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  ladspa-devel
 BuildRequires:  libsigc++20-devel
@@ -38,32 +38,23 @@ 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,
+Guitarix takes the signal from your guitar as any real amp would do:
-i.e. a system using the JACK Audio Connection Kit, a professionally-capable
+as a mono-signal from your sound card.
-audio/MIDI server and master transport control.
+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.
-Guitarix provides one JACK input port and two JACK output ports. It is designed
+You may fill the rack with effects from more than 25 built-in modules,
-to produce nice trash/metal/rock/blues guitar sounds. Controls for bass, treble,
+including stuff from a simple noise gate to brain-slashing modulation f/x
-gain, compressor, preamp, balance, distortion, freeverb, crybaby (wah) and echo
+like flanger, phaser or auto-wah.
-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.
 
 %package -n libgxw
 Summary:        Guitarix GTK library
@@ -132,7 +123,7 @@ 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}/python3 \
@@ -149,17 +140,21 @@ sed -i -e 's|-O3||' wscript
 
 %build
 %set_build_flags
-./waf -vv configure --prefix=%{_prefix} --libdir=%{_libdir}                  \
+CXXFLAGS+=" -fomit-frame-pointer -ftree-loop-linear -ffinite-math-only -fno-math-errno -fno-signed-zeros -fstrength-reduce"
-      --cxxflags="-std=c++0x -fomit-frame-pointer -ftree-loop-linear         \
+%ifarch %{ix86}
-      -ffinite-math-only -fno-math-errno -fno-signed-zeros -fstrength-reduce \
+CFLAGS+=" -msse -mfpmath=sse"
-%ifarch %ix86 x86_64
+CXXFLAGS+=" -msse -mfpmath=sse"
-      -msse                                                                  \
 %endif
-      %{optflags}"                                                           \
+
-      --shared-lib --lib-dev          \
+%ifarch x86_64
+CFLAGS+=" -msse2 -mfpmath=sse"
+CXXFLAGS+=" -msse2 -mfpmath=sse"
+%endif
+
+./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    \
+      --cxxflags-release="-DNDEBUG"
-      --glade-modules-dir=%{_libdir}/glade/modules
 ./waf -vv build %{?_smp_mflags}
 
 %install
@@ -172,10 +167,17 @@ 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 libgxwmm.so.0.1 %{buildroot}%{_libdir}/libgxwmm.so
-ln -s %{_libdir}/libgxw.so.0.1 %{buildroot}%{_libdir}/libgxw.so
+ln -s libgxw.so.0.1 %{buildroot}%{_libdir}/libgxw.so
 chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
 
+# install appdata file
+install -d -m755 %{buildroot}%{_metainfodir}
+install -p -m644 %{SOURCE1} %{buildroot}%{_metainfodir}
+
+# validate appdata
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+
 %find_lang %{name}
 
 
@@ -186,6 +188,7 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
 %{_datadir}/%{altname}/
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/%{name}.desktop
+%{_metainfodir}/%{name}.appdata.xml
 
 %files -n libgxw
 %{_libdir}/libgxw.so.0*
@@ -218,6 +221,11 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
 %{_libdir}/lv2/*
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (guitarix2-0.39.0.tar.xz) = 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
+SHA512 (guitarix2-0.40.0.tar.xz) = 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8