gentoo resync : 15.01.2020

4 files changed, 3 insertions, 92 deletions

diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index 399d2e45f70e..cef0c3ee0466 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,6 +1,3 @@
-AUX 1.14.4-libvpx-1.8-compat.patch 2149 BLAKE2B 870fc4b5eeaffa7f735f76b706f84ab2c69687df4c3fe788932278ba8d3870c0b385976471c6e95e3cc081ce50b11324505079f7d966890527627d35169b2bc9 SHA512 bd35100ed2659daca956d6775d58c068852fa2a4f38e53746a5e1abd5fc156ca2d876638e4b39d8d62df520b73ea2aac8b5582363a182263d0cbb4184f900825
-DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
-EBUILD gst-plugins-vpx-1.14.4.ebuild 490 BLAKE2B c5f0daeceea733b586199d2800c243d09e3d5c7371dd22da50c5b857f66dfec6e6b8c5ed6d93b18dfece13bc348ef0252ce38f2942cd7d90fa9cef5098f980b1 SHA512 daaf9840b1e628f9b6f0580998facdb121d1e17ec374f8f810a46b681d3dfa67720e642e1f479a25494ef6a46031c1c486cd05df80e0ffd4f679c2480654bd8d
-EBUILD gst-plugins-vpx-1.14.5.ebuild 393 BLAKE2B ef05080d8cb1d4ade6aeb6f98503fd59a309826988b099870bf58b962f21a6da6358f45191b35ce2d843a1ac006974910c9654c2c879f9758d230a7a03a2d8d8 SHA512 9fdd765d1bb2eae6da34d8f011b62436fd0cce12a06331978f9b9bb05a3865d77d6a6011af1685718eda1c648239806a9fce31055faae85992ee36da59256a6d
+EBUILD gst-plugins-vpx-1.14.5.ebuild 392 BLAKE2B 949cc0ade8b59a516aaacb6dca3c70b05b15be31371e2043f1088e2e4d5f1dff74a7e463aa9b0783b67760c44aff66fad9682a4b5dafa80b7c755e19beeb0af5 SHA512 9ad9c2b792338612ae85cbec9071967102d49583074a433861251edfc32f169c69dfce66a2dc3d5e29404c351c1ca7bdcd0e96b45eee18fb9159324c12adf9d8
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch b/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch
deleted file mode 100644
index ad9dadb3dfda..000000000000
--- a/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Tue, 5 Feb 2019 22:14:18 +0100
-Subject: [PATCH] vpx: Fix build against libvpx 1.8
-
-The deprecated debug visualizer was removed.
----
- configure.ac        | 4 ++++
- ext/vpx/gstvpxdec.c | 2 ++
- ext/vpx/meson.build | 4 ++++
- 3 files changed, 10 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 5e4cff126..8c20e5081 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1054,6 +1054,10 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [
-       AC_DEFINE(HAVE_VPX_1_4, 1, [Defined if the VPX library version is 1.4 or bigger])
-     ], [true])
- 
-+    PKG_CHECK_MODULES(VPX_180, vpx >= 1.8.0, [
-+      AC_DEFINE(HAVE_VPX_1_8, 1, [Defined if the VPX library version is 1.8 or bigger])
-+    ], [true])
-+
-     LIBS="$OLD_LIBS"
-     CFLAGS="$OLD_CFLAGS"
-   fi
-diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
-index c3f0f625f..da4322513 100644
---- a/ext/vpx/gstvpxdec.c
-+++ b/ext/vpx/gstvpxdec.c
-@@ -62,6 +62,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
-     {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
-     {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
-     {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
-+#ifndef HAVE_VPX_1_8
-     {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
-           "Print frame information",
-         "visualize-frame-info"},
-@@ -74,6 +75,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
-     {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
-           "Print video rate info",
-         "visualize-rate-info"},
-+#endif
-     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
-     {0, NULL, NULL}
-   };
-diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
-index 6ed440728..0d2340b32 100644
---- a/ext/vpx/meson.build
-+++ b/ext/vpx/meson.build
-@@ -48,6 +48,10 @@ if vpx_dep.found()
-     vpx_args += '-DHAVE_VPX_1_4'
-   endif
- 
-+  if dependency('vpx', version : '>=1.8.0', required : false).found()
-+    vpx_args += '-DHAVE_VPX_1_8'
-+  endif
-+
-   gstvpx = library('gstvpx',
-     vpx_sources,
-     c_args : gst_plugins_good_args + vpx_args,
--- 
-2.17.0
-
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
deleted file mode 100644
index 5f5cdefd5009..000000000000
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE=gst-plugins-good
-
-inherit autotools gstreamer
-
-DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PV}-libvpx-1.8-compat.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
index 22bf319d3574..c6cf29b246bf 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit autotools gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"