Hello community, here is the log from the commit of package ladspa-preamp for openSUSE:Factory checked in at 2016-06-25 02:23:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ladspa-preamp (Old) and /work/SRC/openSUSE:Factory/.ladspa-preamp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ladspa-preamp" Changes: -------- --- /work/SRC/openSUSE:Factory/ladspa-preamp/ladspa-preamp.changes 2014-03-04 13:38:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ladspa-preamp.new/ladspa-preamp.changes 2016-06-25 02:23:49.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jun 23 12:05:44 CEST 2016 - [email protected] + +- Wrap with a namespace for own exp2() implementation to fix the + build error with gcc6: + preamp-ext2-conflict.patch + +------------------------------------------------------------------- New: ---- preamp-ext2-conflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladspa-preamp.spec ++++++ --- /var/tmp/diff_new_pack.AplkEh/_old 2016-06-25 02:23:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AplkEh/_new 2016-06-25 02:23:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ladspa-preamp # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -25,6 +25,7 @@ Url: http://quitte.de/dsp/ Source: preamp-v%{version}.tar.bz2 Patch1: preamp.dif +Patch2: preamp-ext2-conflict.patch BuildRequires: gcc-c++ BuildRequires: ladspa-devel Supplements: ladspa @@ -37,6 +38,7 @@ %prep %setup -q -n preamp %patch1 +%patch2 -p1 %build # This package failed when testing with -Wl,-as-needed being default. ++++++ preamp-ext2-conflict.patch ++++++ --- exp2.h | 3 +++ preamp.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) --- a/exp2.h +++ b/exp2.h @@ -7,6 +7,8 @@ * thanks, andy! */ +namespace DSP { + static inline float exp2 (float x) { @@ -22,4 +24,5 @@ exp2 (float x) return x; } +} /* namespace DSP */ #endif /* _EXP_2_H_ */ --- a/preamp.cc +++ b/preamp.cc @@ -194,7 +194,7 @@ Preamp::process (int frames) hp.set_f (fc / fs); } - double g = gain < 1 ? gain + .00001 : exp2 (gain - 1); + double g = gain < 1 ? gain + .00001 : DSP::exp2 (gain - 1); double ig = .063 / g; g *= 4.; /* correction for first valve transfer at -12 dB gain */
