Accepting request 518641 from home:olh:branches:multimedia:apps

- Remove conditionals for ffmpeg, lame, mad, twolame

OBS-URL: https://build.opensuse.org/request/show/518641
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=103
This commit is contained in:
Alexei Sorokin 2017-08-25 12:41:53 +00:00 committed by Git OBS Bridge
parent c9a6f7d618
commit ac8a996d09
2 changed files with 6 additions and 24 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -16,11 +16,6 @@
#
%bcond_with mad
%bcond_with lame
%bcond_with twolame
%bcond_without ffmpeg
Name: audacity
Version: 2.1.3
Release: 0
@ -47,15 +42,9 @@ BuildRequires: desktop-file-utils
%if 0%{?suse_version} > 1320
BuildRequires: gcc-c++
%else
# Bomi requires C++14 support.
%if 0%{?sle_version} == 120100
# Leap 42.1
BuildRequires: gcc5-c++
%else
# Leap 42.2+ / SLE12SP2Backports
BuildRequires: gcc6-c++
%endif
%endif
BuildRequires: hicolor-icon-theme
BuildRequires: wxWidgets-3_0-nostl-devel
BuildRequires: pkgconfig(alsa)
@ -65,11 +54,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)
@ -91,15 +78,9 @@ 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(mad)
BuildRequires: pkgconfig(twolame)
%endif
%description
Audacity is a program that manipulates digital audio wave forms. In
@ -119,9 +100,7 @@ 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}
rm -rf lib-src/lame/
%endif
%build
test -x "$(type -p gcc-5)" && export CC=gcc-5
@ -138,9 +117,7 @@ autoconf
%ifnarch %ix86 x86_64
--disable-sse \
%endif
%if %{with ffmpeg}
--with-ffmpeg=system \
%endif
--docdir=%{_docdir}/%{name}/
make %{?_smp_mflags}