Date: Tuesday, February 5, 2019 @ 21:24:19 Author: heftig Revision: 345309
1.14.4-2 Added: gst-plugins-good/trunk/0001-vpx-Fix-build-against-libvpx-1.8.patch Modified: gst-plugins-good/trunk/PKGBUILD ---------------------------------------------+ 0001-vpx-Fix-build-against-libvpx-1.8.patch | 71 ++++++++++++++++++++++++++ PKGBUILD | 6 +- 2 files changed, 76 insertions(+), 1 deletion(-) Added: 0001-vpx-Fix-build-against-libvpx-1.8.patch =================================================================== --- 0001-vpx-Fix-build-against-libvpx-1.8.patch (rev 0) +++ 0001-vpx-Fix-build-against-libvpx-1.8.patch 2019-02-05 21:24:19 UTC (rev 345309) @@ -0,0 +1,71 @@ +From c481cb5f2209087ffc0094490bacab46eda2d06b Mon Sep 17 00:00:00 2001 +Message-Id: <c481cb5f2209087ffc0094490bacab46eda2d06b.1549401287.git.jan.steff...@gmail.com> +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,18 +62,20 @@ 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"}, + {C_FLAGS (VP8_DEBUG_TXT_MBLK_MODES), + "Show macroblock mode selection overlaid on image", + "visualize-macroblock-modes"}, + {C_FLAGS (VP8_DEBUG_TXT_DC_DIFF), + "Show dc diff for each macro block overlaid on image", + "visualize-dc-diff"}, + {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.20.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-05 20:32:23 UTC (rev 345308) +++ PKGBUILD 2019-02-05 21:24:19 UTC (rev 345309) @@ -3,7 +3,7 @@ pkgname=gst-plugins-good pkgver=1.14.4 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="https://gstreamer.freedesktop.org/"; arch=(x86_64) @@ -15,8 +15,10 @@ checkdepends=(gst-plugins-base) _commit=d88d1b0e43b140587f35c7c9bf390fae051e427d # tags/1.14.4^0 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit"; + 0001-vpx-Fix-build-against-libvpx-1.8.patch "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common";) sha256sums=('SKIP' + '8ffcb46a5f07d04509b1e81b63d121c63cd68e91409be942a27b9a50279335a8' 'SKIP') pkgver() { @@ -27,6 +29,8 @@ prepare() { cd $pkgname + patch -Np1 -i ../0001-vpx-Fix-build-against-libvpx-1.8.patch + git submodule init git config --local submodule.common.url "$srcdir/gst-common" git submodule update
