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

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5a41494..ca8ed7b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,46 +1,74 @@
+# TODO:
+# - libvmaf [BR: libvmaf.pc, libvmaf, libvmaf.h]
+# - libndi_newtek[nonfree, BR: Processing.NDI.Lib.h]
+# - libmysofa [BR: libmysofa, mysofa.h]
+# - rkmpp[GPLv3, BR: rockchip_mpp.pc, rockchip/rk_mpi_cmd.h, libdrm]
 #
-# 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
+# How to deal with ffmpeg/opencv/chromaprint checken-egg problem:
+#	1. make-request -r --with bootstrap ffmpeg.spec
+#	2  bump release of opencv.spec and chromaprint.spec
+#	3. make-request -r opencv.spec chromaprint.spec
+#	4. bump release of ffmpeg.spec
+#	5. make-request -r ffmpeg.spec
 #
 # 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 de/encoding via libfdk_aac (requires nonfree)
+%bcond_with	bootstrap	# disable features to able to build without installed ffmpeg
+%bcond_with	nonfree		# unblock non free options of package (currently: cuda_sdk, decklib, fdk_aac, libndi_newtek, npp, openssl)
 %bcond_without	bs2b		# BS2B audio filter support
 %bcond_without	caca		# textual display using libcaca
-%bcond_without	decklink	# Blackmagic DeskLink output support
+%bcond_without	chromaprint	# audio fingerprinting with chromaprint
+%bcond_without	cuda		# NVIDIA CUDA code
+%bcond_with	cudasdk		# NVIDIA CUDA code using SDK [BR: cuda.h, non-free]
+%bcond_with	cuvid		# NVIDIA CUVID support
+%bcond_with	decklink	# Blackmagic DeskLink output support (requires nonfree)
+%bcond_with	fdk_aac		# AAC de/encoding via libfdk_aac (requires nonfree)
 %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	libdrm		# Linux Direct Rendering Manager code
+%bcond_with	librsvg		# SVG rasterization via librsvg
+%bcond_with	libxml2		# XML parsing using libxml2
+%bcond_with	mfx		# MFX hardware acceleration support
+%bcond_with	npp		# NVIDIA Performance Primitives-based code (requires nonfree) [BR: libnppc+libnppi, npp.h]
+%bcond_with	nvenc		# NVIDIA NVENC support
+%bcond_without	omx		# OpenMAX IL support
 %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	openmpt		# OpenMPT module decoder
 %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
 %bcond_without	va		# VAAPI (Video Acceleration API)
 %bcond_without	vidstab		# vid.stab video stabilization support
 %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
+%bcond_with	tests		# "make check" (some tests fail as of 2.5)
+
+%if %{with bootstrap}
+%undefine	with_opencv
+%undefine	with_chromaprint
+%endif
 
-%ifnarch %{ix86} %{x8664} arm
+%ifnarch %{ix86} %{x8664} %{arm}
 %undefine	with_x265
 %endif
 %ifarch i386 i486
@@ -49,29 +77,28 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	2.4
+Version:	4.0.2
 Release:	1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
-# (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
+# (postprocessing, some filters, x264, x265, xavs, xvid, xcbgrab)
 # 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
-Source1:	ffserver.init
-Source2:	ffserver.sysconfig
-Source3:	ffserver.conf
-Patch0:		%{name}-opencv24.patch
+Source0:	http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5:	ae0bfdf809306a212b4f0e6eb8d1c75e
+Patch0:		%{name}-omx-libnames.patch
 URL:		http://www.ffmpeg.org/
-%{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
+%{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK >= 10.6.1}
 %{?with_openal:BuildRequires:	OpenAL-devel >= 1.1}
 %{?with_opencl:BuildRequires:	OpenCL-devel >= 1.2}
 %{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
-BuildRequires:	SDL-devel >= 1.2.1
+# libomxil-bellagio-devel or limoi-core-devel (just headers, library is dlopened at runtime)
+%{?with_omx:BuildRequires:	OpenMAX-IL-devel}
+BuildRequires:	SDL2-devel >= 2.0.1
+BuildRequires:	SDL2-devel < 2.1.0
 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
@@ -83,64 +110,78 @@ 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.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
+%{?with_libdrm:BuildRequires:	libdrm-devel}
 BuildRequires:	libgsm-devel
 BuildRequires:	libiec61883-devel
 BuildRequires:	libmodplug-devel
-BuildRequires:	libnut-devel
-%{?with_quvi:BuildRequires:	libquvi-devel}
+%{?with_openmpt:BuildRequires: libopenmpt-devel >= 0.2.6557}
 BuildRequires:	libraw1394-devel >= 2
+%{?with_librsvg:BuildRequires:	librsvg-devel >= 2}
 BuildRequires:	librtmp-devel
 %{?with_ssh:BuildRequires:	libssh-devel}
 %{?with_smb:BuildRequires:	libsmbclient-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}
+%if %{with va}
+BuildRequires:	libva-devel >= 1.0.3
+BuildRequires:	libva-drm-devel >= 1.0.3
+BuildRequires:	libva-x11-devel >= 1.0.3
+%endif
 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 >= 68
+%{?with_x265:BuildRequires:	libx265-devel >= 1.8}
+# libxcb xcb-shm xcb-xfixes xcb-shape
+BuildRequires:	libxcb-devel >= 1.4
+%{?with_libxml2:BuildRequires:	libxml2-devel >= 2}
+%{?with_mfx:BuildRequires:	mfx_dispatch-devel}
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires:	nasm
 %endif
 %endif
+# which package?
+#%{?with_nvenc:BuildRequires:	NVIDIA-NVENC-API} compat/nvenc/nvEncodeAPI.h
 BuildRequires:	opencore-amr-devel
 %{?with_opencv:BuildRequires:	opencv-devel}
-BuildRequires:	openjpeg-devel >= 1.5
+%{?with_openh264:BuildRequires:	openh264-devel >= 1.3}
+BuildRequires:	openjpeg2-devel >= 2.1
 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
+%{?with_rubberband:BuildRequires:	rubberband-devel >= 1.8.1}
 %{?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 >= 12}
 %{?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}
@@ -149,22 +190,21 @@ BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xvid-devel >= 1:1.1.0
+BuildRequires:	xz-devel
 BuildRequires:	yasm
 %{?with_zmq:BuildRequires:	zeromq-devel}
-%{?with_zvbi:BuildRequires:	zvbi-devel}
+%{?with_zimg:BuildRequires:	zimg-devel >= 2.7.0}
 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 >= 12}
 %{?with_ilbc:Requires:	webrtc-libilbc}
 Requires:	xvid >= 1:1.1.0
 Obsoletes:	libpostproc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoreqdep	libGL.so.1 libGLU.so.1
-
 %define		specflags	-fno-strict-aliasing
 
 # -fomit-frame-pointer is always needed on x86 due to lack of registers (-fPIC takes one)
@@ -191,11 +231,15 @@ telewizyjnej.
 Summary:	ffmpeg libraries
 Summary(pl.UTF-8):	Biblioteki ffmpeg
 Group:		Libraries
+Requires:	SDL2 >= 2.0.1
 %if "%(rpm -q --qf '%{V}' gnutls-devel)" >= "3.0.20"
 # uses gnutls_certificate_set_x509_system_trust if >= 3.0.20
 Requires:	gnutls-libs >= 3.0.20
 %endif
+%{?with_openmpt:Requires: libopenmpt >= 0.2.6557}
 %{?with_vpx:Requires:	libvpx >= 1.3.0}
+%{?with_rubberband:Requires:	rubberband-libs >= 1.8.1}
+%{?with_zimg:Requires:	zimg >= 2.7.0}
 
 %description libs
 This package contains the ffmpeg shared libraries:
@@ -221,11 +265,10 @@ Requires:	%{name}-libs = %{version}-%{release}
 # Libs.private from *.pc (unreasonably they are all the same)
 %{?with_opencl:Requires:	OpenCL-devel >= 1.2}
 %{?with_opengl:Requires:	OpenGL-devel}
-Requires:	SDL-devel >= 1.2.1
+Requires:	SDL2-devel >= 2.0.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}
 %{?with_flite:Requires:	flite-devel >= 1.4}
 Requires:	fontconfig-devel
@@ -233,41 +276,46 @@ 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.8.1}
 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
+%{?with_libdrm:Requires:	libdrm-devel}
 Requires:	libgsm-devel
 Requires:	libiec61883-devel
 Requires:	libmodplug-devel
-Requires:	libnut-devel
-%{?with_quvi:Requires:	libquvi-devel}
+%{?with_openmpt:Requires: libopenmpt-devel >= 0.2.6557}
 Requires:	libraw1394-devel >= 2
+%{?with_librsvg:Requires:	librsvg-devel >= 2}
 Requires:	librtmp-devel
 %{?with_smb:Requires:	libsmbclient-devel}
 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.8}
+%{?with_libxml2:Requires:	libxml2-devel >= 2}
+%{?with_mfx:Requires:	mfx_dispatch-devel}
 Requires:	opencore-amr-devel
 %{?with_opencv:Requires:	opencv-devel}
-Requires:	openjpeg-devel >= 1.5
-Requires:	schroedinger-devel
+%{?with_openh264:Requires:	openh264-devel >= 1.3}
+Requires:	openjpeg2-devel >= 2.1
+%{?with_rubberband:Requires:	rubberband-devel >= 1.8.1}
 %{?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 >= 12}
 %{?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}
@@ -276,6 +324,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 >= 2.3.0}
 Requires:	zlib-devel
 Obsoletes:	libpostproc-devel
 
@@ -313,27 +362,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 ffserver
-Summary:	FFserver video server
-Summary(pl.UTF-8):	FFserver - serwer strumieni obrazu
-Group:		Daemons
-Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	rc-scripts >= 0.4.0.10
-
-%description ffserver
-FFserver is a streaming server for both audio and video. It supports
-several live feeds, streaming from files and time shifting on live
-feeds (you can seek to positions in the past on each live feed,
-provided you specify a big enough feed storage in ffserver.conf).
-
-%description ffserver -l pl.UTF-8
-FFserver to serwer strumieni dla dźwięku i obrazu. Obsługuje kilka
-źródeł na żywo, przekazywanie strumieni z plików i przesuwanie w
-czasie dla źródeł na żywo (można przeskakiwać na położenia w
-przeszłości dla każdego źródła na żywo, pod warunkiem odpowiednio
-dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
-
 %package doc
 Summary:	FFmpeg documentation in HTML format
 Summary(pl.UTF-8):	Dokumentacja pakietu FFmpeg w formacie HTML
@@ -431,16 +459,19 @@ EOF
 	--disable-debug \
 	--disable-optimizations \
 	--disable-stripping \
+	%{!?with_doc:--disable-doc} \
 	--enable-avfilter \
 	--enable-avresample \
+	%{?with_chromaprint:--enable-chromaprint} \
+	%{!?with_cuda:--disable-cuda} \
+	%{?with_cudasdk:--enable-cuda-sdk} \
+	%{!?with_cuvid:--disable-cuvid} \
 	%{?with_decklink:--enable-decklink} \
 	--enable-gnutls \
 	--enable-gpl \
 	--enable-version3 \
-	--enable-fontconfig \
 	%{?with_frei0r:--enable-frei0r} \
 	%{?with_ladspa:--enable-ladspa} \
-	%{?with_aacplus:--enable-libaacplus} \
 	--enable-libass \
 	--enable-libbluray \
 	%{?with_bs2b:--enable-libbs2b} \
@@ -448,37 +479,42 @@ EOF
 	--enable-libcelt \
 	--enable-libcdio \
 	--enable-libdc1394 \
-	%{?with_fdk_aac:--enable-libfdk-aac} \
+	%{?with_libdrm:--enable-libdrm} \
 	%{?with_flite:--enable-libflite} \
+	--enable-libfontconfig \
 	--enable-libfreetype \
 	%{?with_fribidi:--enable-libfribidi} \
 	%{?with_gme:--enable-libgme} \
 	--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 \
+	%{?with_openmpt:--enable-libopenmpt} \
 	--enable-libopus \
 	%{?with_pulseaudio:--enable-libpulse} \
-	%{?with_quvi:--enable-libquvi} \
+	%{?with_librsvg:--enable-librsvg} \
 	--enable-librtmp \
-	--enable-libschroedinger \
+	%{?with_libxml2:--enable-libxml2} \
+	%{?with_rubberband:--enable-librubberband} \
 	%{?with_shine:--enable-libshine} \
 	%{?with_smb:--enable-libsmbclient} \
+	%{?with_snappy:--enable-libsnappy} \
 	%{?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} \
@@ -487,9 +523,13 @@ EOF
 	%{?with_x264:--enable-libx264} \
 	%{?with_x265:--enable-libx265} \
 	--enable-libxavs \
+	--enable-libxcb \
 	--enable-libxvid \
+	%{?with_zimg:--enable-libzimg} \
 	%{?with_zmq:--enable-libzmq} \
 	%{?with_zvbi:--enable-libzvbi} \
+	%{!?with_nvenc:--disable-nvenc} \
+	%{?with_omx:--enable-omx} \
 	%{?with_openal:--enable-openal} \
 	%{?with_opencl:--enable-opencl} \
 	%{?with_opengl:--enable-opengl} \
@@ -498,16 +538,19 @@ EOF
 	--enable-shared \
 	--enable-swscale \
 	%{!?with_va:--disable-vaapi} \
-	--enable-x11grab \
 %ifnarch %{ix86} %{x8664}
 	--disable-mmx \
 %endif
 %ifarch i386 i486
 	--disable-mmx \
 %endif
+%ifarch x32
+	--disable-asm \
+%endif
 %if %{with nonfree}
 	--enable-nonfree \
-	--enable-libfaac \
+	%{?with_fdk_aac:--enable-libfdk-aac} \
+	%{?with_npp:--enable-libnpp} \
 %endif
 	--enable-runtime-cpudetect
 
@@ -517,11 +560,12 @@ 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}} \
-	$RPM_BUILD_ROOT%{_includedir}/ffmpeg \
-	$RPM_BUILD_ROOT/var/{cache,log}/ffserver
+	$RPM_BUILD_ROOT%{_includedir}/ffmpeg
 
 %{__make} install install-headers \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -533,13 +577,7 @@ for a in libavutil/*/{asm,bswap}.h; do
 	install -Dp $a $RPM_BUILD_ROOT%{_includedir}/$a
 done
 cp -a libavformat/riff.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
@@ -548,7 +586,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}
@@ -559,26 +599,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%pre ffserver
-%groupadd -g 167 ffserver
-%useradd -g ffserver -u 167 ffserver
-
-%post ffserver
-/sbin/chkconfig --add ffserver
-%service ffserver restart
-
-%preun ffserver
-if [ "$1" = 0 ]; then
-	%service ffserver stop
-	/sbin/chkconfig --del ffserver
-fi
-
-%postun ffserver
-if [ "$1" = 0 ]; then
-	%userremove ffserver
-	%groupremove ffserver
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc CREDITS LICENSE.md MAINTAINERS README.md RELEASE_NOTES doc/APIchanges
@@ -607,23 +627,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.58
 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.56
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.58
 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.5
+%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.7
 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.56
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.58
 %attr(755,root,root) %{_libdir}/libavresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavresample.so.2
+%attr(755,root,root) %ghost %{_libdir}/libavresample.so.4
 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.54
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.56
 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.53
+%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.55
 %attr(755,root,root) %{_libdir}/libswresample.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswresample.so.1
+%attr(755,root,root) %ghost %{_libdir}/libswresample.so.3
 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.3
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.5
 
 %files devel
 %defattr(644,root,root,755)
@@ -688,19 +708,6 @@ fi
 %{_mandir}/man1/ffplay-all.1*
 %endif
 
-%files ffserver
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf
-%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
-%if %{with doc}
-%{_mandir}/man1/ffserver.1*
-%{_mandir}/man1/ffserver-all.1*
-%endif
-%dir %attr(770,root,ffserver) /var/cache/ffserver
-%dir %attr(770,root,ffserver) /var/log/ffserver
-
 %if %{with doc}
 %files doc
 %defattr(644,root,root,755)