From ff138b93fe02f27ae37d909b7b8564441e4432a3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 6 Oct 2016 10:39:38 +0200 Subject: [PATCH] fix building with libtimidity-0.2.x Signed-off-by: Igor Gnatenko --- gst-plugins-bad-0.10.23-timidity2.diff | 12 ++++++++++++ gstreamer-plugins-bad-free.spec | 15 +++------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 gst-plugins-bad-0.10.23-timidity2.diff diff --git a/gst-plugins-bad-0.10.23-timidity2.diff b/gst-plugins-bad-0.10.23-timidity2.diff new file mode 100644 index 0000000..c91e3e3 --- /dev/null +++ b/gst-plugins-bad-0.10.23-timidity2.diff @@ -0,0 +1,12 @@ +diff -uNr gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c +--- gst-plugins-bad-0.10.23/ext/timidity/gsttimidity.c 2011-12-30 19:24:28.000000000 +0100 ++++ gst-plugins-bad-0.10.23.timidity/ext/timidity/gsttimidity.c 2016-10-06 10:37:54.076801395 +0200 +@@ -615,7 +615,7 @@ + GST_DEBUG_OBJECT (timidity, "Parsing song"); + + stream = +- mid_istream_open_mem (timidity->mididata, timidity->mididata_size, 0); ++ mid_istream_open_mem (timidity->mididata, timidity->mididata_size); + + timidity->song = mid_song_load (stream, timidity->song_options); + mid_istream_close (stream); diff --git a/gstreamer-plugins-bad-free.spec b/gstreamer-plugins-bad-free.spec index aa3e7d3..4e747c8 100644 --- a/gstreamer-plugins-bad-free.spec +++ b/gstreamer-plugins-bad-free.spec @@ -40,6 +40,8 @@ Patch8: 0001-modplug-Specify-directory-when-including-stdafx.h.patch Patch9: gst-plugins-bad-0.10.23-drop-vpx-compat-defines.patch # Fix building docs Patch10: gst-plugins-bad-0.10.23-docbuild.patch +# Fix for libtimidity-0.2.x +Patch11: gst-plugins-bad-0.10.23-timidity2.diff Requires: %{gstreamer} >= %{gst_minver} BuildRequires: %{gstreamer}-devel >= %{gst_minver} @@ -162,18 +164,7 @@ aren't tested well enough, or the code is not of good enough quality. %prep -%setup -q -n gst-plugins-bad-%{version} -%patch0 -p1 -b .vp8enc_bitrate -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -b .docbuild +%autosetup -n gst-plugins-bad-%{version} -p1 sed -i 's/opencv <= 2.3.1/opencv <= 2.4.3/g' configure