Author: arekm Date: Thu Mar 4 12:25:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - up to 0.5.1; move faac to (default disabled) nonfree bcond; use opencore-amr instead of non free libamr; enable openjpeg/vdpau
---- Files affected: packages/ffmpeg: ffmpeg.spec (1.190 -> 1.191) , ffmpeg-x264.patch (1.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/ffmpeg/ffmpeg.spec diff -u packages/ffmpeg/ffmpeg.spec:1.190 packages/ffmpeg/ffmpeg.spec:1.191 --- packages/ffmpeg/ffmpeg.spec:1.190 Fri Nov 20 09:42:32 2009 +++ packages/ffmpeg/ffmpeg.spec Thu Mar 4 13:25:09 2010 @@ -3,33 +3,28 @@ # - libnut enabled no (http://www.nut-container.org/) # # Conditional build: -%bcond_with amr # 3GPP Adaptive Multi Rate (AMR) codec support; makes package non-distributable +%bcond_with nonfree # non free options of package %bcond_without autoreqdep # don't care about package name deps generated by rpm %bcond_without imlib2 # don't build imlib2 vhook module Summary: FFmpeg is a very fast video and audio converter Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni Name: ffmpeg -Version: 0.5 -Release: 7 +Version: 0.5.1 +Release: 1 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, ac3, xvid, x264, faad) -License: GPL v2+ with LGPL v2.1+ parts +License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.mplayerhq.hu/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: be8503f15c3b81ba00eb8379ca8dcf33 +# Source0-md5: c7b0e1729f7aafb10496d79bb963bb26 Source1: ffserver.init Source2: ffserver.sysconfig Source3: ffserver.conf -Patch0: %{name}-x264.patch -Patch1: %{name}-bug-803.patch -Patch2: imagewidth.patch +Patch0: %{name}-bug-803.patch +Patch1: imagewidth.patch URL: http://www.ffmpeg.org/ BuildRequires: SDL-devel -%if %{with amr} -BuildRequires: amrnb-devel >= 6.1.0.4 -BuildRequires: amrwb-devel >= 7.0.0.1 -%endif BuildRequires: dirac-devel >= 1.0.0 BuildRequires: faac-devel BuildRequires: faad2-devel @@ -45,8 +40,11 @@ BuildRequires: libraw1394-devel BuildRequires: libtheora-devel >= 1.0-0.beta3 BuildRequires: libtool >= 2:1.4d-3 +BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel BuildRequires: libx264-devel >= 0.1.3 +BuildRequires: opencore-amr-devel +BuildRequires: openjpeg-devel >= 1.3-2 BuildRequires: speex-devel %ifarch %{ix86} %ifnarch i386 i486 @@ -62,7 +60,6 @@ BuildRequires: tetex BuildRequires: texi2html BuildRequires: texinfo -%{?with_amr:BuildRequires: unzip} BuildRequires: xvid-devel >= 1:1.1.0 BuildRequires: zlib-devel %{?with_autoreqdep:BuildConflicts: libpostproc} @@ -118,10 +115,6 @@ Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} # for libavcodec: -%if %{with amr} -Requires: amrnb-devel -Requires: amrwb-devel >= 5.3.0 -%endif Requires: dirac-devel Requires: faac-devel Requires: faad2-devel @@ -212,7 +205,6 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # package the grep result for mplayer, the result formatted as ./mplayer/configure cat <<EOF > ffmpeg-avconfig @@ -285,9 +277,9 @@ --disable-stripping \ --enable-avfilter \ --enable-gpl \ + --enable-version3 \ --enable-libdc1394 \ --enable-libdirac \ - --enable-libfaac \ --enable-libfaad \ --enable-libfaadbin \ --enable-libgsm \ @@ -298,21 +290,25 @@ --enable-libvorbis \ --enable-libx264 \ --enable-libxvid \ + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-libopenjpeg \ --enable-postproc \ --enable-pthreads \ --enable-shared \ --enable-swscale \ + --enable-vdpau \ %ifnarch %{ix86} %{x8664} --disable-mmx \ %endif %ifarch i386 i486 --disable-mmx \ %endif -%if %{with amr} +%if %{with nonfree} --enable-nonfree \ - --enable-libamr-nb \ - --enable-libamr-wb + --enable-libfaac \ %endif + --enable-runtime-cpudetect # force oldscaler build sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h @@ -459,6 +455,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.191 2010/03/04 12:25:09 arekm +- up to 0.5.1; move faac to (default disabled) nonfree bcond; use opencore-amr instead of non free libamr; enable openjpeg/vdpau + Revision 1.190 2009/11/20 08:42:32 arekm - rel 7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.190&r2=1.191&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
