- rel 5; add libvpx update

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 33b3835d0221c16875ef31dda59a8bedeedad69c..b36d7f732f4e1f3bdb626fb7154822f373ff0b69 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -10,7 +10,7 @@ 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.6
-Release:       1
+Release:       5
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, ac3, xvid, x264, faad)
 License:       GPL v3+ with LGPL v3+ parts
@@ -22,6 +22,11 @@ Source2:     ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-bug-803.patch
 Patch1:                %{name}-gsm.patch
+Patch2:                faadbin-libfaadname.patch
+# vhook is gone. this patch needs different approach
+#PatchX: imagewidth.patch
+# http://webm.googlecode.com/files/ffmpeg-0.6_libvpx-0.9.1.diff.gz
+Patch3:                ffmpeg-0.6_libvpx-0.9.1.diff
 URL:           http://www.ffmpeg.org/
 BuildRequires: SDL-devel
 BuildRequires: dirac-devel >= 1.0.0
@@ -44,10 +49,10 @@ BuildRequires:      libvdpau-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libvpx-devel >= 0.9.1
 # X264_BUILD >= 83
-BuildRequires: libx264-devel >= 0.1.3-1_20100424_2245_1
+BuildRequires: libx264-devel >= 0.1.3-1.20100424_2245.1
 BuildRequires: opencore-amr-devel
 BuildRequires: openjpeg-devel >= 1.3-2
-BuildRequires: speex-devel
+BuildRequires: speex-devel >= 1:1.2-rc1
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires: nasm
@@ -58,7 +63,6 @@ BuildRequires:        perl-tools-pod
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.470
 BuildRequires: schroedinger-devel
-BuildRequires: speex-devel
 BuildRequires: tetex
 BuildRequires: texi2html
 BuildRequires: texinfo
@@ -189,6 +193,8 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
+%patch3 -p0
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -265,7 +271,6 @@ EOF
        --enable-libdc1394 \
        --enable-libdirac \
        --enable-libfaad \
-       --enable-libfaadbin \
        --enable-libgsm \
        --enable-libmp3lame \
        --enable-libschroedinger \
@@ -283,6 +288,7 @@ EOF
        --enable-shared \
        --enable-swscale \
        --enable-vdpau \
+       --enable-x11grab \
 %ifnarch %{ix86} %{x8664}
        --disable-mmx \
 %endif
@@ -293,7 +299,7 @@ EOF
        --enable-nonfree \
        --enable-libfaac \
 %endif
-       --enable-runtime-cpudetect 
+       --enable-runtime-cpudetect
 
 # force oldscaler build
 sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h