X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=4ceee0ea0099cf056dc0136fe7c1abc0813d50c6;hb=a09e741c0391106effb339a2ff2b2664d6f9dc06;hp=7fa4c63024dc62ea530e48e9ab347cd0aceed20d;hpb=ef3c0513a3a8b0df8b9fe6b01028e8674f937596;p=packages%2Fffmpeg.git

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7fa4c63..4ceee0e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,70 +1,122 @@
-# TODO
-# - libnut enabled   no (http://www.nut-container.org/)
 #
-# Conditional build:
-%bcond_with	amr		# 3GPP Adaptive Multi Rate (AMR) codec support; makes package non-distributable
-%bcond_without	autoreqdep	# don't care about package name deps generated by rpm
-%bcond_without	imlib2		# don't build imlib2 vhook module
+# How to deal with ffmpeg/opencv checken-egg problem:
+#	1. make-request -r --without opencv ffmpeg.spec
+#	2. make-request -r opencv.spec
+#	3. bump release of ffmpeg.spec
+#	4. make-request -r ffmpeg.spec
 #
-%define		_snap	2008-08-22
-%define		snap	%(echo %{_snap} | tr -d -)
-%define		rel 4
-Summary:	Realtime audio/video encoder and streaming server
-Summary(pl.UTF-8):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
+# Conditional build:
+%bcond_with	nonfree		# non free options of package (currently: faac)
+%bcond_with	aacplus		# AAC+ encoding via libaacplus (requires nonfree)
+%bcond_with	fdk_aac		# AAC encoding via libfdk_aac (requires nonfree)
+%bcond_without	caca		# textual display using libcaca
+%bcond_without	flite		# flite voice synthesis support
+%bcond_without	frei0r		# frei0r video filtering
+%bcond_without	ilbc		# iLBC de/encoding via WebRTC libilbc
+%bcond_without	openal		# OpenAL 1.1 capture support
+%bcond_without	opencv		# OpenCV video filtering
+%bcond_without	pulseaudio	# PulseAudio input support
+%bcond_without	x264		# x264 encoder
+%bcond_without	utvideo		# Ut Video decoder
+%bcond_without	va		# VAAPI (Video Acceleration API)
+%bcond_without	vpx		# VP8, a high-quality video codec
+%bcond_without	doc		# don't build docs
+
+Summary:	FFmpeg - a very fast video and audio converter
+Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	0.4.9
-Release:	4.%{snap}.%{rel}
+Version:	1.0.1
+Release:	1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (postprocessing, ac3, xvid, x264, faad)
-License:	GPL v2+ with LGPL v2.1+ parts
+# (postprocessing, some filters, x264, xavs, xvid, x11grab)
+# using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
+License:	GPL v3+ with LGPL v3+ 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:	573ff56bb619391fbc13ecde23389b45
+Source0:	http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
+# Source0-md5:	dbbb88ce5525dea22b24aaa098a9bcc2
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-Patch0:		%{name}-img_convert_symbol.patch
-URL:		http://ffmpeg.mplayerhq.hu/
-BuildRequires:	SDL-devel
-%if %{with amr}
-BuildRequires:	amrnb-devel >= 6.1.0.4
-BuildRequires:	amrwb-devel >= 7.0.0.1
-%endif
-BuildRequires:	dirac-devel
-BuildRequires:	faac-devel
-BuildRequires:	faad2-devel
+Patch0:		%{name}-gsm.patch
+Patch1:		%{name}-opencv24.patch
+Patch2:		%{name}-openjpeg.patch
+Patch3:		%{name}-cdio-paranoia.patch
+URL:		http://www.ffmpeg.org/
+%{?with_openal:BuildRequires:	OpenAL-devel}
+BuildRequires:	SDL-devel >= 1.2.1
+BuildRequires:	alsa-lib-devel
+BuildRequires:	bzip2-devel
+BuildRequires:	celt-devel >= 0.11.0
+%{?with_nonfree:BuildRequires:	faac-devel}
+%{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
+%{?with_flite:BuildRequires:	flite-devel >= 1.4}
+BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel
+%{?with_frei0r:BuildRequires:	frei0r-devel}
 %ifarch ppc
 # require version with altivec support fixed
 BuildRequires:	gcc >= 5:3.3.2-3
 %endif
-BuildRequires:	a52dec-libs-devel
-%{?with_imlib2:BuildRequires:	imlib2-devel >= 1.3.0}
-BuildRequires:	lame-libs-devel
-BuildRequires:	libdc1394-devel
+BuildRequires:	gnutls-devel
+BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:	lame-libs-devel >= 3.98.3
+%{?with_aacplus:BuildRequires:	libaacplus-devel >= 2.0.0}
+BuildRequires:	libass-devel
+BuildRequires:	libavc1394-devel
+BuildRequires:	libbluray-devel
+%{?with_caca:BuildRequires:	libcaca-devel}
+BuildRequires:	libcdio-paranoia-devel >= 0.90-2
+BuildRequires:	libdc1394-devel >= 2
 BuildRequires:	libgsm-devel
-BuildRequires:	libraw1394-devel
-BuildRequires:	libtheora-devel >= 1.0-0.alpha7
+BuildRequires:	libiec61883-devel
+BuildRequires:	libmodplug-devel
+BuildRequires:	libnut-devel
+BuildRequires:	libraw1394-devel >= 2
+BuildRequires:	librtmp-devel
+BuildRequires:	libtheora-devel >= 1.0-0.beta3
 BuildRequires:	libtool >= 2:1.4d-3
+BuildRequires:	libv4l-devel
+%{?with_va:BuildRequires:	libva-devel >= 1.0.3}
+BuildRequires:	libvdpau-devel >= 0.2
 BuildRequires:	libvorbis-devel
-BuildRequires:	libx264-devel >= 0.1.2-1.20080801
+%{?with_vpx:BuildRequires:	libvpx-devel >= 0.9.6}
+# X264_BUILD >= 118
+%{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20111212_2245}
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires:	nasm
 %endif
 %endif
+BuildRequires:	opencore-amr-devel
+%{?with_opencv:BuildRequires:	opencv-devel}
+BuildRequires:	openjpeg-devel >= 1.5
+BuildRequires:	opus-devel
+BuildRequires:	perl-Encode
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	schroedinger-devel
-BuildRequires:	tetex
-BuildRequires:	texinfo
-%{?with_amr:BuildRequires:	unzip}
+BuildRequires:	speex-devel >= 1:1.2-rc1
+%{?with_doc:BuildRequires:	tetex}
+%{?with_doc:BuildRequires:	texi2html}
+%{?with_doc:BuildRequires:	texinfo}
+BuildRequires:	twolame-devel
+%{?with_utvideo:BuildRequires:	utvideo-devel}
+BuildRequires:	vo-aacenc-devel
+BuildRequires:	vo-amrwbenc-devel
+%{?with_ilbc:BuildRequires:	webrtc-libilbc-devel}
+BuildRequires:	xavs-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xvid-devel >= 1:1.1.0
+BuildRequires:	yasm
 BuildRequires:	zlib-devel
 %{?with_autoreqdep:BuildConflicts:	libpostproc}
+# overflows maximum hash table size
+BuildConflicts:	pdksh < 5.2.14-57
 Requires:	%{name}-libs = %{version}-%{release}
+%{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xvid >= 1:1.1.0
 Obsoletes:	libpostproc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -78,21 +130,20 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # -mmmx is needed to enable <mmintrin.h> code.
 %define		specflags_i586	-mmmx
 %define		specflags_i686	-mmmx
+%define		specflags_ppc	-fPIC
 
 %description
-ffmpeg is a hyper fast realtime audio/video encoder and streaming
-server. It can grab from a standard Video4Linux video source and
-convert it into several file formats based on DCT/motion compensation
-encoding. Sound is compressed in MPEG audio layer 2 or using an AC3
-compatible stream.
+FFmpeg is a complete solution to record, convert and stream audio and
+video. It is a command line tool to convert one video file format to
+another. It also supports grabbing and encoding in real time from a TV
+card.
 
 %description -l pl.UTF-8
-ffmpeg jest bardzo szybkim koderem audio/wideo w czasie rzeczywistym
-oraz serwerem strumieni multimedialnych. ffmpeg potrafi zrzucać dane
-ze standardowego urządzenia Video4Linux i przekonwertować je w kilka
-formatów plików bazujących na kodowaniu DCT/kompensacji ruchu. Dźwięk
-jest kompresowany do strumienia MPEG audio layer 2 lub używając
-strumienia kompatybilnego z AC3.
+FFmpeg to kompletne rozwiązanie nagrywania, konwersji i transmisji
+strumieni dźwięku i obrazu. Jest to działające z linii poleceń
+narzędzie do konwersji obrazu z jednego formatu do innego. Obsługuje
+także przechwytywanie i kodowanie w czasie rzeczywistym z karty
+telewizyjnej.
 
 %package libs
 Summary:	ffmpeg libraries
@@ -100,28 +151,67 @@ Summary(pl.UTF-8):	Biblioteki ffmpeg
 Group:		Libraries
 
 %description libs
-This package contains ffmpeg shared libraries.
+This package contains the ffmpeg shared libraries:
+- the codec library (libavcodec). It supports most existing encoding
+  formats (MPEG, DivX, MPEG4, AC3, DV...),
+- demuxer library (libavformat). It supports most existing file
+  formats (AVI, MPEG, OGG, Matroska, ASF...),
+- video postprocessing library (libpostproc).
 
 %description libs -l pl.UTF-8
-Ten pakiet zawiera biblioteki współdzielone ffmpeg.
+Ten pakiet zawiera biblioteki współdzielone ffmpeg:
+- bibliotekę kodeków (libavcodec); obsługuje większość istniejących
+  formatów kodowania (MPEG, DivX, MPEG4, AC3, DV...),
+- bibliotekę demuksera (libavformat); obsługuje większość istniejących
+  formatów plików (AVI, MPEG, OGG, Matroska, ASF...),
+- bibliotekę postprocessingu (libpostproc).
 
 %package devel
 Summary:	ffmpeg header files
 Summary(pl.UTF-8):	Pliki nagłówkowe ffmpeg
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-# for libavcodec:
-%if %{with amr}
-Requires:	amrnb-devel
-Requires:	amrwb-devel >= 5.3.0
-%endif
-Requires:	faac-devel
-Requires:	faad2-devel
-Requires:	lame-libs-devel
+# Libs.private from *.pc (unreasonably they are all the same)
+Requires:	SDL-devel >= 1.2.1
+Requires:	alsa-lib-devel
+Requires:	bzip2-devel
+Requires:	celt-devel >= 0.11.0
+%{?with_nonfree:Requires:	faac-devel}
+%{?with_fdk_aac:Requires:	fdk-aac-devel}
+Requires:	fontconfig-devel
+Requires:	freetype-devel
+Requires:	jack-audio-connection-kit-devel
+%{?with_flite:Requires:	flite-devel >= 1.4}
+Requires:	lame-libs-devel >= 3.98.3
+%{?with_aacplus:Requires:	libaacplus-devel >= 2.0.0}
+Requires:	libass-devel
+Requires:	libavc1394-devel
+Requires:	libbluray-devel
+Requires:	libcdio-paranoia-devel >= 0.90-2
+Requires:	libdc1394-devel >= 2
 Requires:	libgsm-devel
-Requires:	libtheora-devel >= 1.0-0.alpha7
+Requires:	libiec61883-devel
+Requires:	libmodplug-devel
+Requires:	libnut-devel
+Requires:	libraw1394-devel >= 2
+Requires:	librtmp-devel
+Requires:	libtheora-devel >= 1.0-0.beta3
+%{?with_va:Requires:	libva-devel >= 1.0.3}
 Requires:	libvorbis-devel
-Requires:	libx264-devel >= 0.1.2-1.20060828_2245.1
+%{?with_vpx:Requires:	libvpx-devel >= 0.9.6}
+%{?with_x264:Requires:	libx264-devel >= 0.1.3-1.20110625_2245}
+Requires:	opencore-amr-devel
+%{?with_opencv:Requires:	opencv-devel}
+Requires:	openjpeg-devel >= 1.5
+Requires:	schroedinger-devel
+Requires:	speex-devel >= 1:1.2-rc1
+Requires:	twolame-devel
+Requires:	vo-aacenc-devel
+Requires:	vo-amrwbenc-devel
+%{?with_ilbc:Requires:	webrtc-libilbc-devel}
+Requires:	xavs-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXfixes-devel
 Requires:	xvid-devel >= 1:1.1.0
 Requires:	zlib-devel
 Obsoletes:	libpostproc-devel
@@ -160,24 +250,6 @@ FFplay to bardzo prosty i przenośny odtwarzacz mediów używający
 bibliotek FFmpeg oraz biblioteki SDL. Jest używany głównie do
 testowania różnych API FFmpeg.
 
-%package vhook-imlib2
-Summary:	imlib2 based hook
-Summary(pl.UTF-8):	Moduł przejściowy oparty o imlib2
-Group:		Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description vhook-imlib2
-This module implements a text overlay for a video image. Currently it
-supports a fixed overlay or reading the text from a file. The string
-is passed through strftime so that it is easy to imprint the date and
-time onto the image.
-
-%description vhook-imlib2 -l pl.UTF-8
-Ten moduł implementuje tekstową nakładkę dla obrazu. Aktualnie
-obsługuje stałą nakładkę lub wczytywanie tekstu z pliku. Łańcuch jest
-przepuszczany przez strftime, więc łatwo umieścić datę i czas na
-obrazie.
-
 %package ffserver
 Summary:	FFserver video server
 Summary(pl.UTF-8):	FFserver - serwer strumieni obrazu
@@ -200,11 +272,14 @@ przeszłości dla każdego źródła na żywo, pod warunkiem odpowiednio
 dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 
 %prep
-%setup -q -n %{name}-export-%{_snap}
+%setup -q
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
-# package the grep result for mplayer, the result formatted as mplayer/configure
-cat <<EOF > ffmpeg-config
+# package the grep result for mplayer, the result formatted as ./mplayer/configure
+cat <<EOF > ffmpeg-avconfig
 #! /bin/sh
 _libavdecoders_all="`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`"
 _libavencoders_all="`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]'`"
@@ -214,7 +289,7 @@ _libavdemuxers_all="`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' libavf
 _libavmuxers_all="`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`"
 _libavprotocols_all="`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' libavformat/allformats.c | tr '[a-z]' '[A-Z]'`"
 EOF
-cat <<'EOF' >> ffmpeg-config
+cat <<'EOF' >> ffmpeg-avconfig
 
 case "$1" in
 --decoders)
@@ -266,44 +341,83 @@ EOF
 	--libdir=%{_libdir} \
 	--shlibdir=%{_libdir} \
 	--mandir=%{_mandir} \
-	--cc="%{__cc}" \
 	--extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}" \
-	--extra-ldflags="%{rpmldflags}" \
+	--extra-ldflags="%{rpmcflags} %{rpmldflags}" \
+	--cc="%{__cc}" \
 	--disable-debug \
 	--disable-optimizations \
 	--disable-stripping \
+	--enable-avfilter \
+	--enable-avresample \
+	--enable-gnutls \
 	--enable-gpl \
-	--enable-liba52 \
-	--enable-liba52bin \
-	--enable-libfaac \
-	--enable-libfaad \
-	--enable-libfaadbin \
+	--enable-version3 \
+	--enable-fontconfig \
+	%{?with_frei0r:--enable-frei0r} \
+	%{?with_aacplus:--enable-libaacplus} \
+	--enable-libass \
+	--enable-libbluray \
+	%{?with_libcaca:--enable-libcaca} \
+	--enable-libcelt \
+	--enable-libcdio \
 	--enable-libdc1394 \
-	--enable-libdirac \
+	%{?with_fdk_aac:--enable-libfdk-aac} \
+	%{?with_flite:--enable-libflite} \
+	--enable-libfreetype \
 	--enable-libgsm \
+	--enable-libiec61883 \
+	%{?with_ilbc:--enable-libilbc} \
+	--enable-libmodplug \
 	--enable-libmp3lame \
+	--enable-libnut \
+	--enable-libopencore-amrnb \
+	--enable-libopencore-amrwb \
+	%{?with_opencv:--enable-libopencv} \
+	--enable-libopenjpeg \
+	--enable-libopus \
+	%{?with_pulseaudio:--enable-libpulse} \
+	--enable-librtmp \
 	--enable-libschroedinger \
+	--enable-libspeex \
 	--enable-libtheora \
+	--enable-libtwolame \
+	%{?with_utvideo:--enable-libutvideo} \
+	--enable-libv4l2 \
+	--enable-libvo-aacenc \
+	--enable-libvo-amrwbenc \
 	--enable-libvorbis \
-	--enable-libx264 \
+	%{?with_vpx:--enable-libvpx} \
+	%{?with_x264:--enable-libx264} \
+	--enable-libxavs \
 	--enable-libxvid \
+	%{?with_openal:--enable-openal} \
 	--enable-postproc \
 	--enable-pthreads \
 	--enable-shared \
 	--enable-swscale \
+	%{?with_va:--enable-vaapi} \
+	--enable-vdpau \
+	--enable-x11grab \
 %ifnarch %{ix86} %{x8664}
 	--disable-mmx \
 %endif
 %ifarch i386 i486
 	--disable-mmx \
 %endif
-%if %{with amr}
+%if %{with nonfree}
 	--enable-nonfree \
-	--enable-libamr-nb \
-	--enable-libamr-wb
+	--enable-libfaac \
 %endif
+	--enable-runtime-cpudetect
+
+# force oldscaler build
+%{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
 
-%{__make}
+%{__make} \
+	V=1
+
+# CC_O to add -c to commandline. makefile should be patched
+%{__make} tools/qt-faststart V=1 CC_O='-c -o $@'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -312,25 +426,38 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.
 	$RPM_BUILD_ROOT/var/{cache,log}/ffserver
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-install config.h $RPM_BUILD_ROOT%{_includedir}/ffmpeg
-install libavutil/intreadwrite.h $RPM_BUILD_ROOT%{_includedir}/libavutil
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf
+	DESTDIR=$RPM_BUILD_ROOT \
+	V=1
+
+cp -a config.h $RPM_BUILD_ROOT%{_includedir}/ffmpeg
+cp -a libavutil/intreadwrite.h $RPM_BUILD_ROOT%{_includedir}/libavutil
+cp -a libavutil/bswap.h $RPM_BUILD_ROOT%{_includedir}/libavutil
+cp -a libavutil/common.h $RPM_BUILD_ROOT%{_includedir}/libavutil
+cp -a libavutil/mem.h $RPM_BUILD_ROOT%{_includedir}/libavutil
+for a in libavutil/*/bswap.h; do
+	install -D $a $RPM_BUILD_ROOT%{_includedir}/$a
+done
+cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat
+cp -a libavformat/avio.h $RPM_BUILD_ROOT%{_includedir}/libavformat
+# for lim-omx ffmpeg components
+cp -a libavcodec/audioconvert.h $RPM_BUILD_ROOT%{_includedir}/libavcodec
+
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf
 mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver
+install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 
 # install as ffmpeg-avconfig to avoid with possible programs looking for
 # ffmpeg-config and expecting --libs output from it which is not implemented
 # simple to do (by querying pkgconfig), but why?
-install ffmpeg-config $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
+install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs	-p /sbin/ldconfig
-%postun libs	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %pre ffserver
 %groupadd -g 167 ffserver
@@ -354,64 +481,86 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc Changelog README doc/*.html doc/TODO
+%doc CREDITS LICENSE MAINTAINERS README doc/{APIchanges,RELEASE_NOTES} %{?with_doc:doc/*.html}
 %attr(755,root,root) %{_bindir}/ffmpeg
-%{_mandir}/man1/ffmpeg.1*
+%attr(755,root,root) %{_bindir}/ffprobe
+%attr(755,root,root) %{_bindir}/qt-faststart
+%dir %{_datadir}/ffmpeg
+%{_datadir}/ffmpeg/*.ffpreset
+%{_datadir}/ffmpeg/ffprobe.xsd
+%{?with_doc:%{_mandir}/man1/ffmpeg.1*}
+%{?with_doc:%{_mandir}/man1/ffprobe.1*}
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.54
 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.54
+%attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.3
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.54
+%attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.0
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.51
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.52
+%attr(755,root,root) %{_libdir}/libswresample.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libswresample.so.0
 %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
-%attr(755,root,root) %{_libdir}/vhook/null.so
-%attr(755,root,root) %{_libdir}/vhook/ppm.so
-%attr(755,root,root) %{_libdir}/vhook/watermark.so
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/optimization.txt
+%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
 %attr(755,root,root) %{_libdir}/libavcodec.so
 %attr(755,root,root) %{_libdir}/libavdevice.so
+%attr(755,root,root) %{_libdir}/libavfilter.so
 %attr(755,root,root) %{_libdir}/libavformat.so
+%attr(755,root,root) %{_libdir}/libavresample.so
 %attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so
+%attr(755,root,root) %{_libdir}/libswresample.so
 %attr(755,root,root) %{_libdir}/libswscale.so
-%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
 %{_includedir}/ffmpeg
 %{_includedir}/libavcodec
 %{_includedir}/libavdevice
+%{_includedir}/libavfilter
 %{_includedir}/libavformat
+%{_includedir}/libavresample
 %{_includedir}/libavutil
 %{_includedir}/libpostproc
+%{_includedir}/libswresample
 %{_includedir}/libswscale
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libavcodec.pc
+%{_pkgconfigdir}/libavdevice.pc
+%{_pkgconfigdir}/libavfilter.pc
+%{_pkgconfigdir}/libavformat.pc
+%{_pkgconfigdir}/libavresample.pc
+%{_pkgconfigdir}/libavutil.pc
+%{_pkgconfigdir}/libpostproc.pc
+%{_pkgconfigdir}/libswresample.pc
+%{_pkgconfigdir}/libswscale.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libavcodec.a
+%{_libdir}/libavdevice.a
+%{_libdir}/libavfilter.a
+%{_libdir}/libavformat.a
+%{_libdir}/libavresample.a
+%{_libdir}/libavutil.a
+%{_libdir}/libpostproc.a
+%{_libdir}/libswresample.a
+%{_libdir}/libswscale.a
 
 %files ffplay
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ffplay
-%{_mandir}/man1/ffplay.1*
-
-%if %{with imlib2}
-%files vhook-imlib2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vhook/imlib2.so
-%endif
+%{?with_doc:%{_mandir}/man1/ffplay.1*}
 
 %files ffserver
 %defattr(644,root,root,755)
@@ -419,6 +568,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ffserver
 %attr(755,root,root) %{_sbindir}/ffserver
 %attr(754,root,root) /etc/rc.d/init.d/ffserver
-%{_mandir}/man1/ffserver.1*
+%{?with_doc:%{_mandir}/man1/ffserver.1*}
 %dir %attr(770,root,ffserver) /var/cache/ffserver
 %dir %attr(770,root,ffserver) /var/log/ffserver