- up to 20080930

Changed files:
    ffmpeg.spec -> 1.170

diff --git a/ffmpeg.spec b/ffmpeg.spec
index b47ef60999b3ddc65215b4b30c6f3895b9a2252c..39a33c28d0dce332e85f8f63fbc561a4dce72316 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -6,7 +6,7 @@
 %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-09-08
+%define                _snap   2008-09-30
 %define                snap    %(echo %{_snap} | tr -d -)
 %define                rel 1
 Summary:       Realtime audio/video encoder and streaming server
@@ -20,11 +20,12 @@ 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: 9b2ef1d3f550420264124836107fc008
+# Source0-md5: d85a173fa0843706e4f943b84046db84
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-img_convert_symbol.patch
+Patch1:                %{name}-x264.patch
 URL:           http://ffmpeg.mplayerhq.hu/
 BuildRequires: SDL-devel
 %if %{with amr}
@@ -45,7 +46,7 @@ BuildRequires:        lame-libs-devel
 BuildRequires: libdc1394-devel
 BuildRequires: libgsm-devel
 BuildRequires: libraw1394-devel
-BuildRequires: libtheora-devel >= 1.0-0.alpha7
+BuildRequires: libtheora-devel >= 1.0-0.beta3
 BuildRequires: libtool >= 2:1.4d-3
 BuildRequires: libvorbis-devel
 BuildRequires: libx264-devel >= 0.1.2-1.20080801
@@ -203,6 +204,7 @@ 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-config
@@ -367,12 +369,12 @@ fi
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.51
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.52
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.52
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.49
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.51
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.0
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.[0-9]
 %dir %{_libdir}/vhook
 %attr(755,root,root) %{_libdir}/vhook/drawtext.so
 %attr(755,root,root) %{_libdir}/vhook/fish.so