diff --git a/gst-plugins-bad-0.10.23-drop-vpx-compat-defines.patch b/gst-plugins-bad-0.10.23-drop-vpx-compat-defines.patch new file mode 100644 index 0000000..599ec08 --- /dev/null +++ b/gst-plugins-bad-0.10.23-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/gstreamer-plugins-bad-free.spec b/gstreamer-plugins-bad-free.spec index 9583897..db60652 100644 --- a/gstreamer-plugins-bad-free.spec +++ b/gstreamer-plugins-bad-free.spec @@ -14,7 +14,7 @@ Summary: GStreamer streaming media framework "bad" plug-ins Name: gstreamer-plugins-bad-free Version: 0.10.23 -Release: 25%{?dist} +Release: 26%{?dist} # The freeze and nfs plugins are LGPLv2 (only) License: LGPLv2+ and LGPLv2 Group: Applications/Multimedia @@ -36,6 +36,8 @@ Patch5: 0005-geometrictransform-crash-fix1.patch Patch6: 0006-geometrictransform-crash-fix2.patch Patch7: 0001-Delete-unbuilt-plugins-from-the-docs.patch Patch8: 0001-modplug-Specify-directory-when-including-stdafx.h.patch +# No longer needed, actually break build if we have them now. +Patch9: gst-plugins-bad-0.10.23-drop-vpx-compat-defines.patch Requires: %{gstreamer} >= %{gst_minver} BuildRequires: %{gstreamer}-devel >= %{gst_minver} @@ -169,6 +171,7 @@ aren't tested well enough, or the code is not of good enough quality. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure @@ -367,6 +370,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la %changelog * Mon Apr 6 2015 Tom Callaway - 0.10.23-25 - rebuild for libvpx 1.4.0 +- fix build against libvpx 1.4.0 * Mon Aug 26 2014 Peter Robinson 0.10.23-24 - Drop celt as it's long dead, should be using opus now