Author: qboosh Date: Mon Feb 11 22:41:13 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - a52bin patch, liba52 options and a52dec BR dropped - use native ac3 decoder - AMR support needs --enable-nonfree (and produces non-distributable package)
---- Files affected: SPECS: ffmpeg.spec (1.155 -> 1.156) ---- Diffs: ================================================================ Index: SPECS/ffmpeg.spec diff -u SPECS/ffmpeg.spec:1.155 SPECS/ffmpeg.spec:1.156 --- SPECS/ffmpeg.spec:1.155 Thu Feb 7 13:08:50 2008 +++ SPECS/ffmpeg.spec Mon Feb 11 23:41:08 2008 @@ -3,7 +3,7 @@ # - libnut enabled no (http://www.nut-container.org/) # # Conditional build: -%bcond_with amr # build 3GPP Adaptive Multi Rate (AMR) speech codec +%bcond_with amr # 3GPP Adaptive Multi Rate (AMR) codec support; makes package non-distributable %bcond_without autoreqdep # don't care about package name deps generated by rpm %bcond_without imlib2 # don't build imlib2 vhook module # @@ -16,7 +16,7 @@ Version: 0.4.9 Release: 4.%{snap}.%{_rel} # LGPL or GPL, chosen at configure time (GPL version is more featured) -# (postprocessing, a52, xvid, x264, faad) +# (postprocessing, ac3, xvid, x264, faad) License: GPL v2+ with LGPL v2.1+ parts Group: Applications/Multimedia #Source0: http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz @@ -27,11 +27,9 @@ Source3: ffserver.conf Patch0: %{name}-gcc4.patch Patch1: %{name}-img_convert_symbol.patch -#Patch2: %{name}-a52bin.patch -Patch3: %{name}-pkgconfig-lib64.patch +Patch2: %{name}-pkgconfig-lib64.patch URL: http://ffmpeg.mplayerhq.hu/ BuildRequires: SDL-devel -BuildRequires: a52dec-libs-devel %if %{with amr} BuildRequires: amrnb-devel >= 6.1.0.4 BuildRequires: amrwb-devel >= 7.0.0.1 @@ -203,9 +201,8 @@ %setup -q -n %{name}-export-%{_snap} %patch0 -p1 %patch1 -p1 -#%patch2 -p1 %ifarch %{x8664} -%patch3 -p0 +%patch2 -p0 %endif %build @@ -219,8 +216,6 @@ --shlibdir=%{_libdir} \ --mandir=%{_mandir} \ --disable-strip \ - --enable-liba52 \ - --enable-liba52bin \ --enable-libfaac \ --enable-libfaad \ --enable-libfaadbin \ @@ -242,6 +237,7 @@ --disable-mmx \ %endif %if %{with amr} + --enable-nonfree \ --enable-libamr-nb \ --enable-libamr-wb \ %endif @@ -365,6 +361,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.156 2008-02-11 22:41:08 qboosh +- a52bin patch, liba52 options and a52dec BR dropped - use native ac3 decoder +- AMR support needs --enable-nonfree (and produces non-distributable package) + Revision 1.155 2008-02-07 12:08:50 glen - rel 1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ffmpeg.spec?r1=1.155&r2=1.156&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
