Author: arekm Date: Fri Aug 22 17:20:32 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 20080822
---- Files affected:
SPECS:
ffmpeg.spec (1.158 -> 1.159)
---- Diffs:
================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.158 SPECS/ffmpeg.spec:1.159
--- SPECS/ffmpeg.spec:1.158 Thu Aug 21 14:06:28 2008
+++ SPECS/ffmpeg.spec Fri Aug 22 19:20:26 2008
@@ -7,9 +7,9 @@
%bcond_without autoreqdep # don't care about package name deps generated
by rpm
%bcond_without imlib2 # don't build imlib2 vhook module
#
-%define _snap 2008-01-31
+%define _snap 2008-08-22
%define snap %(echo %{_snap} | tr -d -)
-%define _rel 3
+%define _rel 1
Summary: Realtime audio/video encoder and streaming server
Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer
strumieni
Name: ffmpeg
@@ -21,19 +21,17 @@
Group: Applications/Multimedia
#Source0: http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
Source0: http://ffmpeg.mplayerhq.hu/%{name}-export-snapshot.tar.bz2
-# Source0-md5: 6c8b32545838a4090348b93d5195bd08
+# Source0-md5: 573ff56bb619391fbc13ecde23389b45
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
-Patch0: %{name}-gcc4.patch
-Patch1: %{name}-img_convert_symbol.patch
-Patch2: %{name}-pkgconfig-lib64.patch
URL: http://ffmpeg.mplayerhq.hu/
BuildRequires: SDL-devel
%if %{with amr}
BuildRequires: amrnb-devel >= 6.1.0.4
BuildRequires: amrwb-devel >= 7.0.0.1
%endif
+BuildRequires: dirac-devel
BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: freetype-devel
@@ -43,12 +41,14 @@
%endif
%{?with_imlib2:BuildRequires: imlib2-devel >= 1.3.0}
BuildRequires: lame-libs-devel
+BuildRequires: a52dec-libs-devel
BuildRequires: libgsm-devel
+BuildRequires: libdc1394-devel
BuildRequires: libraw1394-devel
BuildRequires: libtheora-devel >= 1.0-0.alpha7
BuildRequires: libtool >= 2:1.4d-3
BuildRequires: libvorbis-devel
-BuildRequires: libx264-devel >= 0.1.2-1.20061024_2245.1
+BuildRequires: libx264-devel >= 0.1.2-1.20080801
%ifarch %{ix86}
%ifnarch i386 i486
BuildRequires: nasm
@@ -199,11 +199,6 @@
%prep
%setup -q -n %{name}-export-%{_snap}
-%patch0 -p1
-%patch1 -p1
-%ifarch %{x8664}
-%patch2 -p0
-%endif
# package the grep result for mplayer, the result formatted as
mplayer/configure
cat <<EOF > ffmpeg-config
@@ -268,18 +263,22 @@
--libdir=%{_libdir} \
--shlibdir=%{_libdir} \
--mandir=%{_mandir} \
- --disable-strip \
+ --disable-stripping \
+ --enable-liba52 \
+ --enable-liba52bin \
--enable-libfaac \
--enable-libfaad \
--enable-libfaadbin \
+ --enable-libdc1394 \
+ --enable-libdirac \
--enable-gpl \
--enable-libgsm \
--enable-libtheora \
--enable-libmp3lame \
- --enable-pp \
+ --enable-postproc \
--enable-pthreads \
--enable-shared \
- --enable-swscaler \
+ --enable-swscale \
--enable-libvorbis \
--enable-libx264 \
--enable-libxvid \
@@ -295,7 +294,7 @@
--enable-libamr-wb \
%endif
--cc="%{__cc}" \
- --extra-cflags="%{rpmcflags}" \
+ --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}" \
--extra-ldflags="%{rpmldflags}" \
--disable-debug \
--disable-optimizations \
@@ -386,7 +385,12 @@
%attr(755,root,root) %{_libdir}/libswscale.so
%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
%{_includedir}/ffmpeg
-%{_includedir}/postproc
+%{_includedir}/libavcodec
+%{_includedir}/libavdevice
+%{_includedir}/libavformat
+%{_includedir}/libavutil
+%{_includedir}/libpostproc
+%{_includedir}/libswscale
%{_pkgconfigdir}/*.pc
%files static
@@ -420,6 +424,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.159 2008/08/22 17:20:26 arekm
+- up to 20080822
+
Revision 1.158 2008/08/21 12:06:28 arekm
- release 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ffmpeg.spec?r1=1.158&r2=1.159&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
