diff --git a/.gitignore b/.gitignore index c22d4dd..50f4f67 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ guitarix-0.11.0.tar.bz2 /guitarix2-0.25.2.tar.bz2 /guitarix2-0.26.1.tar.bz2 /guitarix2-0.27.1.tar.bz2 +/guitarix2-0.28.2.tar.bz2 diff --git a/guitarix-0.28.1-gperf.patch b/guitarix-0.28.1-gperf.patch new file mode 100644 index 0000000..137fe77 --- /dev/null +++ b/guitarix-0.28.1-gperf.patch @@ -0,0 +1,12 @@ +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 diff --git a/guitarix-0.28.1-to_string.patch b/guitarix-0.28.1-to_string.patch new file mode 100644 index 0000000..f9b830d --- /dev/null +++ b/guitarix-0.28.1-to_string.patch @@ -0,0 +1,47 @@ +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(this)); ++ plug_name = "GUITARIXLV2" + std::to_string(reinterpret_cast(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(this)); ++ plug_name = "GUITARIXLV2" + std::to_string(reinterpret_cast(this)); + } + + GtkWidget* GXPluginGUI::make_gui() diff --git a/guitarix.spec b/guitarix.spec index 2b1046c..de246ed 100644 --- a/guitarix.spec +++ b/guitarix.spec @@ -4,13 +4,15 @@ %global altname2 guitarix2 Name: guitarix -Version: 0.27.1 -Release: 3%{?dist} +Version: 0.28.2 +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 @@ -130,6 +132,8 @@ 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: @@ -145,7 +149,7 @@ sed -i -e 's|-O3||' wscript %endif %{optflags}" \ --shared-lib --lib-dev \ - --ladspadir=%{_libdir}/ladspa --build-lv2 --lv2dir=%{_libdir}/lv2 \ + --ladspadir=%{_libdir}/ladspa --lv2dir=%{_libdir}/lv2 \ --glade-support --glade-catalog-dir=%{_datadir}/glade/catalogs \ --glade-modules-dir=%{_libdir}/glade/modules ./waf -vv build %{?_smp_mflags} @@ -214,6 +218,9 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so %{_libdir}/lv2/* %changelog +* Sun Sep 29 2013 Brendan Jones 0.28.2-1 +- Update to 0.28.2 + * Sat Aug 03 2013 Fedora Release Engineering - 0.27.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -316,7 +323,7 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so * Wed Jun 15 2011 Brendan Jones - 0.16.0-2 - Add BuildRequires gettext -* Mon Jun 14 2011 Brendan Jones - 0.16.0-1 +* Mon Jun 13 2011 Brendan Jones - 0.16.0-1 - Updated to version 0.16.0-1 which combines guitarix and gx_head - Obsoletes gx_head - Correct build of ladspa plugins and removed O3 optimizations diff --git a/sources b/sources index f0520ce..1487109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65e0917f9529460931be522e2879e514 guitarix2-0.27.1.tar.bz2 +d957c28e4d68318427f2478257307235 guitarix2-0.28.2.tar.bz2