- Update to 0.11.1

- Update to 0.11.0

.cvsignore

@@ -1 +0,0 @@
-guitarix-0.05.0-1.tar.bz2

.gitignore

@@ -0,0 +1,3 @@
+guitarix-0.10.0.tar.bz2
+guitarix-0.11.0.tar.bz2
+/guitarix-0.11.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: guitarix
-# $Id$
-NAME := guitarix
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

guitarix-gtk218.patch

@@ -0,0 +1,26 @@
+svn diff
+Index: libgxw/gxw/GxSelector.cpp
+===================================================================
+--- libgxw/gxw/GxSelector.cpp   (revision 842)
++++ libgxw/gxw/GxSelector.cpp   (working copy)
+@@ -21,6 +21,8 @@
+ #include <gtk/gtkprivate.h>
+ #include <string.h>
+
++#define gtk_widget_get_requisition(w, r) (*r = (w)->requisition)
++
+ #define P_(s) (s)   // FIXME -> gettext
+
+ /****************************************************************
+Index: libgxw/gxw/GxRegler.cpp
+===================================================================
+--- libgxw/gxw/GxRegler.cpp     (revision 842)
++++ libgxw/gxw/GxRegler.cpp     (working copy)
+@@ -29,6 +29,8 @@
+ #include <gtk/gtkbindings.h>
+ #include <gtk/gtkmarshal.h>
+
++#define gtk_widget_get_requisition(w, r) (*r = (w)->requisition)
++
+ #define P_(s) (s)   // FIXME -> gettext
+ #define I_(s) (s)   // FIXME -> gettext

guitarix.spec

@@ -1,56 +1,88 @@
 Name:           guitarix
-Version:        0.05.0
+Version:        0.11.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
+Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  faust
+BuildRequires:  fftw-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  gtkmm24-devel
 BuildRequires:  jack-audio-connection-kit-devel
 BuildRequires:  ladspa-devel
+BuildRequires:  libsigc++20-devel
 BuildRequires:  libsndfile-devel
+BuildRequires:  zita-convolver-devel
+BuildRequires:  zita-resampler-devel >= 0.1.1-3
 
 Requires:       jack_capture
 Requires:       jconv
-Requires:       ladspa
+Requires:       ladspa-%{name}-plugins = %{version}-%{release}
+Requires:       qjackctl
 Requires:       vorbis-tools
 
 %description
-guitarix is a simple mono amplifier to JACK (Jack Audio Connection Kit) with
+Guitarix is a simple mono amplifier to be used in a 'JACKified' environment,
-one input and two outputs. It is designed to get nice trash/metall/rock/blues
+i.e. a system using the JACK Audio Connection Kit, a professionally-capable
-guitar sounds. Controls for bass, treble, gain, compressor, preamp, balance,
+audio/MIDI server and master transport control.
-distortion, freeverb, crybaby(wah) and echo are available. A fixed resonator
-will be used when distortion is disabled. For the 'pressure' in the sound you
-can use the feedback and feedforward sliders.
 
-guitarix includes an experimental tuner and a JACK midi output port with 3
+Guitarix provides one JACK input port and two JACK output ports. It is designed
-channels. They will be fed by a mix from a pitch tracker and a beat detector.
+to produce nice trash/metal/rock/blues guitar sounds. Controls for bass, treble,
-You can pitch the octave (2 up or down), choose the midi channel, the program,
+gain, compressor, preamp, balance, distortion, freeverb, crybaby (wah) and echo
-the velocity and the sensitivity, which means how fast the note will read after
+are available. A fixed resonator is used when distortion is disabled. To modify
-the beat detector emits a signal. Values can be set for the beat detector for
+the sound 'pressure', you can use the feedback and feedforward sliders.
-all channels.
+
+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 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
+Requires:       ladspa
+
+%description -n ladspa-%{name}-plugins
+This package contains the crybaby, distortion, echo, impulseresponse, monoamp,
+and monocompressor ladspa plug-ins that come together with guitarix, but can
+also be used by any other ladspa host.
 
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q
 
-# Correct libdir path
+# The build system does not use these bundled libraries by default. But
-sed -i 's|lib/|%{_lib}/|' wscript
+# just to make sure:
+rm -fr src/zita-convolver src/zita-resampler
+
+# Fix build flags
+sed -i 's|-O3 ||' wscript
 
-# Comply with freedesktop standards
-sed -i 's|\.png||' %{name}.desktop
 
 %build
-./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa
+./waf -vv configure --prefix=%{_prefix}                                      \
-./waf -vvv build %{?_smp_mflags}
+      --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                                                                  \
+%endif
+      %{optflags}"                                                           \
+      --ladspadir=%{_libdir}/ladspa
+./waf -vv build %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-./waf -vvv install --destdir="%{buildroot}"
+./waf -vv install --destdir="%{buildroot}"
 
 desktop-file-install                                    \
 --add-category="X-DigitalProcessing"                    \
@@ -58,9 +90,6 @@ desktop-file-install                                    \
 %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
-%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-
 %clean
 rm -rf %{buildroot}
 
@@ -70,12 +99,48 @@ rm -rf %{buildroot}
 %doc changelog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_libdir}/ladspa/*.so
 %{_datadir}/ladspa/rdf/%{name}.rdf
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/%{name}.desktop
 
+%files -n ladspa-%{name}-plugins
+%defattr(-,root,root,-)
+%{_libdir}/ladspa/*.so
+
 %changelog
+* Wed Aug 25 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.1-1
+- Update to 0.11.1
+
+* Wed Aug 04 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.11.0-1
+- Update to 0.11.0
+
+* Tue Jul 27 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.10.0-3
+- Rebuild against new boost on F-14
+
+* Fri Jul 16 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.10.0-2
+- Add missing BR: gtkmm24-devel
+
+* Sun Jul 11 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.10.0-1
+- Update to 0.10.0
+
+* Sat Jun 26 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.09.0-1
+- Update to 0.09.0
+- Split the ladspa plugins into a separate package as they can also be used by
+  other hosts than guitarix.
+
+* Sat May 15 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.08.0-1
+- Update to 0.08.0
+
+* Sat Feb 20 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.06.0-1
+- Update to 0.06.0
+
+* Sat Jan 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.8-1
+- Update to 0.05.8
+
+* Thu Dec 24 2009 Orcan Ogetbil <orcan@desitter> - 0.05.5-1
+- Update to 0.05.5
+- Add Requires: qjackctl. RHBZ #549566
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
 - Update .desktop file
 

import.log

@@ -1 +0,0 @@
-guitarix-0_04_5-1_fc10:HEAD:guitarix-0.04.5-1.fc10.src.rpm:1243575578

sources

@@ -1 +1 @@
-9f2543abbaca3af59bde0ec0ade15658  guitarix-0.05.0-1.tar.bz2
+1c95a67c0788d6ffe609e430d4b57169  guitarix-0.11.1.tar.bz2