diff --git a/0001-Fix-build-with-fluidsynth-2.x.patch b/0001-Fix-build-with-fluidsynth-2.x.patch index db44630..7672b1c 100644 --- a/0001-Fix-build-with-fluidsynth-2.x.patch +++ b/0001-Fix-build-with-fluidsynth-2.x.patch @@ -1,14 +1,14 @@ -From 3ac7cbf1a712c3f4db7a34a6d3b46dc9a43172d3 Mon Sep 17 00:00:00 2001 +From 38b421440c55d5d8ba74be99c37cf117cad01541 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 19 Dec 2019 01:38:18 +0000 Subject: [PATCH] Fix build with fluidsynth 2.x --- - src/gst/fluidsynth/fluidsynth.c | 44 +++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 42 insertions(+), 2 deletions(-) + src/gst/fluidsynth/fluidsynth.c | 42 ++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c -index 0d954f8e..ec598dc4 100644 +index 0d954f8e..4a091146 100644 --- a/src/gst/fluidsynth/fluidsynth.c +++ b/src/gst/fluidsynth/fluidsynth.c @@ -132,25 +132,41 @@ G_DEFINE_TYPE (GstBtFluidSynth, gstbt_fluid_synth, GSTBT_TYPE_AUDIO_SYNTH); @@ -100,9 +100,8 @@ index 0d954f8e..ec598dc4 100644 G_PARAM_READWRITE); break; case FLUID_STR_TYPE: -- defstr = fluid_settings_getstr_default (bag->settings, name); +#if FLUIDSYNTH_VERSION_MAJOR < 2 -+ fluid_settings_getstr_default (bag->settings, name); + defstr = fluid_settings_getstr_default (bag->settings, name); +#else + if (fluid_settings_getstr_default (bag->settings, name,&defstr) != FLUID_OK) defstr = 0; +#endif diff --git a/buzztrax.changes b/buzztrax.changes index 4e10696..cc909cb 100644 --- a/buzztrax.changes +++ b/buzztrax.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 23 10:46:09 UTC 2019 - Dave Plater + +- Removed conditional for 0001-Fix-build-with-fluidsynth-2.x.patch + buzztrax now builds with fluidsynth one and two with the patch. + ------------------------------------------------------------------- Thu Dec 19 12:06:53 UTC 2019 - Dave Plater diff --git a/buzztrax.spec b/buzztrax.spec index cdb5176..4ae221b 100644 --- a/buzztrax.spec +++ b/buzztrax.spec @@ -205,10 +205,8 @@ This package contains buzztrax plugins %prep %setup -q -n %{name}-%{rev} -# Patch causes fluidsynth1 build failure. -%if 0%{?suse_version} > 1500 -%patch0 -p1 -%endif + +%autopatch -p1 # Rpmlint complains that COPYING-DOCS is outdated cp -v %{SOURCE2} . cp -v %{SOURCE1} .