Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) Date: 2019-02-11 Initial Package Version: 1.14.4 Upstream Status: Comitted Origin: https://cgit.freedesktop.org/gstreamer/gst-plugins-good Description: Fixes build with libvpx-1.8.0. From b6e6f1ae73375ef66a5748069843aaed1a83e6a6 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Tue, 5 Feb 2019 22:14:18 +0100 Subject: 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 5e4cff1..8c20e50 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 c3f0f62..da43225 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 6ed4407..0d2340b 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, -- cgit v1.1