Update to upstream 0.21.0
This commit is contained in:
parent
165d875d8d
commit
6290877e2e
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ guitarix-0.11.0.tar.bz2
|
|||||||
/guitarix-0.11.1.tar.bz2
|
/guitarix-0.11.1.tar.bz2
|
||||||
/guitarix2-0.16.0.tar.bz2
|
/guitarix2-0.16.0.tar.bz2
|
||||||
/guitarix2-0.17.0.tar.bz2
|
/guitarix2-0.17.0.tar.bz2
|
||||||
|
/guitarix2-0.21.0.tar.bz2
|
||||||
|
47
guitarix-0.21.0-glib.patch
Normal file
47
guitarix-0.21.0-glib.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
diff -Nurp guitarix2-0.21.0.orig/src/gx_head/gx_internal_plugins.cpp guitarix2-0.21.0/src/gx_head/gx_internal_plugins.cpp
|
||||||
|
--- guitarix2-0.21.0.orig/src/gx_head/gx_internal_plugins.cpp 2012-01-16 11:39:03.000000000 +0100
|
||||||
|
+++ guitarix2-0.21.0/src/gx_head/gx_internal_plugins.cpp 2012-01-17 10:22:46.128763526 +0100
|
||||||
|
@@ -24,7 +24,6 @@
|
||||||
|
*
|
||||||
|
* --------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
-
|
||||||
|
#include "engine.h"
|
||||||
|
#include "gx_faust_support.h"
|
||||||
|
|
||||||
|
diff -Nurp guitarix2-0.21.0.orig/src/gx_head/gxw_mm_controllers.cpp guitarix2-0.21.0/src/gx_head/gxw_mm_controllers.cpp
|
||||||
|
--- guitarix2-0.21.0.orig/src/gx_head/gxw_mm_controllers.cpp 2012-01-16 11:33:22.000000000 +0100
|
||||||
|
+++ guitarix2-0.21.0/src/gx_head/gxw_mm_controllers.cpp 2012-01-17 11:31:32.946999158 +0100
|
||||||
|
@@ -160,7 +160,7 @@ UiSelector<T>::~UiSelector() {
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
void UiSelector<T>::on_value_changed() {
|
||||||
|
- modifyZone(get_value());
|
||||||
|
+ this->modifyZone(get_value());
|
||||||
|
}
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
diff -Nurp guitarix2-0.21.0.orig/src/headers/engine.h guitarix2-0.21.0/src/headers/engine.h
|
||||||
|
--- guitarix2-0.21.0.orig/src/headers/engine.h 2011-11-22 17:48:43.000000000 +0100
|
||||||
|
+++ guitarix2-0.21.0/src/headers/engine.h 2012-01-17 10:22:32.953163490 +0100
|
||||||
|
@@ -35,6 +35,7 @@
|
||||||
|
#include <glibmm/i18n.h> // NOLINT
|
||||||
|
#include <glibmm/optioncontext.h> // NOLINT
|
||||||
|
#include <glibmm/dispatcher.h>
|
||||||
|
+#include <glibmm/miscutils.h>
|
||||||
|
#include <giomm/file.h>
|
||||||
|
|
||||||
|
/* waf generated defines */
|
||||||
|
diff -Nurp guitarix2-0.21.0.orig/src/ladspa/ladspa_guitarix.cpp guitarix2-0.21.0/src/ladspa/ladspa_guitarix.cpp
|
||||||
|
--- guitarix2-0.21.0.orig/src/ladspa/ladspa_guitarix.cpp 2011-11-29 22:55:14.000000000 +0100
|
||||||
|
+++ guitarix2-0.21.0/src/ladspa/ladspa_guitarix.cpp 2012-01-17 11:58:00.002840732 +0100
|
||||||
|
@@ -3,6 +3,9 @@
|
||||||
|
#include <ladspa.h>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
+#include <glibmm/init.h>
|
||||||
|
+#include <glibmm/thread.h>
|
||||||
|
+
|
||||||
|
#include <jack/jack.h>
|
||||||
|
#include <jack/thread.h>
|
||||||
|
|
@ -1,20 +0,0 @@
|
|||||||
diff -Nurp guitarix2-0.16.0.orig/wscript guitarix2-0.16.0/wscript
|
|
||||||
--- guitarix2-0.16.0.orig/wscript 2011-06-09 15:19:23.000000000 +1000
|
|
||||||
+++ guitarix2-0.16.0/wscript 2011-06-14 18:17:34.000000000 +1000
|
|
||||||
@@ -85,7 +85,7 @@ def set_options(opt):
|
|
||||||
|
|
||||||
comp.add_option('--cxxflags-release',
|
|
||||||
type='string',
|
|
||||||
- default='-O3 -DNDEBUG',
|
|
||||||
+ default='-DNDEBUG',
|
|
||||||
dest='cxxflags_release',
|
|
||||||
help='additional C++ compiler flags for release version (not used if --debug) [Default: %default]')
|
|
||||||
|
|
||||||
@@ -420,6 +420,7 @@ def configure(conf):
|
|
||||||
conf.check_cfg(package='fftw3f', atleast_version='3.1.2', args='--cflags --libs', uselib_store='FFTW3', mandatory=1)
|
|
||||||
if not Options.options.no_ladspa:
|
|
||||||
conf.check(header_name='ladspa.h', mandatory=1)
|
|
||||||
+ conf.env['LADSPA'] = True
|
|
||||||
conf.check(header_name='boost/format.hpp', mandatory=1)
|
|
||||||
# convolver and resampler
|
|
||||||
if not Options.options.includeconvolver:
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -Nurp guitarix2-0.16.0.orig/COPYING guitarix2-0.16.0/COPYING
|
|
||||||
--- guitarix2-0.16.0.orig/COPYING 2011-06-09 15:22:40.000000000 +1000
|
|
||||||
+++ guitarix2-0.16.0/COPYING 2011-06-14 18:21:25.000000000 +1000
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
33
guitarix-snapshot.sh
Normal file
33
guitarix-snapshot.sh
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# $1 - revision number to checkout.
|
||||||
|
: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
|
||||||
|
or fetch the latest revision by: `basename $0` HEAD"}
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
tmp=$(mktemp -d)
|
||||||
|
|
||||||
|
trap cleanup EXIT
|
||||||
|
cleanup() {
|
||||||
|
set +e
|
||||||
|
[ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
|
unset CDPATH
|
||||||
|
pwd=$(pwd)
|
||||||
|
name=guitarix2
|
||||||
|
version=0.20.0
|
||||||
|
|
||||||
|
revision=$1
|
||||||
|
|
||||||
|
pushd "$tmp" >/dev/null
|
||||||
|
echo "Fetching SVN revision: $1"
|
||||||
|
svn export -r$revision https://guitarix.svn.sourceforge.net/svnroot/guitarix/trunk $name-$version |tee $name.stdout
|
||||||
|
revision=$(cat $name.stdout|grep "Exported revision"|sed 's|[^0-9]*||g')
|
||||||
|
echo "Fetched SVN revision: $revision"
|
||||||
|
rm -f $name.stdout
|
||||||
|
|
||||||
|
tar jcf "$pwd"/$name-$version-svn$revision.tar.bz2 $name-$version
|
||||||
|
echo "Written: $name-$version-svn$revision.tar.bz2"
|
||||||
|
popd >/dev/null
|
@ -4,20 +4,18 @@
|
|||||||
%global altname2 guitarix2
|
%global altname2 guitarix2
|
||||||
|
|
||||||
Name: guitarix
|
Name: guitarix
|
||||||
Version: 0.17.0
|
Version: 0.21.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Mono amplifier to JACK
|
Summary: Mono amplifier to JACK
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://guitarix.sourceforge.net/
|
URL: http://guitarix.sourceforge.net/
|
||||||
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
|
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
|
||||||
# remove O3 compile option and fix build of ladspa plugins (included upstream)
|
# to grab source from svn: sh guitarix-snapshot.sh 1245
|
||||||
Patch0: guitarix-fix-ladspa-O3.patch
|
Source1: guitarix-snapshot.sh
|
||||||
# Correct FSF address - included upstream
|
# correct glib error
|
||||||
Patch1: guitarix-fsf-address.patch
|
Patch0: guitarix-0.21.0-glib.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
||||||
|
|
||||||
BuildRequires: boost-devel
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: faust
|
BuildRequires: faust
|
||||||
BuildRequires: fftw-devel
|
BuildRequires: fftw-devel
|
||||||
@ -27,10 +25,11 @@ BuildRequires: jack-audio-connection-kit-devel
|
|||||||
BuildRequires: ladspa-devel
|
BuildRequires: ladspa-devel
|
||||||
BuildRequires: libsigc++20-devel
|
BuildRequires: libsigc++20-devel
|
||||||
BuildRequires: libsndfile-devel
|
BuildRequires: libsndfile-devel
|
||||||
BuildRequires: zita-convolver-devel
|
BuildRequires: zita-convolver-devel >= 3.0.2
|
||||||
BuildRequires: zita-resampler-devel >= 0.1.1-3
|
BuildRequires: zita-resampler-devel >= 0.1.1-3
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
|
BuildRequires: boost-devel
|
||||||
|
|
||||||
Requires: jack_capture
|
Requires: jack_capture
|
||||||
Requires: jconv
|
Requires: jconv
|
||||||
@ -72,9 +71,8 @@ and monocompressor ladspa plug-ins that come together with guitarix, but can
|
|||||||
also be used by any other ladspa host.
|
also be used by any other ladspa host.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{altname2}-%{version}
|
%setup -q -n %{name}2-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
# The build system does not use these bundled libraries by default. But
|
# The build system does not use these bundled libraries by default. But
|
||||||
# just to make sure:
|
# just to make sure:
|
||||||
@ -105,12 +103,7 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
|
|||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc changelog COPYING README
|
%doc changelog COPYING README
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_datadir}/%{altname}/
|
%{_datadir}/%{altname}/
|
||||||
@ -119,12 +112,32 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
|
|
||||||
%files -n ladspa-%{name}-plugins
|
%files -n ladspa-%{name}-plugins
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_libdir}/ladspa/*.so
|
%{_libdir}/ladspa/*.so
|
||||||
|
%{_datadir}/ladspa
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-2
|
* Tue Jan 17 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.21.0-1
|
||||||
- Correct changelog to prevent rpmlint warnings
|
- Update to upstream 0.21.0
|
||||||
|
|
||||||
|
* Sat Nov 12 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.2-3
|
||||||
|
- Add boost-devel build requires
|
||||||
|
|
||||||
|
* Sat Nov 12 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.2-2
|
||||||
|
- Removed libboost library detection fix
|
||||||
|
|
||||||
|
* Sat Nov 12 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.2-1
|
||||||
|
- Update to upstream release 0.20.2
|
||||||
|
|
||||||
|
* Tue Nov 08 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.0-2
|
||||||
|
- Update to upstream release 0.20.0
|
||||||
|
|
||||||
|
* Sun Oct 30 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.0-1.0.svn1278
|
||||||
|
- Grab source from latest svn, and removed FSF patch
|
||||||
|
- Rebuild for libpng 1.5
|
||||||
|
- Removed obsolete tags and clean section from spec
|
||||||
|
|
||||||
|
* Sun Oct 30 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.19.0-1.0.svn1245
|
||||||
|
- Grab source from svn to rebuild against zita-convolver-3
|
||||||
|
|
||||||
* Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-1
|
* Fri Jul 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.17.0-1
|
||||||
- Update to 0.17.0, replace define macro with global
|
- Update to 0.17.0, replace define macro with global
|
||||||
|
Loading…
Reference in New Issue
Block a user