Hello community, here is the log from the commit of package guitarix for openSUSE:Factory checked in at 2016-07-15 12:48:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-11 16:38:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.guitarix.new/guitarix.changes 2016-07-15 12:48:56.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 3 11:57:45 UTC 2016 - [email protected] + +- add patch guitarix-0.35.0-gcc6.patch, fixed boo#985365 + * fix call of overloaded 'abs(double)' is ambiguous + +------------------------------------------------------------------- New: ---- guitarix-0.35.0-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guitarix.spec ++++++ --- /var/tmp/diff_new_pack.X66oiG/_old 2016-07-15 12:48:58.000000000 +0200 +++ /var/tmp/diff_new_pack.X66oiG/_new 2016-07-15 12:48:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package guitarix # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,17 @@ # -Summary: Simple Linux amplifier for jack -License: GPL-2.0+ -Group: Productivity/Multimedia/Sound/Utilities - Name: guitarix Version: 0.35.0 Release: 0 +Summary: Simple Linux amplifier for jack +License: GPL-2.0+ +Group: Productivity/Multimedia/Sound/Utilities Url: http://guitarix.sourceforge.net/ Source: http://downloads.sourceforge.net/project/guitarix/guitarix/guitarix2-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: fpexception.patch +# PATCH-FIX-UPSTREAM [email protected] - fix call of overloaded 'abs(double)' is ambiguous +Patch1: guitarix-0.35.0-gcc6.patch BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: fftw3-devel @@ -41,6 +42,7 @@ BuildRequires: libsigc++2-devel BuildRequires: libsndfile-devel BuildRequires: lv2-devel +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(eigen3) @@ -48,7 +50,7 @@ Requires: jack Requires: meterbridge Requires: vorbis-tools -Patch0: fpexception.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description guitarix is a simple mono amplifier to jack with one input and two @@ -76,8 +78,6 @@ 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 @@ -117,29 +117,25 @@ %prep %setup -q -n guitarix-%{version} -%patch0 -p0 +%patch0 +%patch1 -p1 + %build #todo: add faust package to openSUSE export LDFLAGS="-ldl" -./waf configure -v --faust --libdir=%{_libdir} --ladspadir=%{_libdir}/ladspa --prefix=%{_prefix} --cxxflags="$RPM_OPT_FLAGS -std=gnu++0x" -./waf build -v %{?jobs: -j%jobs} +./waf configure -v --faust --libdir=%{_libdir} --ladspadir=%{_libdir}/ladspa --prefix=%{_prefix} --cxxflags="%{optflags} -std=gnu++0x" +./waf build -v %{?_smp_mflags} %install -./waf install --destdir="$RPM_BUILD_ROOT" +./waf install --destdir=%{buildroot} %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}" +%fdupes -s %{buildroot}/%{_datadir}/gx_head/ +%fdupes -s %{buildroot}/%{_libdir}/lv2/ -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root) @@ -165,7 +161,6 @@ %{_datadir}/pixmaps/jackd_off.png %{_datadir}/pixmaps/jackd_on.png - %files -n %{name}-devel %defattr(-,root,root) %{_libdir}/libgxw*.so* ++++++ guitarix-0.35.0-gcc6.patch ++++++ Index: b/libgxwmm/gxwmm/gainline.h =================================================================== --- a/libgxwmm/gxwmm/gainline.h +++ b/libgxwmm/gxwmm/gainline.h @@ -21,8 +21,9 @@ #include <gxw/gainpoints.h> #include <vector> +#include <cmath> -inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); } +inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && std::abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); } inline bool operator!=(const gain_points& p1, const gain_points& p2) { return !(p1 == p2); } class Gainline: public std::vector<gain_points>
