SPECS: ffmpeg.spec - up to 20090225

[arekm]

Author: arekm                        Date: Wed Feb 25 18:08:56 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 20090225

---- Files affected:
SPECS:
   ffmpeg.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.177 SPECS/ffmpeg.spec:1.178
--- SPECS/ffmpeg.spec:1.177	Mon Nov 24 02:12:18 2008
+++ SPECS/ffmpeg.spec	Wed Feb 25 19:08:51 2009
@@ -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-10-24
+%define		_snap	2009-02-25
 %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,12 +21,11 @@
 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:	de89ea80da716879e0b85945d89b529a
+# Source0-md5:	a7649aa1c597ba9bd0e92e42e1a56494
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-Patch0:		%{name}-img_convert_symbol.patch
-Patch1:		%{name}-x264.patch
+Patch0:		%{name}-x264.patch
 URL:		http://ffmpeg.mplayerhq.hu/
 BuildRequires:	SDL-devel
 %if %{with amr}
@@ -46,6 +45,7 @@
 BuildRequires:	libdc1394-devel
 BuildRequires:	libgsm-devel
 BuildRequires:	libraw1394-devel
+BuildRequires:	speex-devel
 BuildRequires:	libtheora-devel >= 1.0-0.beta3
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel
@@ -205,7 +205,6 @@
 %prep
 %setup -q -n %{name}-export-%{_snap}
 %patch0 -p1
-%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -285,6 +284,7 @@
 	--enable-libgsm \
 	--enable-libmp3lame \
 	--enable-libschroedinger \
+	--enable-libspeex \
 	--enable-libtheora \
 	--enable-libvorbis \
 	--enable-libx264 \
@@ -305,6 +305,9 @@
 	--enable-libamr-wb
 %endif
 
+# force oldscaler build
+sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
+
 %{__make}
 
 %install
@@ -367,6 +370,8 @@
 %defattr(644,root,root,755)
 %doc Changelog README doc/*.html doc/TODO
 %attr(755,root,root) %{_bindir}/ffmpeg
+%dir %{_datadir}/ffmpeg
+%{_datadir}/ffmpeg/*.ffpreset
 %{_mandir}/man1/ffmpeg.1*
 
 %files libs
@@ -440,6 +445,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2009/02/25 18:08:51  arekm
+- up to 20090225
+
 Revision 1.177  2008/11/24 01:12:18  glen
 - add more devel headers for mplayer
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ffmpeg.spec?r1=1.177&r2=1.178&f=u