Update to FluidSynth v2.2.5

dwhinham · Jan 23, 2022 · ae30e8d · ae30e8d
1 parent 14f4c73
commit ae30e8d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Implemented RNFR/RNTO (file/directory renaming) in the FTP server.
 
+### Changed
+
+- Update to FluidSynth v2.2.5.
+
 ### Fixed
 
 - A bug in the config file reader (unterminated string) could cause the last entry in the file to be read as a corrupted value if the file ended without a newline.

diff --git a/Makefile b/Makefile
@@ -69,7 +69,7 @@ $(MT32EMUBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
 fluidsynth: $(FLUIDSYNTHBUILDDIR)/.done
 
 $(FLUIDSYNTHBUILDDIR)/.done: $(CIRCLESTDLIBHOME)/.done
-	@patch -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.4-circle.patch
+	@patch -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.5-circle.patch
 
 	@export CFLAGS="$(CFLAGS_FOR_TARGET)"
 	@cmake  -B $(FLUIDSYNTHBUILDDIR) \
@@ -121,7 +121,7 @@ clean:
 veryclean: clean
 	# Reverse patches
 	@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.3-minimal-usb-drivers.patch
-	@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.4-circle.patch
+	@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.5-circle.patch
 
 	# Clean circle-stdlib
 	@$(MAKE) -C $(CIRCLESTDLIBHOME) mrproper

diff --git a/external/fluidsynth b/external/fluidsynth
diff --git a/patches/fluidsynth-2.2.4-circle.patch → patches/fluidsynth-2.2.5-circle.patch b/patches/fluidsynth-2.2.4-circle.patch → patches/fluidsynth-2.2.5-circle.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4ea71c6..b22a5a1d 100644
+index 93000f71..7bd17145 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -492,6 +492,7 @@ if ( ASTYLE )
@@ -19,7 +19,7 @@ index e4ea71c6..b22a5a1d 100644
  unset ( AUFILE_SUPPORT CACHE )
  if ( enable-aufile )
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4f3ef86a..63e52d13 100644
+index 2803ca88..a8f2c482 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -203,23 +203,23 @@ set ( libfluidsynth_SOURCES
@@ -64,7 +64,7 @@ index 4f3ef86a..63e52d13 100644
 
  set ( public_HEADERS
 diff --git a/src/sfloader/fluid_sfont.c b/src/sfloader/fluid_sfont.c
-index 8b4d4f17..fc5ecef5 100644
+index 26dbac65..7ab9dc09 100644
 --- a/src/sfloader/fluid_sfont.c
 +++ b/src/sfloader/fluid_sfont.c
 @@ -22,6 +22,7 @@
@@ -90,7 +90,7 @@ index 8b4d4f17..fc5ecef5 100644
  /**
   * Creates a new SoundFont loader.
 diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
-index fc0d35fc..3743f35f 100644
+index b6a8c3ee..7b083255 100644
 --- a/src/synth/fluid_synth.c
 +++ b/src/synth/fluid_synth.c
 @@ -108,7 +108,9 @@ static int fluid_synth_render_blocks(fluid_synth_t *synth, int blockcount);
@@ -119,7 +119,7 @@ index fc0d35fc..3743f35f 100644
 
      if(synth->channel != NULL)
      {
-@@ -5431,14 +5435,17 @@ fluid_synth_sfont_unref(fluid_synth_t *synth, fluid_sfont_t *sfont)
+@@ -5437,14 +5441,17 @@ fluid_synth_sfont_unref(fluid_synth_t *synth, fluid_sfont_t *sfont)
          {
              FLUID_LOG(FLUID_DBG, "Unloaded SoundFont");
          } /* spin off a timer thread to unload the sfont later (SoundFont loader blocked unload) */
@@ -137,23 +137,23 @@ index fc0d35fc..3743f35f 100644
  /* Callback to continually attempt to unload a SoundFont,
   * only if a SoundFont loader blocked the unload operation */
  static int
-@@ -5456,6 +5463,7 @@ fluid_synth_sfunload_callback(void *data, unsigned int msec)
+@@ -5462,6 +5469,7 @@ fluid_synth_sfunload_callback(void *data, unsigned int msec)
          return TRUE;
      }
  }
 +#endif
 
  /**
   * Reload a SoundFont.  The SoundFont retains its ID and index on the SoundFont stack.
-@@ -7553,6 +7561,7 @@ fluid_synth_get_gen(fluid_synth_t *synth, int chan, int param)
+@@ -7559,6 +7567,7 @@ fluid_synth_get_gen(fluid_synth_t *synth, int chan, int param)
      FLUID_API_RETURN(result);
  }
 
 +#if 0
  /**
   * Handle MIDI event from MIDI router, used as a callback function.
   * @param data FluidSynth instance
-@@ -7609,6 +7618,7 @@ fluid_synth_handle_midi_event(void *data, fluid_midi_event_t *event)
+@@ -7615,6 +7624,7 @@ fluid_synth_handle_midi_event(void *data, fluid_midi_event_t *event)
 
      return FLUID_FAILED;
  }
+8 −8		.azure/azure-pipelines-android.yml
+25 −5		.azure/azure-pipelines-mac.yml
+8 −4		.azure/azure-pipelines-vcpkg.yml
+21 −0		.azure/azure-pipelines-win.yml
+5 −0		.github/workflows/linux.yml
+1 −0		.obs/workflows.yml
+5 −5		CMakeLists.txt
+9 −4		cmake_admin/DefaultDirs.cmake
+3 −3		doc/fluidsynth-v20-devdoc.txt
+1 −1		doc/fluidsynth.1
+12 −6		src/CMakeLists.txt
+7 −0		src/bindings/fluid_filerenderer.c
+11 −0		src/drivers/fluid_midishare.c
+33 −0		src/drivers/fluid_oss.c
+1 −1		src/fluidsynth.c
+1 −1		src/midi/fluid_midi.c
+27 −4		src/sfloader/fluid_defsfont.c
+13 −6		src/sfloader/fluid_sfont.c
+7 −1		src/synth/fluid_synth.c