Author: kwizart Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv8203 Modified Files: ffmpeg.spec Log Message: Tweak for opencore-amr Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ffmpeg.spec 15 Oct 2009 22:14:44 -0000 1.18 +++ ffmpeg.spec 15 Oct 2009 22:23:25 -0000 1.19 @@ -28,7 +28,7 @@ %{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0} BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel -{!?_without_opencore-amr: BuildRequires: opencore-amr-devel} +%{?_with_opencore-amr:BuildRequires: opencore-amr-devel} BuildRequires: openjpeg-devel BuildRequires: schroedinger-devel BuildRequires: SDL-devel @@ -86,7 +86,7 @@ --arch=%{_target_cpu} \\\ --extra-cflags="$RPM_OPT_FLAGS -I%{_includedir}/openjpeg" \\\ --extra-version=rpmfusion \\\ - %{!?_without_opencore-amr: --enable-libopencore-amrnb --enable-libopencore-amrnb} \\\ + %{?_with_opencore-amr: --enable-libopencore-amrnb --enable-libopencore-amrnb} \\\ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \\\ --enable-bzlib \\\ --enable-libdc1394 \\\ @@ -111,6 +111,7 @@ --enable-shared \\\ --enable-gpl \\\ %{?_with_nonfree:--enable-nonfree} \\\ + %{?_with_gplv3:--enable-version3} \\\ --disable-debug \\\ --disable-stripping @@ -270,8 +271,9 @@ %changelog * Thu Oct 15 2009 kwizart <kwizart at gmail.com > - 0.5-3.svn20091007 - Update to svn snapshot 20091007 -- Add BR dirac opencoreamr vdpau. +- Add BR dirac vdpau. - Use --with nonfree as a separate conditional for amr and faac. +- Use --with gplv3 as a separate conditional for opencore-amr. - Don't build faac by default because it's nonfree. - Allow to --define 'ffmpegsuffix custom' for special SONAME.