From 8225c36eb240bf706b8cf9c5293ca1b88dae1655 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 2 Jan 2016 20:24:28 -0600 Subject: [PATCH] multimedia/gst0-plugins-bad: Fix building against newer libvpx Signed-off-by: Robby Workman --- .../drop-vpx-compat-defines.patch | 27 +++++++++++++++++++ .../gst0-plugins-bad.SlackBuild | 3 +++ 2 files changed, 30 insertions(+) create mode 100644 multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch diff --git a/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch b/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch new file mode 100644 index 0000000000..599ec08a18 --- /dev/null +++ b/multimedia/gst0-plugins-bad/drop-vpx-compat-defines.patch @@ -0,0 +1,27 @@ +diff -up gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h +--- gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines 2015-04-07 09:28:01.637679239 -0400 ++++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h 2015-04-07 09:28:10.397622550 -0400 +@@ -25,23 +25,6 @@ + + G_BEGIN_DECLS + +-/* Some compatibility defines for older libvpx versions */ +-#ifndef VPX_IMG_FMT_I420 +-#define VPX_IMG_FMT_I420 IMG_FMT_I420 +-#endif +- +-#ifndef VPX_PLANE_Y +-#define VPX_PLANE_Y PLANE_Y +-#endif +- +-#ifndef VPX_PLANE_U +-#define VPX_PLANE_U PLANE_U +-#endif +- +-#ifndef VPX_PLANE_V +-#define VPX_PLANE_V PLANE_V +-#endif +- + const char * gst_vpx_error_name (vpx_codec_err_t status); + + G_END_DECLS diff --git a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild index 0dee402edf..70fad43248 100644 --- a/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild +++ b/multimedia/gst0-plugins-bad/gst0-plugins-bad.SlackBuild @@ -76,6 +76,9 @@ find -L . \ # Fix libmodplug include directory. patch -p1 < $CWD/libmodplug-include.patch +# Fix build against libvpx 1.4.0. +patch -p1 < $CWD/drop-vpx-compat-defines.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \