Accepting request 518795 from multimedia:apps

- Restore conditionals for lame, mad and twolame.

OBS-URL: https://build.opensuse.org/request/show/518795
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/audacity?expand=0&rev=74

audacity.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Tue Jun  6 17:34:10 UTC 2017 - olaf@aepfle.de
 

audacity.spec

@@ -16,10 +16,11 @@
 #
 
 
+%if 0%{?suse_version} < 1330
 %bcond_with mad
-%bcond_with lame
+%else
-%bcond_with twolame
+%bcond_without mad
-%bcond_without ffmpeg
+%endif
 
 Name:           audacity
 Version:        2.1.3
@@ -44,17 +45,12 @@ BuildRequires:  cmake
 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
+%if 0%{?suse_version} < 1330
-BuildRequires:  gcc-c++
+BuildRequires:  cpp5
-%else
+BuildRequires:  gcc5
-# Bomi requires C++14 support.
-%if 0%{?sle_version} == 120100
-# Leap 42.1
 BuildRequires:  gcc5-c++
 %else
-# Leap 42.2+ / SLE12SP2Backports
+BuildRequires:  gcc-c++
-BuildRequires:  gcc6-c++
-%endif
 %endif
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  wxWidgets-3_0-nostl-devel
@@ -65,11 +61,9 @@ BuildRequires:  pkgconfig(flac++)
 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(vamp-hostsdk)
 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
+# WARNING Nothing provides libavutil without a suffix
-Recommends:     libavformat
+Requires:       ffmpeg
-Recommends:     libavutil
 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 @@ than the physical memory size of your computer.
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.
 rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/
-%if %{with lame}
+%if %{with mad}
-rm -rf lib-src/lame/
+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 @@ autoconf
 %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}/