Update to 0.34.0

This commit is contained in:
Brendan Jones 2015-11-20 06:11:49 +01:00
parent 64dc460aef
commit 0a16f74eb8
5 changed files with 10 additions and 67 deletions

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ guitarix-0.11.0.tar.bz2
/guitarix2-0.32.0.tar.bz2
/guitarix2-0.32.3.tar.bz2
/guitarix2-0.33.0.tar.bz2
/guitarix2-0.34.0.tar.bz2

View File

@ -1,12 +0,0 @@
diff -Nurp guitarix-0.28.1/tools/make_jsonrpc_methods guitarix-0.28.1.mod/tools/make_jsonrpc_methods
--- guitarix-0.28.1/tools/make_jsonrpc_methods 2013-07-20 11:55:23.000000000 +0200
+++ guitarix-0.28.1.mod/tools/make_jsonrpc_methods 2013-07-21 12:48:30.109255260 +0200
@@ -14,7 +14,7 @@ def add_enums(template_name, hashtable_n
hashtable = open(hashtable_name, "w")
hashtable.write(headline)
hashtable.flush()
- gperf = Popen(gperf_program, stdin=PIPE, stdout=hashtable)
+ gperf = Popen([gperf_program, '-H','gperf_hash'], stdin=PIPE, stdout=hashtable)
enumlist = []
section = 0
in_comment = False

View File

@ -1,47 +0,0 @@
diff -Nurp guitarix-0.28.2.orig/src/LV2/gx_amp.lv2/gxamp_gui.cpp guitarix-0.28.2.mod/src/LV2/gx_amp.lv2/gxamp_gui.cpp
--- guitarix-0.28.2.orig/src/LV2/gx_amp.lv2/gxamp_gui.cpp 2013-08-03 11:23:01.000000000 +0200
+++ guitarix-0.28.2.mod/src/LV2/gx_amp.lv2/gxamp_gui.cpp 2013-10-04 03:38:26.927527576 +0200
@@ -124,19 +124,12 @@ void GXPluginGUI::set_skin()
gtk_rc_parse_string (toparse.c_str());
}
-inline std::string to_string(long long _Val)
-{ // convert int to string
- char _Buf[128];
- sprintf(_Buf, "%lld", _Val);
- return (std::string(_Buf));
-}
-
void GXPluginGUI::set_plug_name()
{
// Here the plugin should have different name for different amp.....
addKnob = "";
plugskin = "amp21.png";
- plug_name = "GUITARIXLV2" + to_string(reinterpret_cast<long long>(this));
+ plug_name = "GUITARIXLV2" + std::to_string(reinterpret_cast<long long>(this));
//fprintf(stderr,"%s",plug_name.c_str());
}
diff -Nurp guitarix-0.28.2.orig/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp guitarix-0.28.2.mod/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp
--- guitarix-0.28.2.orig/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp 2013-08-03 11:23:01.000000000 +0200
+++ guitarix-0.28.2.mod/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp 2013-10-04 03:39:12.223528009 +0200
@@ -124,18 +124,11 @@ void GXPluginGUI::set_skin()
gtk_rc_parse_string (toparse.c_str());
}
-inline std::string to_string(long long _Val)
-{ // convert int to string
- char _Buf[128];
- sprintf(_Buf, "%lld", _Val);
- return (std::string(_Buf));
-}
-
void GXPluginGUI::set_plug_name()
{
addKnob = "";
plugskin = "amp21.png";
- plug_name = "GUITARIXLV2" + to_string(reinterpret_cast<long long>(this));
+ plug_name = "GUITARIXLV2" + std::to_string(reinterpret_cast<long long>(this));
}
GtkWidget* GXPluginGUI::make_gui()

View File

@ -4,16 +4,13 @@
%global altname2 guitarix2
Name: guitarix
Version: 0.33.0
Release: 2%{?dist}
Version: 0.34.0
Release: 1%{?dist}
Summary: Mono amplifier to JACK
Group: Applications/Multimedia
License: GPLv2+
URL: http://guitarix.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
Patch0: guitarix-0.28.1-gperf.patch
Patch1: guitarix-0.28.1-to_string.patch
# gxamp should use inherited compiler flags
BuildRequires: desktop-file-utils
BuildRequires: faust
@ -35,6 +32,7 @@ BuildRequires: lilv-devel
BuildRequires: gperf
BuildRequires: avahi-gobject-devel
BuildRequires: eigen3-devel
BuildRequires: webkitgtk-devel
Requires: jack_capture
Requires: jconv
Requires: ladspa-%{name}-plugins = %{version}-%{release}
@ -136,8 +134,6 @@ guitarix, but can also be used by any other ladspa host.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
# The build system does not use these bundled libraries by default. But
# just to make sure:
@ -222,6 +218,11 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
%{_libdir}/lv2/*
%changelog
* Fri Nov 20 2015 Brendan Jones <brendan.jones.it@gmail.com> 0.34.0-1
- Update to 0.34.0
- add webkitgtk-devel
- remove patches
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.33.0-2
- Rebuilt for Boost 1.59

View File

@ -1 +1 @@
a60b695df6a73ba9d49b82b61f2af6b1 guitarix2-0.33.0.tar.bz2
0ac5f18ee738d535b1551ea68ac2fce9 guitarix2-0.34.0.tar.bz2