commit: 9c26cfec5df7be990f64d0b53143404928a8af78 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Tue Feb 12 14:02:23 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Tue Feb 12 14:02:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c26cfec
media-plugins/gst-plugins-vpx: fix compatibility with libvpx-1.8 Closes: https://bugs.gentoo.org/677610 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/1.14.4-libvpx-1.8-compat.patch | 65 ++++++++++++++++++++++ .../gst-plugins-vpx/gst-plugins-vpx-1.14.4.ebuild | 9 ++- 2 files changed, 73 insertions(+), 1 deletion(-) 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 00000000000..ad9dadb3dfd --- /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)" <[email protected]> +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 a7be76a7d7f..f8efb1f1486 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 +}
