From e1019bad8a1be7e6c3df811e0d4761ce0000f71f Mon Sep 17 00:00:00 2001 From: djurban Date: Wed, 6 Apr 2005 11:33:12 +0000 Subject: [PATCH] - enable lame, vorbis and faac audio, add bcond for BC that are introduced because of autoreqdepped names Changed files: ffmpeg.spec -> 1.44 --- ffmpeg.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ffmpeg.spec b/ffmpeg.spec index d6820d6..2fc725b 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,6 +1,7 @@ # # Conditional build: %bcond_without imlib2 # we can safely play without it :-) +%bcond_without broken_rpm # dont BC packages because of logic error in Ac # Summary: Realtime audio/video encoder and streaming server Summary(pl): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni @@ -15,7 +16,9 @@ Source0: http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz Patch0: %{name}-imlib2.patch Patch1: %{name}-libtool.patch URL: http://ffmpeg.sourceforge.net/ +%if %{with broken_rpm} BuildConflicts: libpostproc +%endif BuildRequires: SDL-devel BuildRequires: freetype-devel %ifarch ppc @@ -24,6 +27,7 @@ BuildRequires: gcc >= 5:3.3.2-3 %endif %{?with_imlib2:BuildRequires: imlib2-devel >= 1.1.0-2} BuildRequires: libtool >= 2:1.4d-3 +BuildRequires: faac-libs %ifarch %{ix86} %ifnarch i386 i486 BuildRequires: nasm @@ -33,6 +37,8 @@ BuildRequires: perl-tools-pod BuildRequires: tetex BuildRequires: texinfo BuildRequires: zlib-devel +BuildRequires: lame-libs +BuildRequires: libvorbis Obsoletes: libpostproc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -134,11 +140,15 @@ obrazie. --libdir=%{_libdir} \ --mandir=%{_mandir} \ --enable-a52bin \ + --enable-faac \ --enable-faadbin \ + --enable-pthreads \ --enable-gpl \ --enable-pp \ --enable-shared \ --enable-shared-pp \ + --enable-mp3lame \ + --enable-vorbis \ %ifnarch %{ix86} --disable-mmx \ %endif -- 2.44.0