fluidsynth, bump version (#3944)

* move binary to tools package, use included testcase
This commit is contained in:
Schrijvers Luc
2019-06-24 20:02:06 +02:00
committed by Jérôme Duval
parent 2578563bbf
commit 923719584a
3 changed files with 86 additions and 12 deletions

View File

@@ -0,0 +1,42 @@
From 02dff4641fa2e4691947096c354859ce9f8aa565 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 22 Jun 2019 08:26:38 +0200
Subject: Fix gcc2 build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b33a07c..b81214d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ if ( CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_
endif ( NOT APPLE AND NOT OS2 )
# define some warning flags
- set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wno-unused-parameter -Wdeclaration-after-statement" )
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wpointer-arith -Wcast-qual -Wstrict-prototypes" )
if ( CMAKE_C_COMPILER_ID STREQUAL "Intel" )
# icc needs the restrict flag to recognize C99 restrict pointers
diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
index a4b00d0..007a3c3 100644
--- a/src/synth/fluid_synth.c
+++ b/src/synth/fluid_synth.c
@@ -214,6 +214,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
fluid_settings_register_str(settings, "midi.portname", "", 0);
#ifdef __HAIKU__
+ {
char midiSettings[PATH_MAX] = "";
if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, midiSettings, sizeof(midiSettings)) == B_OK) {
strcat(midiSettings, "/Media/midi_settings");
@@ -228,6 +229,7 @@ void fluid_synth_settings(fluid_settings_t *settings)
}
}
}
+ }
#else
#ifdef DEFAULT_SOUNDFONT
fluid_settings_register_str(settings, "synth.default-soundfont", DEFAULT_SOUNDFONT, 0);
--
2.21.0