X-Git-Url: http://git.pld-linux.org/?p=packages%2Fffmpeg.git;a=blobdiff_plain;f=ffmpeg.spec;h=64511787f138dfcb506df4792f0ab70f9dfc70f5;hp=d6024387da8a0a1144000a87fe3ef1c5c4bfd7c1;hb=75b8ff7;hpb=81ffd9b65959ac8d92d9650e4245f7073dc14942

diff --git a/ffmpeg.spec b/ffmpeg.spec
index d602438..6451178 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -77,15 +77,15 @@
 Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
-Version:	4.0.1
-Release:	1
+Version:	4.1
+Release:	3.1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (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.xz
-# Source0-md5:	51d0f87b4af7d0ba6d17686b7b43095c
+# Source0-md5:	b011c94e075c2d0cd7c914730f55f9a9
 Patch0:		%{name}-omx-libnames.patch
 URL:		http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK >= 10.6.1}
@@ -97,6 +97,7 @@ URL:		http://www.ffmpeg.org/
 BuildRequires:	SDL2-devel >= 2.0.1
 BuildRequires:	SDL2-devel < 2.1.0
 BuildRequires:	alsa-lib-devel
+BuildRequires:	aom-devel >= 1.0.0
 BuildRequires:	bzip2-devel
 BuildRequires:	celt-devel >= 0.11.0
 %{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
@@ -144,7 +145,7 @@ 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_vpx:BuildRequires:	libvpx-devel >= 1.4.0}
 %{?with_webp:BuildRequires:	libwebp-devel >= 0.4.0}
 # X264_BUILD >= 118
 %{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20111212_2245}
@@ -180,7 +181,7 @@ BuildRequires:	speex-devel >= 1:1.2-rc1
 %{?with_doc:BuildRequires:	tetex}
 %{?with_doc:BuildRequires:	texi2html}
 %{?with_doc:BuildRequires:	texinfo}
-BuildRequires:	twolame-devel
+BuildRequires:	twolame-devel >= 0.3.10
 %{?with_vidstab:BuildRequires:	vid.stab-devel >= 0.98}
 BuildRequires:	vo-amrwbenc-devel
 %{?with_wavpack:BuildRequires:	wavpack-devel}
@@ -232,13 +233,15 @@ Summary:	ffmpeg libraries
 Summary(pl.UTF-8):	Biblioteki ffmpeg
 Group:		Libraries
 Requires:	SDL2 >= 2.0.1
+Requires:	aom >= 1.0.0
 %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_vpx:Requires:	libvpx >= 1.4.0}
 %{?with_rubberband:Requires:	rubberband-libs >= 1.8.1}
+Requires:	twolame-libs >= 0.3.10
 %{?with_zimg:Requires:	zimg >= 2.7.0}
 
 %description libs
@@ -298,7 +301,7 @@ Requires:	librtmp-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_vpx:Requires:	libvpx-devel >= 1.4.0}
 %{?with_webp:Requires:	libwebp-devel >= 0.4.0}
 %{?with_x264:Requires:	libx264-devel >= 0.1.3-1.20110625_2245}
 %{?with_x265:Requires:	libx265-devel >= 1.8}
@@ -314,7 +317,7 @@ Requires:	openjpeg2-devel >= 2.1
 %{?with_soxr:Requires:	soxr-devel}
 Requires:	speex-devel >= 1:1.2-rc1
 %{?with_tesseract:Requires:	tesseract-devel}
-Requires:	twolame-devel
+Requires:	twolame-devel >= 0.3.10
 %{?with_vidstab:Requires:	vid.stab-devel >= 0.98}
 Requires:	vo-amrwbenc-devel
 %{?with_wavpack:Requires:	wavpack-devel}
@@ -472,6 +475,7 @@ EOF
 	--enable-version3 \
 	%{?with_frei0r:--enable-frei0r} \
 	%{?with_ladspa:--enable-ladspa} \
+	--enable-libaom \
 	--enable-libass \
 	--enable-libbluray \
 	%{?with_bs2b:--enable-libbs2b} \