- up to 20090225

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7d74ca4228d1ad6346a751a7b4641c28368a8a6e..52da1f4bea6d922494ec33f5b8be795a0a2961d2 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -6,9 +6,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
@@ -20,12 +20,11 @@ License:    GPL v2+ with LGPL v2.1+ parts
 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}
@@ -45,6 +44,7 @@ BuildRequires:        lame-libs-devel
 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
@@ -204,7 +204,6 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %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
@@ -284,6 +283,7 @@ EOF
        --enable-libgsm \
        --enable-libmp3lame \
        --enable-libschroedinger \
+       --enable-libspeex \
        --enable-libtheora \
        --enable-libvorbis \
        --enable-libx264 \
@@ -304,6 +304,9 @@ EOF
        --enable-libamr-wb
 %endif
 
+# force oldscaler build
+sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
+
 %{__make}
 
 %install
@@ -366,6 +369,8 @@ fi
 %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