Hello community, here is the log from the commit of package guitarix for openSUSE:Factory checked in at 2014-04-03 17:07:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guitarix (Old) and /work/SRC/openSUSE:Factory/.guitarix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guitarix" Changes: -------- --- /work/SRC/openSUSE:Factory/guitarix/guitarix.changes 2012-02-16 12:22:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.guitarix.new/guitarix.changes 2014-04-03 17:07:17.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Mar 28 15:11:55 UTC 2014 - [email protected] + +- removed deprecated guitarix2-missing_libdl.diff +- added guitarix-0.28.2-gperf_tmpl-fix.patch which fixes some C++ compilations + issues +- update from version 0.19.0 to version 0.28.3 which adds a lot of features + and files which makes package splits inevitable: + - a devel package with the libraries + - a lv2 package + - bestplugins which contains files for getting the guitar sound from famous + bands +- see the accompanying changelog for a detailed list of changes +- fixed typos in package descriptions + +------------------------------------------------------------------- Old: ---- guitarix2-0.19.0.tar.bz2 guitarix2-missing_libdl.diff New: ---- guitarix-0.28.2-gperf_tmpl-fix.patch guitarix2-0.28.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guitarix.spec ++++++ --- /var/tmp/diff_new_pack.rdUEHW/_old 2014-04-03 17:07:19.000000000 +0200 +++ /var/tmp/diff_new_pack.rdUEHW/_new 2014-04-03 17:07:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package guitarix # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,30 +21,35 @@ Group: Productivity/Multimedia/Sound/Utilities Name: guitarix -Version: 0.19.0 +Version: 0.28.3 Release: 0 Url: http://guitarix.sourceforge.net/ Source: guitarix2-%{version}.tar.bz2 -Patch1: guitarix2-missing_libdl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel +BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: gcc-c++ +BuildRequires: gperf BuildRequires: gtk2-devel BuildRequires: gtkmm2-devel BuildRequires: intltool BuildRequires: ladspa-devel +BuildRequires: libavahi-gobject-devel BuildRequires: libjack-devel +BuildRequires: liblrdf-devel BuildRequires: libsigc++2-devel BuildRequires: libsndfile-devel +BuildRequires: lv2-devel BuildRequires: update-desktop-files Requires: jack Requires: meterbridge Requires: vorbis-tools +Patch0: guitarix-0.28.2-gperf_tmpl-fix.patch %description guitarix is a simple mono amplifier to jack with one input and two -output's. Designed to get nice trash/metall/rock/guitar sounds. +outputs. Designed to get nice trash/metal/rock/guitar sounds. Available are the controls for bass, treble, gain, balance, distortion, freeverb, impulse response (pre state), crybaby(wah), @@ -53,13 +58,30 @@ guitarix is licensed under GPL. -%package -n ladspa-guitarix +%package -n %{name}-devel +Summary: Devel files for guitarix +Group: Development/Tools/Other +Requires: guitarix = %{version} + +%description -n %{name}-devel +This package contains the development files for guitarix, which is a simple +mono amplifier to jack with one input and two outputs. Designed to get nice +trash/metal/rock/guitar sounds. + +Available are the controls for bass, treble, gain, balance, +distortion, freeverb, impulse response (pre state), crybaby(wah), +feedback/feedforward-filter and echo. A fixed resonator will use, +when distortion is disabled. + + + +%package -n ladspa-%{name} Summary: Guitarix - ladspa plugins Group: Productivity/Multimedia/Sound/Utilities -%description -n ladspa-guitarix +%description -n ladspa-%{name} guitarix is a simple mono amplifier to jack with one input and two -output's. Designed to get nice trash/metall/rock/guitar sounds. +outputs. Designed to get nice trash/metal/rock/guitar sounds. Available are the controls for bass, treble, gain, balance, distortion, freeverb, impulse response (pre state), crybaby(wah), @@ -68,14 +90,35 @@ This package contains the LADSPA plugins (UniqID 4061 - 4068). -%prep -%setup -q -n guitarix2-%{version} -%patch1 -p1 +%package -n lv2-%{name} +Summary: Guitarix - LV2 plugins +Group: Productivity/Multimedia/Sound/Utilities + +%description -n lv2-%{name} +guitarix is a simple mono amplifier to jack with one input and two +outputs. Designed to get nice trash/metal/rock/guitar sounds. +Available are the controls for bass, treble, gain, balance, +distortion, freeverb, impulse response (pre state), crybaby(wah), +feedback/feedforward-filter and echo. A fixed resonator will use, +when distortion is disabled. + +This package contains the LV2 plugins. + +%package -n bestplugins +Summary: Best Mega Pack 1+3 +Group: Productivity/Multimedia/Sound/Utilities + +%description -n bestplugins +Bestplugins Mega Pack 1+3 contains dozens of guitar sounds from famous bands. + +%prep +%setup -q -n guitarix-%{version} +%patch0 -p1 %build #todo: add faust package to openSUSE export LDFLAGS="-ldl" -./waf configure -v --faust --ladspadir=%{_libdir}/ladspa --prefix=%{_prefix} --cxxflags="$RPM_OPT_FLAGS -std=gnu++0x" +./waf configure -v --faust --libdir=%{_libdir} --ladspadir=%{_libdir}/ladspa --prefix=%{_prefix} --cxxflags="$RPM_OPT_FLAGS -std=gnu++0x" ./waf build -v %{?jobs: -j%jobs} %install @@ -83,9 +126,18 @@ %suse_update_desktop_file -i %{name} AudioVideo Music %find_lang %{name} +%fdupes -s $RPM_BUILD_ROOT/%{_datadir}/gx_head/ +%fdupes -s $RPM_BUILD_ROOT/%{_libdir}/lv2/ + %clean [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}" +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + %files -f %{name}.lang %defattr(-,root,root) %doc changelog COPYING README @@ -95,22 +147,37 @@ %dir %{_datadir}/gx_head/sounds/ %{_bindir}/%{name} %{_datadir}/gx_head/builder/*.glade -%{_datadir}/gx_head/skins/* -%{_datadir}/gx_head/sounds/greathall.wav +%{_datadir}/gx_head/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/gx_head*.png %{_datadir}/pixmaps/gx_bypass.png %{_datadir}/pixmaps/gx_off.png %{_datadir}/pixmaps/gx_on.png +%{_datadir}/pixmaps/gx_log_grey.png +%{_datadir}/pixmaps/gx_log_red.png +%{_datadir}/pixmaps/gx_log_yellow.png %{_datadir}/pixmaps/jackd_off.png %{_datadir}/pixmaps/jackd_on.png -%files -n ladspa-guitarix +%files -n %{name}-devel +%defattr(-,root,root) +%{_libdir}/libgxw*.so* + +%files -n lv2-%{name} +%defattr(-,root,root) +%{_libdir}/lv2/ + +%files -n ladspa-%{name} %defattr(-,root,root) %dir %{_libdir}/ladspa %{_libdir}/ladspa/*.so %dir %{_datadir}/ladspa %dir %{_datadir}/ladspa/rdf %{_datadir}/ladspa/rdf/%{name}.rdf +%{_datadir}/ladspa/rdf/%{name}_amp.rdf + +%files -n bestplugins +%defattr(-,root,root) +%dir %{_datadir}/gx_head/sounds/bands/ %changelog ++++++ guitarix-0.28.2-gperf_tmpl-fix.patch ++++++ diff -urN guitarix-0.28.2/src/gx_head/engine/jsonrpc.cpp guitarix-0.28.2-new/src/gx_head/engine/jsonrpc.cpp --- guitarix-0.28.2/src/gx_head/engine/jsonrpc.cpp 2013-08-03 11:23:01.000000000 +0200 +++ guitarix-0.28.2-new/src/gx_head/engine/jsonrpc.cpp 2013-08-05 13:45:19.353960564 +0200 @@ -1158,7 +1158,7 @@ } } jp.next(gx_system::JsonParser::end_object); - const methodnames *p = in_word_set(method.c_str(), method.size()); + const methodnames *p = Perfect_Hash::in_word_set(method.c_str(), method.size()); if (!p) { throw RpcError(-32601, Glib::ustring::compose("Method not found -- '%1'", method)); } diff -urN guitarix-0.28.2/src/gx_head/engine/jsonrpc_methods.gperf_tmpl guitarix-0.28.2-new/src/gx_head/engine/jsonrpc_methods.gperf_tmpl --- guitarix-0.28.2/src/gx_head/engine/jsonrpc_methods.gperf_tmpl 2013-08-03 11:23:01.000000000 +0200 +++ guitarix-0.28.2-new/src/gx_head/engine/jsonrpc_methods.gperf_tmpl 2013-08-05 13:29:45.293494574 +0200 @@ -22,7 +22,7 @@ ** this is basically a gperf file. Make sure you have the gperf ** package installed. */ -%language=ANSI-C +%language=C++ %struct-type %7bit %readonly-tables diff -urN guitarix-0.28.2/src/LV2/gx_amp.lv2/gxamp_gui.cpp guitarix-0.28.2-new/src/LV2/gx_amp.lv2/gxamp_gui.cpp --- guitarix-0.28.2/src/LV2/gx_amp.lv2/gxamp_gui.cpp 2013-08-03 11:23:01.000000000 +0200 +++ guitarix-0.28.2-new/src/LV2/gx_amp.lv2/gxamp_gui.cpp 2013-08-05 14:31:08.242177101 +0200 @@ -136,7 +136,7 @@ // 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 -urN guitarix-0.28.2/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp guitarix-0.28.2-new/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp --- guitarix-0.28.2/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp 2013-08-03 11:23:01.000000000 +0200 +++ guitarix-0.28.2-new/src/LV2/gx_amp_stereo.lv2/gxamp_stereo_gui.cpp 2013-08-05 14:28:12.004728719 +0200 @@ -135,7 +135,7 @@ { 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() ++++++ guitarix2-0.19.0.tar.bz2 -> guitarix2-0.28.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/guitarix/guitarix2-0.19.0.tar.bz2 /work/SRC/openSUSE:Factory/.guitarix.new/guitarix2-0.28.3.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
