From fdcddc736b8e3fec528b7414b6a2259bc880e4cf Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 4 Sep 2019 04:22:24 +0200
Subject: Update Fluidsynth to v2.0.6-git

---
 tools/fluid-patches/ardour_fluidsynth.diff | 39 +++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'tools/fluid-patches')

diff --git a/tools/fluid-patches/ardour_fluidsynth.diff b/tools/fluid-patches/ardour_fluidsynth.diff
index 7fe7d494e8..70c2a2275a 100644
--- a/tools/fluid-patches/ardour_fluidsynth.diff
+++ b/tools/fluid-patches/ardour_fluidsynth.diff
@@ -78,7 +78,7 @@ index 946a873bbf..79f83a4583 100644
  /*
   * fluid_hashtable_foreach_remove_or_steal:
 diff --git b/libs/fluidsynth/src/fluid_midi.c a/libs/fluidsynth/src/fluid_midi.c
-index 6e527b1822..5b2efe0b9b 100644
+index cd0d23ced3..c92fb2fefa 100644
 --- b/libs/fluidsynth/src/fluid_midi.c
 +++ a/libs/fluidsynth/src/fluid_midi.c
 @@ -77,7 +77,7 @@ static int fluid_midi_file_read_tracklen(fluid_midi_file *mf);
@@ -107,13 +107,13 @@ index 6e527b1822..5b2efe0b9b 100644
  /*
   * new_fluid_track
   */
-@@ -2518,3 +2519,4 @@ fluid_midi_event_length(unsigned char event)
+@@ -2504,3 +2505,4 @@ fluid_midi_event_length(unsigned char event)
  
      return 1;
  }
 +#endif
 diff --git b/libs/fluidsynth/src/fluid_mod.c a/libs/fluidsynth/src/fluid_mod.c
-index 84e97731e5..5e57455d4d 100644
+index 47547b5b5e..57313caf42 100644
 --- b/libs/fluidsynth/src/fluid_mod.c
 +++ a/libs/fluidsynth/src/fluid_mod.c
 @@ -603,7 +603,7 @@ fluid_mod_check_cc_source(const fluid_mod_t *mod, unsigned char src1_select)
@@ -123,7 +123,7 @@ index 84e97731e5..5e57455d4d 100644
 -int fluid_mod_check_sources(const fluid_mod_t *mod, char *name)
 +int fluid_mod_check_sources(const fluid_mod_t *mod, const char *name)
  {
-     static const char *invalid_non_cc_src =
+     static const char invalid_non_cc_src[] =
          "Invalid modulator, using non-CC source %s.src%d=%d";
 diff --git b/libs/fluidsynth/src/fluid_mod.h a/libs/fluidsynth/src/fluid_mod.h
 index 3e7661741f..ec8e967a35 100644
@@ -191,10 +191,18 @@ index 5b2b08748f..1811169846 100644
  
  static int
 diff --git b/libs/fluidsynth/src/fluid_synth.c a/libs/fluidsynth/src/fluid_synth.c
-index b72d5139ef..83d427fcac 100644
+index 426d3c4fc0..42064f93d6 100644
 --- b/libs/fluidsynth/src/fluid_synth.c
 +++ a/libs/fluidsynth/src/fluid_synth.c
-@@ -267,7 +267,7 @@ void fluid_version(int *major, int *minor, int *micro)
+@@ -25,7 +25,6 @@
+ #include "fluid_settings.h"
+ #include "fluid_sfont.h"
+ #include "fluid_defsfont.h"
+-#include "fluid_instpatch.h"
+ 
+ #ifdef TRAP_ON_FPE
+ #define _GNU_SOURCE
+@@ -268,7 +267,7 @@ void fluid_version(int *major, int *minor, int *micro)
   * @return FluidSynth version string, which is internal and should not be
   *   modified or freed.
   */
@@ -203,7 +211,16 @@ index b72d5139ef..83d427fcac 100644
  fluid_version_str(void)
  {
      return FLUIDSYNTH_VERSION;
-@@ -6419,6 +6419,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type)
+@@ -5509,7 +5508,7 @@ fluid_synth_set_interp_method(fluid_synth_t *synth, int chan, int interp_method)
+     }
+ 
+     FLUID_API_RETURN(FLUID_OK);
+-};
++}
+ 
+ /**
+  * Get the total count of MIDI channels.
+@@ -6447,6 +6446,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type)
      FLUID_API_RETURN(FLUID_OK);
  }
  
@@ -211,7 +228,7 @@ index b72d5139ef..83d427fcac 100644
  /**
   * Return the LADSPA effects instance used by FluidSynth
   *
-@@ -6431,6 +6432,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
+@@ -6459,6 +6459,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
  
      return synth->ladspa_fx;
  }
@@ -220,7 +237,7 @@ index b72d5139ef..83d427fcac 100644
  /**
   * Configure a general-purpose IIR biquad filter.
 diff --git b/libs/fluidsynth/src/fluid_synth.h a/libs/fluidsynth/src/fluid_synth.h
-index f061aeaf38..2b35f1fcb0 100644
+index 0b9758bad5..fe222f7b6f 100644
 --- b/libs/fluidsynth/src/fluid_synth.h
 +++ a/libs/fluidsynth/src/fluid_synth.h
 @@ -33,8 +33,6 @@
@@ -243,7 +260,7 @@ index f061aeaf38..2b35f1fcb0 100644
      enum fluid_iir_filter_flags custom_filter_flags; /**< filter type of the user-defined filter currently used for all voices */
  };
 diff --git b/libs/fluidsynth/src/fluid_sys.c a/libs/fluidsynth/src/fluid_sys.c
-index 4225583481..22694f21c5 100644
+index 5d123883b3..938c05cf22 100644
 --- b/libs/fluidsynth/src/fluid_sys.c
 +++ a/libs/fluidsynth/src/fluid_sys.c
 @@ -205,9 +205,10 @@ fluid_log(int level, const char *fmt, ...)
@@ -260,7 +277,7 @@ index 4225583481..22694f21c5 100644
  
      if(str == NULL || delim == NULL || !*delim)
 diff --git b/libs/fluidsynth/src/fluid_sys.h a/libs/fluidsynth/src/fluid_sys.h
-index 65c088ca3c..5d82b686dd 100644
+index 6490359027..3bc0c5a40f 100644
 --- b/libs/fluidsynth/src/fluid_sys.h
 +++ a/libs/fluidsynth/src/fluid_sys.h
 @@ -128,8 +128,9 @@ typedef guint64  uint64_t;
-- 
cgit v1.2.3