X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=a25415dbf9e57718d3913c43157cb5049d08f6e8;hb=399905f67ecd075784a1a2727f3b8574b956cc29;hp=5a4149478a924acc9f33462b413c759d5d4e31ea;hpb=c16de9f4740f2eee56139243dec1d3aa81b78516;p=packages%2Fffmpeg.git

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5a41494..a25415d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,31 +1,39 @@
 #
 # How to deal with ffmpeg/opencv checken-egg problem:
-#	1. make-request -r --without opencv ffmpeg.spec
+#	1. make-request -r --with bootstrap ffmpeg.spec
 #	2. make-request -r opencv.spec
 #	3. bump release of ffmpeg.spec
 #	4. make-request -r ffmpeg.spec
 #
 # Conditional build:
-%bcond_with	nonfree		# non free options of package (currently: faac)
+%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	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	dcadec		# DCA decoding via libdcadec
 %bcond_without	decklink	# Blackmagic DeskLink output support
 %bcond_without	flite		# flite voice synthesis support
 %bcond_without	frei0r		# frei0r video filtering
 %bcond_without	fribidi		# fribidi support
 %bcond_without	gme		# Game Music Emu support
 %bcond_without	ilbc		# iLBC de/encoding via WebRTC libilbc
+%bcond_without	kvazaar		# Kvazaar HEVC encoder support
 %bcond_without	ladspa		# LADSPA audio filtering
-%bcond_without	ssh		# SFTP protocol support via libssh
+%bcond_with	mfx		# MFX hardware acceleration support
+%bcond_with	nvenc		# NVIDIA NVENC support (requires nonfree)
 %bcond_without	openal		# OpenAL 1.1 capture support
 %bcond_without	opencl		# OpenCL 1.2 code
-%bcond_without	opengl		# OpenGL rendering support
 %bcond_without	opencv		# OpenCV video filtering
+%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	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_without	x264		# H.264 x264 encoder
@@ -39,6 +47,11 @@
 %bcond_without	zmq		# 0MQ message passing
 %bcond_without	zvbi		# teletext via libzvbi
 %bcond_without	doc		# don't build docs
+%bcond_with	tests		# "make check" (some tests fail as of 2.5)
+
+%if %{with bootstrap}
+%undefine	with_opencv
+%endif
 
 %ifnarch %{ix86} %{x8664} arm
 %undefine	with_x265
@@ -49,19 +62,20 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	2.4
-Release:	1
+Version:	2.8.4
+Release:	3
 # 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.bz2
-# Source0-md5:	89a9c464cdf572f9028285eee605454d
+Source0:	http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5:	ac1e3d6934f9efd8b67713677c7fd99f
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
-Patch0:		%{name}-opencv24.patch
+Patch0:		%{name}-kvazaar.patch
+Patch1:		%{name}-utvideo.patch
 URL:		http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
 %{?with_openal:BuildRequires:	OpenAL-devel >= 1.1}
@@ -71,7 +85,8 @@ 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_dcadec:BuildRequires:	dcadec-devel}
+%{?with_faac:BuildRequires:	faac-devel}
 %{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
 %{?with_flite:BuildRequires:	flite-devel >= 1.4}
 BuildRequires:	fontconfig-devel
@@ -83,8 +98,10 @@ BuildRequires:	freetype-devel
 # require version with altivec support fixed
 BuildRequires:	gcc >= 5:3.3.2-3
 %endif
+BuildRequires:	gmp-devel
 BuildRequires:	gnutls-devel
 BuildRequires:	jack-audio-connection-kit-devel
+%{?with_kvazaar:BuildRequires:	kvazaar-devel >= 0.7}
 %{?with_ladspa:BuildRequires:	ladspa-devel}
 BuildRequires:	lame-libs-devel >= 3.98.3
 %{?with_aacplus:BuildRequires:	libaacplus-devel >= 2.0.0}
@@ -99,7 +116,7 @@ BuildRequires:	libgsm-devel
 BuildRequires:	libiec61883-devel
 BuildRequires:	libmodplug-devel
 BuildRequires:	libnut-devel
-%{?with_quvi:BuildRequires:	libquvi-devel}
+%{?with_quvi:BuildRequires:	libquvi-0.4-devel}
 BuildRequires:	libraw1394-devel >= 2
 BuildRequires:	librtmp-devel
 %{?with_ssh:BuildRequires:	libssh-devel}
@@ -111,18 +128,24 @@ BuildRequires:	libv4l-devel
 BuildRequires:	libvdpau-devel >= 0.2
 BuildRequires:	libvorbis-devel
 %{?with_vpx:BuildRequires:	libvpx-devel >= 1.3.0}
-%{?with_webp:BuildRequires:	libwebp-devel}
+%{?with_webp:BuildRequires:	libwebp-devel >= 0.4.0}
 # X264_BUILD >= 118
 %{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20111212_2245}
-# X265_BUILD >= 17
-%{?with_x265:BuildRequires:	libx265-devel >= 1.3}
+# X265_BUILD >= 57
+%{?with_x265:BuildRequires:	libx265-devel >= 1.3-0.20150610.1}
+# libxcb xcb-shm xcb-xfixes xcb-shape
+BuildRequires:	libxcb-devel >= 1.4
+%{?with_mfx:BuildRequires:	mfx_dispatch-devel}
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires:	nasm
 %endif
 %endif
+# which package?
+#%{?with_nvenc:BuildRequires:	NVIDIA-NVENC-API}
 BuildRequires:	opencore-amr-devel
 %{?with_opencv:BuildRequires:	opencv-devel}
+%{?with_openh264:BuildRequires:	openh264-devel >= 1.3}
 BuildRequires:	openjpeg-devel >= 1.5
 BuildRequires:	opus-devel
 BuildRequires:	perl-Encode
@@ -132,13 +155,14 @@ BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.470
 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_doc:BuildRequires:	tetex}
 %{?with_doc:BuildRequires:	texi2html}
 %{?with_doc:BuildRequires:	texinfo}
 BuildRequires:	twolame-devel
-%{?with_utvideo:BuildRequires:	utvideo-devel >= 12}
+%{?with_utvideo:BuildRequires:	utvideo-devel >= 15.3}
 %{?with_vidstab:BuildRequires:	vid.stab-devel >= 0.98}
 BuildRequires:	vo-aacenc-devel
 BuildRequires:	vo-amrwbenc-devel
@@ -157,7 +181,7 @@ BuildRequires:	zlib-devel
 # overflows maximum hash table size
 BuildConflicts:	pdksh < 5.2.14-57
 Requires:	%{name}-libs = %{version}-%{release}
-%{?with_utvideo:Requires:	utvideo >= 12}
+%{?with_utvideo:Requires:	utvideo >= 15.3}
 %{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xvid >= 1:1.1.0
 Obsoletes:	libpostproc
@@ -225,7 +249,8 @@ 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_dcadec:Requires:	dcadec-devel}
+%{?with_faac:Requires:	faac-devel}
 %{?with_fdk_aac:Requires:	fdk-aac-devel}
 %{?with_flite:Requires:	flite-devel >= 1.4}
 Requires:	fontconfig-devel
@@ -233,6 +258,7 @@ Requires:	freetype-devel
 %{?with_fribidi:Requires:	fribidi-devel}
 %{?with_gme:Requires:	game-music-emu-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
@@ -246,7 +272,7 @@ Requires:	libgsm-devel
 Requires:	libiec61883-devel
 Requires:	libmodplug-devel
 Requires:	libnut-devel
-%{?with_quvi:Requires:	libquvi-devel}
+%{?with_quvi:Requires:	libquvi-0.4-devel}
 Requires:	libraw1394-devel >= 2
 Requires:	librtmp-devel
 %{?with_smb:Requires:	libsmbclient-devel}
@@ -254,18 +280,21 @@ Requires:	libtheora-devel >= 1.0-0.beta3
 %{?with_va:Requires:	libva-devel >= 1.0.3}
 Requires:	libvorbis-devel
 %{?with_vpx:Requires:	libvpx-devel >= 1.3.0}
-%{?with_webp:Requires:	libwebp-devel}
+%{?with_webp:Requires:	libwebp-devel >= 0.4.0}
 %{?with_x264:Requires:	libx264-devel >= 0.1.3-1.20110625_2245}
-%{?with_x265:Requires:	libx265-devel >= 0.7}
+%{?with_x265:Requires:	libx265-devel >= 1.3-0.20150610.1}
+%{?with_mfx:Requires:	mfx_dispatch-devel}
 Requires:	opencore-amr-devel
 %{?with_opencv:Requires:	opencv-devel}
+%{?with_openh264:Requires:	openh264-devel >= 1.3}
 Requires:	openjpeg-devel >= 1.5
 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
 Requires:	twolame-devel
-%{?with_utvideo:Requires:	utvideo-devel >= 12}
+%{?with_utvideo:Requires:	utvideo-devel >= 15.3}
 %{?with_vidstab:Requires:	vid.stab-devel >= 0.98}
 Requires:	vo-aacenc-devel
 Requires:	vo-amrwbenc-devel
@@ -351,6 +380,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -431,6 +461,7 @@ EOF
 	--disable-debug \
 	--disable-optimizations \
 	--disable-stripping \
+	%{!?with_doc:--disable-doc} \
 	--enable-avfilter \
 	--enable-avresample \
 	%{?with_decklink:--enable-decklink} \
@@ -440,7 +471,6 @@ EOF
 	--enable-fontconfig \
 	%{?with_frei0r:--enable-frei0r} \
 	%{?with_ladspa:--enable-ladspa} \
-	%{?with_aacplus:--enable-libaacplus} \
 	--enable-libass \
 	--enable-libbluray \
 	%{?with_bs2b:--enable-libbs2b} \
@@ -448,7 +478,7 @@ EOF
 	--enable-libcelt \
 	--enable-libcdio \
 	--enable-libdc1394 \
-	%{?with_fdk_aac:--enable-libfdk-aac} \
+	%{?with_dcadec:--enable-libdcadec} \
 	%{?with_flite:--enable-libflite} \
 	--enable-libfreetype \
 	%{?with_fribidi:--enable-libfribidi} \
@@ -456,12 +486,15 @@ EOF
 	--enable-libgsm \
 	--enable-libiec61883 \
 	%{?with_ilbc:--enable-libilbc} \
+	%{?with_kvazaar:--enable-libkvazaar} \
+	%{?with_mfx:--enable-libmfx} \
 	--enable-libmodplug \
 	--enable-libmp3lame \
 	--enable-libnut \
 	--enable-libopencore-amrnb \
 	--enable-libopencore-amrwb \
 	%{?with_opencv:--enable-libopencv} \
+	%{?with_openh264:--enable-libopenh264} \
 	--enable-libopenjpeg \
 	--enable-libopus \
 	%{?with_pulseaudio:--enable-libpulse} \
@@ -470,6 +503,7 @@ EOF
 	--enable-libschroedinger \
 	%{?with_shine:--enable-libshine} \
 	%{?with_smb:--enable-libsmbclient} \
+	%{?with_snappy:--enable-libsnappy} \
 	%{?with_soxr:--enable-libsoxr} \
 	--enable-libspeex \
 	%{?with_ssh:--enable-libssh} \
@@ -505,9 +539,15 @@ EOF
 %ifarch i386 i486
 	--disable-mmx \
 %endif
+%ifarch x32
+	--disable-asm \
+%endif
 %if %{with nonfree}
 	--enable-nonfree \
-	--enable-libfaac \
+	%{?with_aacplus:--enable-libaacplus} \
+	%{?with_faac:--enable-libfaac} \
+	%{?with_fdk_aac:--enable-libfdk-aac} \
+	%{?with_nvenc:--enable-nvenc} \
 %endif
 	--enable-runtime-cpudetect
 
@@ -517,6 +557,8 @@ EOF
 # CC_O to add -c to commandline. makefile should be patched
 %{__make} tools/qt-faststart V=1 CC_O='-c -o $@'
 
+%{?with_tests:%{__make} check V=1}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \
@@ -548,7 +590,9 @@ install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 
 # packaged as %doc in -doc
+%if %{with doc}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/ffmpeg/*.html
+%endif
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/ffmpeg/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}