Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2017-08-28 15:32:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacity" Mon Aug 28 15:32:51 2017 rev:74 rq:518795 version:2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2017-07-06 00:04:22.430063424 +0200 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2017-08-28 15:32:52.376258115 +0200 @@ -1,0 +2,10 @@ +Fri Aug 25 15:16:21 UTC 2017 - davejplater@gmail.com + +- Restore conditionals for lame, mad and twolame. + +------------------------------------------------------------------- +Fri Aug 25 06:19:49 UTC 2017 - olaf@aepfle.de + +- Remove conditionals for ffmpeg, lame, mad, twolame. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Pp89IV/_old 2017-08-28 15:32:53.736066938 +0200 +++ /var/tmp/diff_new_pack.Pp89IV/_new 2017-08-28 15:32:53.744065814 +0200 @@ -16,10 +16,11 @@ # +%if 0%{?suse_version} < 1330 %bcond_with mad -%bcond_with lame -%bcond_with twolame -%bcond_without ffmpeg +%else +%bcond_without mad +%endif Name: audacity Version: 2.1.3 @@ -44,17 +45,12 @@ BuildRequires: desktop-file-utils #Audacity only builds with gcc >= 4.9 # WARNING: Anything built against wxWidgets with gcc >= 5 needs widgets built with relax-abi.diff -%if 0%{?suse_version} > 1320 -BuildRequires: gcc-c++ -%else -# Bomi requires C++14 support. -%if 0%{?sle_version} == 120100 -# Leap 42.1 +%if 0%{?suse_version} < 1330 +BuildRequires: cpp5 +BuildRequires: gcc5 BuildRequires: gcc5-c++ %else -# Leap 42.2+ / SLE12SP2Backports -BuildRequires: gcc6-c++ -%endif +BuildRequires: gcc-c++ %endif BuildRequires: hicolor-icon-theme BuildRequires: wxWidgets-3_0-nostl-devel @@ -65,11 +61,9 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) -%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) >= 51.53 BuildRequires: pkgconfig(libavformat) >= 52.12 BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: pkgconfig(lilv-0) >= 0.16 BuildRequires: pkgconfig(lv2) BuildRequires: pkgconfig(ogg) @@ -82,24 +76,19 @@ BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vorbisenc) BuildRequires: pkgconfig(vorbisfile) +%if %{with mad} +BuildRequires: libmp3lame-devel +BuildRequires: pkgconfig(mad) +BuildRequires: pkgconfig(twolame) +%endif # This would require to patch our portaudio package with "PortMixer"... an extra API that never got integrated in PortAudio. #BuildRequires: portaudio-devel Recommends: %{name}-lang -Recommends: libavcodec -Recommends: libavformat -Recommends: libavutil +# WARNING Nothing provides libavutil without a suffix +Requires: ffmpeg Recommends: libmp3lame0 Requires: libFLAC++6 >= 1.3.1 Requires: libFLAC8 >= 1.3.1 -%if %{with mad} -BuildRequires: pkgconfig(mad) -%endif -%if %{with lame} -BuildRequires: libmp3lame-devel -%endif -%if %{with twolame} -BuildRequires: pkgconfig(twolame) -%endif %description Audacity is a program that manipulates digital audio wave forms. In @@ -119,17 +108,13 @@ cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ -%if %{with lame} -rm -rf lib-src/lame/ +%if %{with mad} +rm -rf lib-src/lame %endif %build test -x "$(type -p gcc-5)" && export CC=gcc-5 test -x "$(type -p g++-5)" && export CXX=g++-5 -test -x "$(type -p gcc-6)" && export CC=gcc-6 -test -x "$(type -p g++-6)" && export CXX=g++-6 -test -x "$(type -p gcc-7)" && export CC=gcc-7 -test -x "$(type -p g++-7)" && export CXX=g++-7 export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS -std=gnu++11" aclocal -I m4 @@ -138,8 +123,14 @@ %ifnarch %ix86 x86_64 --disable-sse \ %endif -%if %{with ffmpeg} --with-ffmpeg=system \ +%if %{with mad} + --with-libmad=system \ + --with-libtwolame=system \ + --with-lame=system \ +%else + --without-libmad \ + --without-libtwolame \ %endif --docdir=%{_docdir}/%{name}/