pool/buzztrax
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 758991 from multimedia:apps

Browse Source 
Removed conditional for 0001-Fix-build-with-fluidsynth-2.x.patch  buzztrax now builds with fluidsynth one and two with the patch.

OBS-URL: https://build.opensuse.org/request/show/758991
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/buzztrax?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2019-12-23 21:47:12 +00:00 committed by Git OBS Bridge
commit 74f5fabae8
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
0001-Fix-build-with-fluidsynth-2.x.patch
View File

@ -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 <plugwash@debian.org> From: Peter Michael Green <plugwash@debian.org>
Date: Thu, 19 Dec 2019 01:38:18 +0000 Date: Thu, 19 Dec 2019 01:38:18 +0000
Subject: [PATCH] Fix build with fluidsynth 2.x Subject: [PATCH] Fix build with fluidsynth 2.x
--- ---
src/gst/fluidsynth/fluidsynth.c | 44 +++++++++++++++++++++++++++++++++++++++-- src/gst/fluidsynth/fluidsynth.c | 42 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 2 deletions(-) 1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/src/gst/fluidsynth/fluidsynth.c b/src/gst/fluidsynth/fluidsynth.c 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 --- a/src/gst/fluidsynth/fluidsynth.c
+++ b/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); @@ -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); G_PARAM_READWRITE);
break; break;
case FLUID_STR_TYPE: case FLUID_STR_TYPE:
- defstr = fluid_settings_getstr_default (bag->settings, name);
+#if FLUIDSYNTH_VERSION_MAJOR < 2 +#if FLUIDSYNTH_VERSION_MAJOR < 2
+ fluid_settings_getstr_default (bag->settings, name); defstr = fluid_settings_getstr_default (bag->settings, name);
+#else +#else
+ if (fluid_settings_getstr_default (bag->settings, name,&defstr) != FLUID_OK) defstr = 0; + if (fluid_settings_getstr_default (bag->settings, name,&defstr) != FLUID_OK) defstr = 0;
+#endif +#endif

6
buzztrax.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 23 10:46:09 UTC 2019 - Dave Plater <davejplater@gmail.com>
- 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 <davejplater@gmail.com> Thu Dec 19 12:06:53 UTC 2019 - Dave Plater <davejplater@gmail.com>

6
buzztrax.spec
View File

@ -205,10 +205,8 @@ This package contains buzztrax plugins
%prep %prep
%setup -q -n %{name}-%{rev} %setup -q -n %{name}-%{rev}
# Patch causes fluidsynth1 build failure.
%if 0%{?suse_version} > 1500 %autopatch -p1
%patch0 -p1
%endif
# Rpmlint complains that COPYING-DOCS is outdated # Rpmlint complains that COPYING-DOCS is outdated
cp -v %{SOURCE2} . cp -v %{SOURCE2} .
cp -v %{SOURCE1} . cp -v %{SOURCE1} .