X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=90a84e6e6c697cac7e483a7ad66ecfb6cc63616b;hb=b70504598c5f392d728cd92b554f3c1efcb0477c;hp=6295a135ca409586b5afb379890fc6be63707d42;hpb=ad057c0a09d462cb697565141ba46cc446f1a95f;p=packages%2Fffmpeg.git

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6295a13..90a84e6 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -7,12 +7,12 @@
 #
 # Conditional build:
 %bcond_with	bootstrap	# disable features to able to build without installed ffmpeg
-%bcond_with	nonfree		# non free options of package (currently: aacplus, faac, fdk_aac, nvenc)
-%bcond_with	aacplus		# AAC+ encoding via libaacplus (requires nonfree)
+%bcond_with	nonfree		# non free options of package (currently: faac, fdk_aac, nvenc)
 %bcond_with	fdk_aac		# AAC de/encoding via libfdk_aac (requires nonfree)
 %bcond_with	faac		# faac (requires nonfree)
 %bcond_without	bs2b		# BS2B audio filter support
 %bcond_without	caca		# textual display using libcaca
+%bcond_without	chromaprint	# audio fingerprinting with chromaprint
 %bcond_without	dcadec		# DCA decoding via libdcadec
 %bcond_without	decklink	# Blackmagic DeskLink output support
 %bcond_without	flite		# flite voice synthesis support
@@ -30,12 +30,13 @@
 %bcond_without	opengl		# OpenGL rendering support
 %bcond_with	openh264	# OpenH264 H.264 encoder
 %bcond_without	pulseaudio	# PulseAudio input support
-%bcond_without	quvi		# quvi input support
+%bcond_without	rubberband	# rubberband filter
 %bcond_without	shine		# shine fixed-point MP3 encoder
 %bcond_without	snappy		# Snappy compression support (needed for hap encoding)
 %bcond_without	ssh		# SFTP protocol support via libssh
 %bcond_with	smb		# SMB support via libsmbclient
 %bcond_without	soxr		# SoX Resampler support
+%bcond_with	tesseract	# OCR filter based on Tesseract
 %bcond_without	x264		# H.264 x264 encoder
 %bcond_without	x265		# H.265/HEVC x265 encoder
 %bcond_without	utvideo		# Ut Video decoder
@@ -44,6 +45,7 @@
 %bcond_without	vpx		# VP8, a high-quality video codec
 %bcond_without	wavpack		# wavpack encoding support
 %bcond_without	webp		# WebP encoding support
+%bcond_without	zimg		# zscale filter based on z.lib
 %bcond_without	zmq		# 0MQ message passing
 %bcond_without	zvbi		# teletext via libzvbi
 %bcond_without	doc		# don't build docs
@@ -62,21 +64,19 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	2.8.3
-Release:	1
+Version:	3.0
+Release:	2
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, x265, 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://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	2af2723dd53364ac0635efd20cf6e34e
+# Source0-md5:	ef9b6634bb7c920efc940b4d55adf7b2
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-Patch0:		%{name}-kvazaar.patch
-Patch1:		libvpx-1.5.patch
-Patch2:		%{name}-utvideo.patch
+Patch0:		%{name}-utvideo.patch
 URL:		http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
 %{?with_openal:BuildRequires:	OpenAL-devel >= 1.1}
@@ -86,7 +86,7 @@ BuildRequires:	SDL-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	celt-devel >= 0.11.0
-%{?with_dcadec:BuildRequires:	dcadec-devel}
+%{?with_dcadec:BuildRequires:	dcadec-devel >= 0.2.0}
 %{?with_faac:BuildRequires:	faac-devel}
 %{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
 %{?with_flite:BuildRequires:	flite-devel >= 1.4}
@@ -102,22 +102,21 @@ BuildRequires:	gcc >= 5:3.3.2-3
 BuildRequires:	gmp-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	jack-audio-connection-kit-devel
-%{?with_kvazaar:BuildRequires:	kvazaar-devel >= 0.7}
+%{?with_kvazaar:BuildRequires:	kvazaar-devel >= 0.8.1}
 %{?with_ladspa:BuildRequires:	ladspa-devel}
 BuildRequires:	lame-libs-devel >= 3.98.3
-%{?with_aacplus:BuildRequires:	libaacplus-devel >= 2.0.0}
 BuildRequires:	libass-devel
 BuildRequires:	libavc1394-devel
 %{?with_bs2b:BuildRequires:	libbs2b-devel}
 BuildRequires:	libbluray-devel
 %{?with_caca:BuildRequires:	libcaca-devel}
 BuildRequires:	libcdio-paranoia-devel >= 0.90-2
+%{?with_chromaprint:BuildRequires:	libchromaprint-devel}
 BuildRequires:	libdc1394-devel >= 2
 BuildRequires:	libgsm-devel
 BuildRequires:	libiec61883-devel
 BuildRequires:	libmodplug-devel
 BuildRequires:	libnut-devel
-%{?with_quvi:BuildRequires:	libquvi-devel}
 BuildRequires:	libraw1394-devel >= 2
 BuildRequires:	librtmp-devel
 %{?with_ssh:BuildRequires:	libssh-devel}
@@ -154,18 +153,19 @@ BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 %{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 BuildRequires:	rpmbuild(macros) >= 1.470
+%{?with_rubberband:BuildRequires:	rubberband-devel >= 1.8.1}
 BuildRequires:	schroedinger-devel
 %{?with_shine:BuildRequires:	shine-devel >= 3.0.0}
 %{?with_snappy:BuildRequires:	snappy-devel}
 %{?with_soxr:BuildRequires:	soxr-devel}
 BuildRequires:	speex-devel >= 1:1.2-rc1
+%{?with_tesseract:BuildRequires:	tesseract-devel}
 %{?with_doc:BuildRequires:	tetex}
 %{?with_doc:BuildRequires:	texi2html}
 %{?with_doc:BuildRequires:	texinfo}
 BuildRequires:	twolame-devel
-%{?with_utvideo:BuildRequires:	utvideo-devel >= 15.3}
+%{?with_utvideo:BuildRequires:	utvideo-devel >= 15.4}
 %{?with_vidstab:BuildRequires:	vid.stab-devel >= 0.98}
-BuildRequires:	vo-aacenc-devel
 BuildRequires:	vo-amrwbenc-devel
 %{?with_wavpack:BuildRequires:	wavpack-devel}
 %{?with_ilbc:BuildRequires:	webrtc-libilbc-devel}
@@ -176,13 +176,14 @@ BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xvid-devel >= 1:1.1.0
 BuildRequires:	yasm
 %{?with_zmq:BuildRequires:	zeromq-devel}
-%{?with_zvbi:BuildRequires:	zvbi-devel}
+%{?with_zimg:BuildRequires:	zimg-devel}
 BuildRequires:	zlib-devel
+%{?with_zvbi:BuildRequires:	zvbi-devel}
 %{?with_autoreqdep:BuildConflicts:	libpostproc}
 # overflows maximum hash table size
 BuildConflicts:	pdksh < 5.2.14-57
 Requires:	%{name}-libs = %{version}-%{release}
-%{?with_utvideo:Requires:	utvideo >= 15.3}
+%{?with_utvideo:Requires:	utvideo >= 15.4}
 %{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xvid >= 1:1.1.0
 Obsoletes:	libpostproc
@@ -221,6 +222,7 @@ Group:		Libraries
 Requires:	gnutls-libs >= 3.0.20
 %endif
 %{?with_vpx:Requires:	libvpx >= 1.3.0}
+%{?with_rubberband:Requires:	rubberband-libs >= 1.8.1}
 
 %description libs
 This package contains the ffmpeg shared libraries:
@@ -250,7 +252,7 @@ Requires:	SDL-devel >= 1.2.1
 Requires:	alsa-lib-devel
 Requires:	bzip2-devel
 Requires:	celt-devel >= 0.11.0
-%{?with_dcadec:Requires:	dcadec-devel}
+%{?with_dcadec:Requires:	dcadec-devel >= 0.2.0}
 %{?with_faac:Requires:	faac-devel}
 %{?with_fdk_aac:Requires:	fdk-aac-devel}
 %{?with_flite:Requires:	flite-devel >= 1.4}
@@ -261,19 +263,18 @@ Requires:	freetype-devel
 Requires:	jack-audio-connection-kit-devel
 %{?with_kvazaar:Requires:	kvazaar-devel >= 0.7}
 Requires:	lame-libs-devel >= 3.98.3
-%{?with_aacplus:Requires:	libaacplus-devel >= 2.0.0}
 Requires:	libass-devel
 Requires:	libavc1394-devel
 Requires:	libbluray-devel
 %{?with_bs2b:Requires:	libbs2b-devel}
 %{?with_caca:Requires:	libcaca-devel}
 Requires:	libcdio-paranoia-devel >= 0.90-2
+%{?with_chromaprint:Requires:	libchromaprint-devel}
 Requires:	libdc1394-devel >= 2
 Requires:	libgsm-devel
 Requires:	libiec61883-devel
 Requires:	libmodplug-devel
 Requires:	libnut-devel
-%{?with_quvi:Requires:	libquvi-devel}
 Requires:	libraw1394-devel >= 2
 Requires:	librtmp-devel
 %{?with_smb:Requires:	libsmbclient-devel}
@@ -289,15 +290,16 @@ Requires:	opencore-amr-devel
 %{?with_opencv:Requires:	opencv-devel}
 %{?with_openh264:Requires:	openh264-devel >= 1.3}
 Requires:	openjpeg-devel >= 1.5
+%{?with_rubberband:Requires:	rubberband-devel >= 1.8.1}
 Requires:	schroedinger-devel
 %{?with_shine:Requires:	shine-devel >= 3.0.0}
 %{?with_snappy:Requires:	snappy-devel}
 %{?with_soxr:Requires:	soxr-devel}
 Requires:	speex-devel >= 1:1.2-rc1
+%{?with_tesseract:Requires:	tesseract-devel}
 Requires:	twolame-devel
-%{?with_utvideo:Requires:	utvideo-devel >= 15.3}
+%{?with_utvideo:Requires:	utvideo-devel >= 15.4}
 %{?with_vidstab:Requires:	vid.stab-devel >= 0.98}
-Requires:	vo-aacenc-devel
 Requires:	vo-amrwbenc-devel
 %{?with_wavpack:Requires:	wavpack-devel}
 %{?with_ilbc:Requires:	webrtc-libilbc-devel}
@@ -306,6 +308,7 @@ Requires:	xorg-lib-libXext-devel
 Requires:	xorg-lib-libXfixes-devel
 Requires:	xvid-devel >= 1:1.1.0
 %{?with_zmq:Requires:	zeromq-devel}
+%{?with_zimg:Requires:	zimg-devel}
 Requires:	zlib-devel
 Obsoletes:	libpostproc-devel
 
@@ -381,8 +384,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -466,6 +467,7 @@ EOF
 	%{!?with_doc:--disable-doc} \
 	--enable-avfilter \
 	--enable-avresample \
+	%{?with_chromaprint:--enable-chromaprint} \
 	%{?with_decklink:--enable-decklink} \
 	--enable-gnutls \
 	--enable-gpl \
@@ -500,8 +502,8 @@ EOF
 	--enable-libopenjpeg \
 	--enable-libopus \
 	%{?with_pulseaudio:--enable-libpulse} \
-	%{?with_quvi:--enable-libquvi} \
 	--enable-librtmp \
+	%{?with_rubberband:--enable-librubberband} \
 	--enable-libschroedinger \
 	%{?with_shine:--enable-libshine} \
 	%{?with_smb:--enable-libsmbclient} \
@@ -509,12 +511,12 @@ EOF
 	%{?with_soxr:--enable-libsoxr} \
 	--enable-libspeex \
 	%{?with_ssh:--enable-libssh} \
+	%{?with_tesseract:--enable-libtesseract} \
 	--enable-libtheora \
 	--enable-libtwolame \
 	%{?with_utvideo:--enable-libutvideo} \
 	--enable-libv4l2 \
 	%{?with_vidstab:--enable-libvidstab} \
-	--enable-libvo-aacenc \
 	--enable-libvo-amrwbenc \
 	--enable-libvorbis \
 	%{?with_vpx:--enable-libvpx} \
@@ -524,6 +526,7 @@ EOF
 	%{?with_x265:--enable-libx265} \
 	--enable-libxavs \
 	--enable-libxvid \
+	%{?with_zimg:--enable-libzimg} \
 	%{?with_zmq:--enable-libzmq} \
 	%{?with_zvbi:--enable-libzvbi} \
 	%{?with_openal:--enable-openal} \
@@ -546,7 +549,6 @@ EOF
 %endif
 %if %{with nonfree}
 	--enable-nonfree \
-	%{?with_aacplus:--enable-libaacplus} \
 	%{?with_faac:--enable-libfaac} \
 	%{?with_fdk_aac:--enable-libfdk-aac} \
 	%{?with_nvenc:--enable-nvenc} \
@@ -653,23 +655,23 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.56
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.57
 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.56
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.57
 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.5
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.6
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.56
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.57
 %attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavresample.so.2
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.3
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.54
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.55
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.53
+%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.54
 %attr(755,root,root) %{_libdir}/libswresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswresample.so.1
+%attr(755,root,root) %ghost %{_libdir}/libswresample.so.2
 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.3
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.4
 
 %files devel
 %defattr(644,root,root,755)