[packages/ffmpeg] - updated to 2.8.4 - removed obsolete libvpx-1.5 patch - adjusted dependencies for libquvi 0.4.x in

[qboosh]

commit 16a4fb4aa42aa04b48e129f810c147980755398f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 26 11:16:16 2015 +0100

    - updated to 2.8.4
    - removed obsolete libvpx-1.5 patch
    - adjusted dependencies for libquvi 0.4.x in libquvi-0.4 package

 ffmpeg.spec      | 14 ++++++--------
 libvpx-1.5.patch | 41 -----------------------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 01a3d17..6970948 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -62,21 +62,20 @@
 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:	3
+Version:	2.8.4
+Release:	1
 # 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:	ac1e3d6934f9efd8b67713677c7fd99f
 Source1:	ffserver.init
 Source2:	ffserver.sysconfig
 Source3:	ffserver.conf
 Patch0:		%{name}-kvazaar.patch
-Patch1:		libvpx-1.5.patch
-Patch2:		%{name}-utvideo.patch
+Patch1:		%{name}-utvideo.patch
 URL:		http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
 %{?with_openal:BuildRequires:	OpenAL-devel >= 1.1}
@@ -117,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}
@@ -273,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}
@@ -382,7 +381,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
diff --git a/libvpx-1.5.patch b/libvpx-1.5.patch
deleted file mode 100644
index 34659c7..0000000
--- a/libvpx-1.5.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/jb-alvarado/media-autobuild_suite/issues/185
-http://git.videolan.org/?p=ffmpeg.git;a=commit;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab
-
-From: James Zern <jzern at google.com>
-Date: Tue, 20 Oct 2015 05:44:11 +0000 (-0700)
-Subject: libvpxenc: remove some unused ctrl id mappings
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab;hp=6b41b4414934cc930468ccd5db598dd6ef643987
-
-libvpxenc: remove some unused ctrl id mappings
-
-VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
-from libvpx and the remaining values were never used here
-
-Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
-Signed-off-by: James Zern <jzern at google.com>
----
-
-diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
-index 5f39783..992122c 100644
---- a/libavcodec/libvpxenc.c
-+++ b/libavcodec/libvpxenc.c
-@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
- 
- /** String mappings for enum vp8e_enc_control_id */
- static const char *const ctlidstr[] = {
--    [VP8E_UPD_ENTROPY]           = "VP8E_UPD_ENTROPY",
--    [VP8E_UPD_REFERENCE]         = "VP8E_UPD_REFERENCE",
--    [VP8E_USE_REFERENCE]         = "VP8E_USE_REFERENCE",
--    [VP8E_SET_ROI_MAP]           = "VP8E_SET_ROI_MAP",
--    [VP8E_SET_ACTIVEMAP]         = "VP8E_SET_ACTIVEMAP",
--    [VP8E_SET_SCALEMODE]         = "VP8E_SET_SCALEMODE",
-     [VP8E_SET_CPUUSED]           = "VP8E_SET_CPUUSED",
-     [VP8E_SET_ENABLEAUTOALTREF]  = "VP8E_SET_ENABLEAUTOALTREF",
-     [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
--    [VP8E_SET_SHARPNESS]         = "VP8E_SET_SHARPNESS",
-     [VP8E_SET_STATIC_THRESHOLD]  = "VP8E_SET_STATIC_THRESHOLD",
-     [VP8E_SET_TOKEN_PARTITIONS]  = "VP8E_SET_TOKEN_PARTITIONS",
--    [VP8E_GET_LAST_QUANTIZER]    = "VP8E_GET_LAST_QUANTIZER",
-     [VP8E_SET_ARNR_MAXFRAMES]    = "VP8E_SET_ARNR_MAXFRAMES",
-     [VP8E_SET_ARNR_STRENGTH]     = "VP8E_SET_ARNR_STRENGTH",
-     [VP8E_SET_ARNR_TYPE]         = "VP8E_SET_ARNR_TYPE",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/16a4fb4aa42aa04b48e129f810c147980755398f