Hello community, here is the log from the commit of package libakode for openSUSE:Factory checked in at 2016-06-23 13:36:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libakode (Old) and /work/SRC/openSUSE:Factory/.libakode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libakode" Changes: -------- --- /work/SRC/openSUSE:Factory/libakode/libakode.changes 2016-05-25 21:28:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libakode.new/libakode.changes 2016-06-23 13:37:03.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 21 07:43:34 UTC 2016 - i...@marguerite.su + +- add patch: libakode-2.0.2-gcc6.patch + * template parameters can't be the same name + +------------------------------------------------------------------- New: ---- libakode-2.0.2-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libakode.spec ++++++ --- /var/tmp/diff_new_pack.ywC7bh/_old 2016-06-23 13:37:05.000000000 +0200 +++ /var/tmp/diff_new_pack.ywC7bh/_new 2016-06-23 13:37:05.000000000 +0200 @@ -17,51 +17,49 @@ Name: libakode +Version: 2.0.2 +Release: 0 +Summary: A Simple Audio Back-End +License: LGPL-2.1+ +Group: Development/Libraries/KDE +Url: http://www.kde.org/ +Source0: akode-%{version}.tar.bz2 +Patch1: flac-64bit.diff +Patch2: gcc-4.3.diff +#PATCH-FIX-UPSTREAM template parameter can't be the same name +Patch3: libakode-2.0.2-gcc6.patch BuildRequires: cdparanoia BuildRequires: flac-devel BuildRequires: kdelibs3-devel BuildRequires: libao-devel BuildRequires: libsamplerate-devel BuildRequires: libtheora-devel -Summary: A Simple Audio Back-End -License: LGPL-2.1+ -Group: Development/Libraries/KDE -Version: 2.0.2 -Release: 0 -Url: http://www.kde.org/ -%define tar_version 2.0.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: akode-%{tar_version}.tar.bz2 -Patch1: flac-64bit.diff -Patch2: gcc-4.3.diff %description aKode is a simple audio back-end suitable for simple actions. - - %package devel Summary: a simple audio backend Group: Development/Libraries/KDE -Requires: libakode = %version +Requires: libakode = %{version} Requires: libstdc++-devel %description devel aKode is a simple audio backend suitable for simple actions. - - %prep -%setup -q -n akode-%{tar_version} +%setup -q -n akode-%{version} %patch1 %patch2 -. /etc/opt/kde3/common_options +%patch3 -p1 +. %{_sysconfdir}/opt/kde3/common_options update_admin %build -. /etc/opt/kde3/common_options +. %{_sysconfdir}/opt/kde3/common_options ./configure \ - --prefix=/usr \ + --prefix=%{_prefix} \ --enable-audio=$AUDIO \ --with-kscd-cdda \ --without-polypaudio \ @@ -74,33 +72,29 @@ --disable-final \ --without-ffmpeg \ --enable-sdl \ - --libdir=%_libdir -make %{?jobs:-j%jobs} + --libdir=%{_libdir} +make %{?_smp_mflags} %install -. /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET - -%clean -rm -rf ${RPM_BUILD_ROOT} +. %{_sysconfdir}/opt/kde3/common_options +make DESTDIR=%{buildroot} $INSTALL_TARGET %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %defattr(-,root,root) -/usr/bin/akodeplay -%_libdir/libakode.* -%_libdir/libakode_mpc_decoder.* -%_libdir/libakode_src_resampler.* -%_libdir/libakode_xiph_decoder.* -%_libdir/libakode_alsa_sink.* -%_libdir/libakode_jack_sink.* +%{_bindir}/akodeplay +%{_libdir}/libakode.* +%{_libdir}/libakode_mpc_decoder.* +%{_libdir}/libakode_src_resampler.* +%{_libdir}/libakode_xiph_decoder.* +%{_libdir}/libakode_alsa_sink.* +%{_libdir}/libakode_jack_sink.* %files devel %defattr(-,root,root) -/usr/bin/akode-config -/usr/include/akode +%{_bindir}/akode-config +%{_includedir}/akode %changelog ++++++ libakode-2.0.2-gcc6.patch ++++++ Index: akode-2.0.2/akode/lib/fast_resampler.cpp =================================================================== --- akode-2.0.2.orig/akode/lib/fast_resampler.cpp +++ akode-2.0.2/akode/lib/fast_resampler.cpp @@ -37,7 +37,7 @@ FastResampler::FastResampler() : speed(1 // A fast resampling by linear interpolation // I assume you know binary arithmetics and convertions if you're reading this // T is the input/output type, Arithm defines the used arithmetic -template<typename T, typename S, template<typename S> class Arithm> +template<typename T, typename S, template<typename U> class Arithm> static bool _doBuffer(AudioFrame* in, AudioFrame* out, float speed, unsigned sample_rate) { unsigned long vt_pos_start = 0; // virtual positions of new sample Index: akode-2.0.2/akode/lib/crossfader.cpp =================================================================== --- akode-2.0.2.orig/akode/lib/crossfader.cpp +++ akode-2.0.2/akode/lib/crossfader.cpp @@ -27,7 +27,7 @@ namespace aKode { CrossFader::CrossFader(unsigned int time) : time(time),pos(0) {} // T is the input/output type, S is the fast arithmetics type, Div is a division method -template<typename T, typename S, template<typename S> class Arithm> +template<typename T, typename S, template<typename U> class Arithm> static bool _doFrame(AudioFrame* in, int& pos, AudioFrame* frame) { T** indata1 = (T**)in->data; @@ -66,7 +66,7 @@ static bool _doFrame(AudioFrame* in, int } // T is the input/output type, S is the fast arithmetics type, Arithm defines devisions -template<typename T, typename S, template<typename S> class Arithm> +template<typename T, typename S, template<typename U> class Arithm> static bool _readFrame(AudioFrame* in, int& pos, AudioFrame* frame) { T** indata = (T**)frame->data; Index: akode-2.0.2/akode/lib/volumefilter.cpp =================================================================== --- akode-2.0.2.orig/akode/lib/volumefilter.cpp +++ akode-2.0.2/akode/lib/volumefilter.cpp @@ -29,7 +29,7 @@ namespace aKode { VolumeFilter::VolumeFilter() : m_volume(0) {} // T is the input/output type, S is the fast arithmetics type, Arithm is a division definition -template<typename T, typename S, template<typename S> class Arithm> +template<typename T, typename S, template<typename U> class Arithm> static bool _doFrame(AudioFrame* in, AudioFrame* out, int volume) { T** indata = (T**)in->data; Index: akode-2.0.2/akode/lib/converter.cpp =================================================================== --- akode-2.0.2.orig/akode/lib/converter.cpp +++ akode-2.0.2/akode/lib/converter.cpp @@ -26,7 +26,7 @@ namespace aKode { Converter::Converter(int sample_width) : m_sample_width(sample_width) {} -template<typename T, typename S, template<typename T> class ArithmT, template<typename S> class ArithmS> +template<typename T, typename S, template<typename U> class ArithmT, template<typename V> class ArithmS> static bool __doFrameFP(AudioFrame* in, AudioFrame* out, int sample_width) { AudioConfiguration config = *in;
