Author: qboosh Date: Sat Jul 2 08:58:45 2011 GMT Module: packages Tag: HEAD ---- Log message: - BR: bzip2-devel - faac-devel deps moved to nonfree bcond - updated Requires list in -devel
---- Files affected: packages/ffmpeg: ffmpeg.spec (1.216 -> 1.217) ---- Diffs: ================================================================ Index: packages/ffmpeg/ffmpeg.spec diff -u packages/ffmpeg/ffmpeg.spec:1.216 packages/ffmpeg/ffmpeg.spec:1.217 --- packages/ffmpeg/ffmpeg.spec:1.216 Sat Jul 2 09:48:28 2011 +++ packages/ffmpeg/ffmpeg.spec Sat Jul 2 10:58:40 2011 @@ -4,7 +4,7 @@ # - libnut enabled no (http://www.nut-container.org/) # # Conditional build: -%bcond_with nonfree # non free options of package +%bcond_with nonfree # non free options of package (currently: faac) %bcond_without autoreqdep # don't care about package name deps generated by rpm %bcond_without va # VAAPI (Video Acceleration API) %bcond_without vpx # VP8, a high-quality video codec @@ -16,7 +16,8 @@ Version: 0.8 Release: 1 # LGPL or GPL, chosen at configure time (GPL version is more featured) -# (postprocessing, ac3, xvid, x264) +# (postprocessing, some filters, x264, xavs, xvid, x11grab) +# using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2 @@ -29,9 +30,10 @@ URL: http://www.ffmpeg.org/ BuildRequires: SDL-devel BuildRequires: alsa-lib-devel +BuildRequires: bzip2-devel BuildRequires: celt-devel BuildRequires: dirac-devel >= 1.0.0 -BuildRequires: faac-devel +%{?with_nonfree:BuildRequires: faac-devel} BuildRequires: freetype-devel BuildRequires: frei0r-devel %ifarch ppc @@ -131,15 +133,33 @@ Summary(pl.UTF-8): Pliki nagłówkowe ffmpeg Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -# for libavcodec: -Requires: dirac-devel -Requires: faac-devel -Requires: lame-libs-devel +# Libs.private from *.pc (unreasonably they are all the same) +Requires: SDL-devel +Requires: alsa-lib-devel +Requires: bzip2-devel +Requires: celt-devel +Requires: dirac-devel >= 1.0.0 +%{?with_nonfree:Requires: faac-devel} +Requires: jack-audio-connection-kit-devel +Requires: lame-libs-devel >= 3.98.3 +Requires: libdc1394-devel Requires: libgsm-devel Requires: libraw1394-devel -Requires: libtheora-devel >= 1.0-0.alpha7 +Requires: librtmp-devel +Requires: libtheora-devel >= 1.0-0.beta3 +%{?with_va:Requires: libva-devel >= 1.0.3} Requires: libvorbis-devel -Requires: libx264-devel >= 0.1.2-1.20060828_2245.1 +%{?with_vpx:Requires: libvpx-devel >= 0.9.6} +Requires: libx264-devel >= 0.1.3-1.20110625_2245 +Requires: opencore-amr-devel +Requires: openjpeg-devel >= 1.3-2 +Requires: schroedinger-devel +Requires: speex-devel >= 1:1.2-rc1 +Requires: vo-aacenc-devel +Requires: vo-amrwbenc-devel +Requires: xavs-devel +Requires: xorg-lib-libXext-devel +Requires: xorg-lib-libXfixes-devel Requires: xvid-devel >= 1:1.1.0 Requires: zlib-devel Obsoletes: libpostproc-devel @@ -469,6 +489,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.217 2011/07/02 08:58:40 qboosh +- BR: bzip2-devel +- faac-devel deps moved to nonfree bcond +- updated Requires list in -devel + Revision 1.216 2011/07/02 07:48:28 qboosh - enabled: frei0r, vo-aacenc, vo-amrwbenc, xavs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.216&r2=1.217&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
