- update to 2008-01-31:

  - The "device" muxers and demuxers are now in a new libavdevice library
  - H.264 PAFF decoding
  - Nellymoser ASAO decoder
  - Beam Software SIFF demuxer and decoder
  - libvorbis Vorbis decoding removed in favor of native decoder
  - IntraX8 (J-Frame) subdecoder for WMV2 and VC-1
  - Ogg muxer
  - PC Paintbrush PCX decoder
  - Sun Rasterfile decoder
  - TechnoTrend PVA demuxer
  - Linux Media Labs MPEG-4 (LMLM4) demuxer
  - AVM2 (Flash 9) SWF muxer

Changed files:
    ffmpeg.spec -> 1.154

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 61881222b8c084f37432e19b0f9d9ecdc0f0d1df..4c9f5b6678af7e1434745945217510c9046f6fc0 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   2007-10-09
+%define                _snap   2008-01-31
 %define                snap    %(echo %{_snap} | tr -d -)
-%define                _rel 0.3
+%define                _rel 0.1
 Summary:       Realtime audio/video encoder and streaming server
 Summary(pl.UTF-8):     Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
 Name:          ffmpeg
@@ -20,13 +20,13 @@ 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: fcf10b6a1bf7d0ff1aa41e7d57c69e22
+# Source0-md5: 6c8b32545838a4090348b93d5195bd08
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-gcc4.patch
 Patch1:                %{name}-img_convert_symbol.patch
-Patch2:                %{name}-a52bin.patch
+#Patch2:               %{name}-a52bin.patch
 Patch3:                %{name}-pkgconfig-lib64.patch
 URL:           http://ffmpeg.mplayerhq.hu/
 BuildRequires: SDL-devel
@@ -45,7 +45,6 @@ BuildRequires:        gcc >= 5:3.3.2-3
 %{?with_imlib2:BuildRequires:  imlib2-devel >= 1.3.0}
 BuildRequires: lame-libs-devel
 BuildRequires: libgsm-devel
-BuildRequires: libogg-devel
 BuildRequires: libraw1394-devel
 BuildRequires: libtheora-devel >= 1.0-0.alpha7
 BuildRequires: libtool >= 2:1.4d-3
@@ -211,7 +210,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %build
 # notes:
 # - it's not autoconf configure
-# - --disable-debug, --disable-opts, tune=generic causes not to override our optflags
+# - --disable-debug, --disable-optimizations, tune=generic causes not to override our optflags
 ./configure \
        --arch=%{_target_base_arch} \
        --prefix=%{_prefix} \
@@ -226,7 +225,6 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
        --enable-libfaadbin \
        --enable-gpl \
        --enable-libgsm \
-       --enable-libogg \
        --enable-libtheora \
        --enable-libmp3lame \
        --enable-pp \
@@ -250,7 +248,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
        --extra-cflags="%{rpmcflags}" \
        --extra-ldflags="%{rpmldflags}" \
        --disable-debug \
-       --disable-opts \
+       --disable-optimizations \
 
 %{__make}
 
@@ -304,10 +302,17 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
+%attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
 %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
 %dir %{_libdir}/vhook
 %attr(755,root,root) %{_libdir}/vhook/drawtext.so
 %attr(755,root,root) %{_libdir}/vhook/fish.so
@@ -319,6 +324,7 @@ fi
 %defattr(644,root,root,755)
 %doc doc/optimization.txt
 %attr(755,root,root) %{_libdir}/libavcodec.so
+%attr(755,root,root) %{_libdir}/libavdevice.so
 %attr(755,root,root) %{_libdir}/libavformat.so
 %attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so