gentoo resync : 16.02.1018

3 files changed, 75 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index fe7b5ba28aa7..76d34616294e 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -1,3 +1,4 @@
+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
-EBUILD gst-plugins-vpx-1.14.4.ebuild 400 BLAKE2B a78e749a7a6a88d7838bf7b3aa2777acb08738a877c9d36be6b4464122f4a3aca40dcc8432c363b11e713f7442a2e05e239709ba6c2886246e2cbd913592421f SHA512 fb5bb7530b2be0a7847a4eb7018f0add2735e66d6deea3c000b567f6fbd39098dddf2dfd25f0beff5f9c2bfd1035eed2b91cc293ad99ecdebfa06c506b7fd33c
+EBUILD gst-plugins-vpx-1.14.4.ebuild 508 BLAKE2B 3f0db9c5914223a7cff2018083b1bd4f19072ea379cd5b829fc2216973a47945f309606fdb9451045b9815f29fb9496e65f6ff5ee91bdfff3633982bf2435a4d SHA512 943bd41bf9eee702696411b9d960b0d88ff9a0ab48b192728317091b5cacfd543872be7c0322b62e990f0ddaf752ab92b97689199799219f031526958dbb35dd
 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
new file mode 100644
index 000000000000..ad9dadb3dfda
--- /dev/null
+++ b/media-plugins/gst-plugins-vpx/files/1.14.4-libvpx-1.8-compat.patch
@@ -0,0 +1,65 @@
+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
index a7be76a7d7fb..f8efb1f14864 100644
--- 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
@@ -4,7 +4,7 @@
 EAPI=6
 GST_ORG_MODULE=gst-plugins-good
 
-inherit gstreamer
+inherit autotools gstreamer
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
@@ -12,3 +12,10 @@ IUSE=""
 
 RDEPEND=">=media-libs/libvpx-1.3.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PV}-libvpx-1.8-compat.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}