Windows: Update fluidsynth and ICU

shared/fluidsynth-no-deps.patch

@@ -1,14 +1,14 @@
-From dbc6a1bb295fcf815b15ccc963143f8b8589e3ff Mon Sep 17 00:00:00 2001
+From 379520cc8fe8fb35542bd5273d3d6d81cf4e8d61 Mon Sep 17 00:00:00 2001
 From: Ghabry
 Date: Fri, 17 Mar 2023 14:02:43 +0100
 Subject: [PATCH 2/2] Disable most features
 
 ---
- CMakeLists.txt | 54 +++++++++++++++++++++++++-------------------------
- 1 file changed, 27 insertions(+), 27 deletions(-)
+ CMakeLists.txt | 52 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d86b9bc..d58e43f 100644
+index 8d48251..eb2da3b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -76,41 +76,41 @@ option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" of
@@ -43,20 +43,19 @@ index d86b9bc..d58e43f 100644
 -option ( enable-wasapi "compile Windows WASAPI support (if it is available)" on )
 -option ( enable-waveout "compile Windows WaveOut support (if it is available)" on )
 -option ( enable-winmidi "compile Windows MIDI support (if it is available)" on )
--option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on )
--option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
--option ( enable-pipewire "compile PipeWire support (if it is available)" on )
--option ( enable-readline "compile readline lib line editing (if it is available)" on )
--option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
--option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" on )
--option ( enable-unicode "enable UNICODE build for Windows" on )
 +option ( enable-network "enable network support (requires BSD sockets)" off )
 +option ( enable-oss "compile OSS support (if it is available)" off )
 +option ( enable-dsound "compile DirectSound support (if it is available)" off )
 +option ( enable-wasapi "compile Windows WASAPI support (if it is available)" off )
 +option ( enable-waveout "compile Windows WaveOut support (if it is available)" off )
 +option ( enable-winmidi "compile Windows MIDI support (if it is available)" off )
-+option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off )
+ option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off )
+-option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
+-option ( enable-pipewire "compile PipeWire support (if it is available)" on )
+-option ( enable-readline "compile readline lib line editing (if it is available)" on )
+-option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
+-option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" on )
+-option ( enable-unicode "enable UNICODE build for Windows" on )
 +option ( enable-pulseaudio "compile PulseAudio support (if it is available)" off )
 +option ( enable-pipewire "compile PipeWire support (if it is available)" off )
 +option ( enable-readline "compile readline lib line editing (if it is available)" off )
@@ -81,5 +80,5 @@ index d86b9bc..d58e43f 100644
 
  if ( CMAKE_SYSTEM MATCHES "OS2" )
 -- 
-2.47.1
+2.48.1
 

shared/fluidsynth-no-glib.patch

@@ -1,10 +1,11 @@
-From 4edd86332c57377c74a3694129ba9efb91ad82d9 Mon Sep 17 00:00:00 2001
+From 192ef394e0806aaff18aa0d04eeb56b9a7df058d Mon Sep 17 00:00:00 2001
 From: Ghabry
 Date: Fri, 17 Mar 2023 14:00:45 +0100
 Subject: [PATCH 1/2] Shim glib
 
 ---
  CMakeLists.txt                   |  4 +-
+ FluidSynthConfig.cmake.in        |  2 +-
  src/CMakeLists.txt               |  3 +-
  src/bindings/fluid_cmd.c         |  3 +
  src/glib_shim.c                  | 12 ++++
@@ -18,12 +19,12 @@ Subject: [PATCH 1/2] Shim glib
  src/utils/fluid_sys.c            |  9 ++-
  src/utils/fluid_sys.h            |  8 +--
  src/utils/fluidsynth_priv.h      |  2 +-
- 14 files changed, 142 insertions(+), 35 deletions(-)
+ 15 files changed, 143 insertions(+), 36 deletions(-)
  create mode 100644 src/glib_shim.c
  create mode 100644 src/glib_shim.h
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 849f8b3..d86b9bc 100644
+index 75b8862..8d48251 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -533,8 +533,8 @@ if ( CMAKE_VERSION VERSION_GREATER_EQUAL 3.15 AND VCPKG_TOOLCHAIN )
@@ -37,8 +38,21 @@ index 849f8b3..d86b9bc 100644
 
  if ( GLib2_VERSION AND GLib2_VERSION VERSION_LESS "2.26.0" )
      message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" )
+diff --git a/FluidSynthConfig.cmake.in b/FluidSynthConfig.cmake.in
+index d2e0c5e..683d10c 100644
+--- a/FluidSynthConfig.cmake.in
++++ b/FluidSynthConfig.cmake.in
+@@ -73,7 +73,7 @@ if(NOT FLUIDSYNTH_IS_SHARED)
+   endif()
+
+   if(NOT TARGET GLib2::glib-2 OR NOT TARGET GLib2::gthread-2)
+-    find_dependency(GLib2 @GLIB2_MINUMUM_VERSION@)
++    #find_dependency(GLib2 @GLIB2_MINUMUM_VERSION@)
+   endif()
+
+   # Optional dependencies
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a2f9e55..e2a1d75 100644
+index 0275227..65d8a1a 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -108,6 +108,7 @@ endif ( OBOE_SUPPORT )
@@ -49,7 +63,7 @@ index a2f9e55..e2a1d75 100644
      utils/fluid_conv.c
      utils/fluid_conv.h
      utils/fluid_hash.c
-@@ -363,7 +364,7 @@ if ( TARGET OpenMP::OpenMP_C AND HAVE_OPENMP )
+@@ -352,7 +353,7 @@ if ( TARGET OpenMP::OpenMP_C AND HAVE_OPENMP )
      target_link_libraries ( libfluidsynth-OBJ PUBLIC OpenMP::OpenMP_C )
  endif()
 
@@ -308,10 +322,10 @@ index 64e9e9e..4c504c0 100644
  }
 
 diff --git a/src/sfloader/fluid_sffile.c b/src/sfloader/fluid_sffile.c
-index 8359424..2aae4db 100644
+index 21535c9..ee3aa0b 100644
 --- a/src/sfloader/fluid_sffile.c
 +++ b/src/sfloader/fluid_sffile.c
-@@ -2252,10 +2252,14 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
+@@ -2258,10 +2258,14 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
      if(FLUID_IS_BIG_ENDIAN)
      {
          unsigned int i;
@@ -328,10 +342,10 @@ index 8359424..2aae4db 100644
      }
 
 diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
-index e356982..dbfe900 100644
+index 82cfac4..76fed3d 100644
 --- a/src/synth/fluid_synth.c
 +++ b/src/synth/fluid_synth.c
-@@ -636,8 +636,9 @@ new_fluid_synth(fluid_settings_t *settings)
+@@ -637,8 +637,9 @@ new_fluid_synth(fluid_settings_t *settings)
      double sample_rate_min, sample_rate_max;
 
      /* initialize all the conversion tables and other stuff */
@@ -342,7 +356,7 @@ index e356982..dbfe900 100644
          fluid_synth_init();
      }
 
-@@ -813,7 +814,7 @@ new_fluid_synth(fluid_settings_t *settings)
+@@ -817,7 +818,7 @@ new_fluid_synth(fluid_settings_t *settings)
 
      fluid_atomic_int_set(&synth->ticks_since_start, 0);
      synth->tuning = NULL;
@@ -351,7 +365,7 @@ index e356982..dbfe900 100644
 
      /* Initialize multi-core variables if multiple cores enabled */
      if(synth->cores > 1)
-@@ -1199,7 +1200,7 @@ delete_fluid_synth(fluid_synth_t *synth)
+@@ -1203,7 +1204,7 @@ delete_fluid_synth(fluid_synth_t *synth)
          FLUID_FREE(synth->tuning);
      }
 
@@ -360,7 +374,7 @@ index e356982..dbfe900 100644
 
  #ifdef LADSPA
      /* Release the LADSPA effects unit */
-@@ -7450,7 +7451,7 @@ fluid_synth_tuning_iteration_start(fluid_synth_t *synth)
+@@ -7451,7 +7452,7 @@ fluid_synth_tuning_iteration_start(fluid_synth_t *synth)
  {
      fluid_return_if_fail(synth != NULL);
      fluid_synth_api_enter(synth);
@@ -369,7 +383,7 @@ index e356982..dbfe900 100644
      fluid_synth_api_exit(synth);
  }
 
-@@ -7473,7 +7474,7 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
+@@ -7474,7 +7475,7 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
      fluid_synth_api_enter(synth);
 
      /* Current tuning iteration stored as: bank << 8 | program */
@@ -378,7 +392,7 @@ index e356982..dbfe900 100644
      p = FLUID_POINTER_TO_INT(pval);
      b = (p >> 8) & 0xFF;
      p &= 0xFF;
-@@ -7502,12 +7503,11 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
+@@ -7503,12 +7504,11 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
 
              if(p < 127)
              {
@@ -394,10 +408,10 @@ index e356982..dbfe900 100644
 
              FLUID_API_RETURN(1);
 diff --git a/src/synth/fluid_synth.h b/src/synth/fluid_synth.h
-index 7dbcdc5..97f5175 100644
+index bcd964f..56c7976 100644
 --- a/src/synth/fluid_synth.h
 +++ b/src/synth/fluid_synth.h
-@@ -152,7 +152,7 @@ struct _fluid_synth_t
+@@ -158,7 +158,7 @@ struct _fluid_synth_t
      fluid_atomic_float_t cpu_load;                    /**< CPU load in percent (CPU time required / audio synthesized time * 100) */
 
      fluid_tuning_t ***tuning;          /**< 128 banks of 128 programs for the tunings */
@@ -462,7 +476,7 @@ index babb11f..e82094b 100644
  #if OLD_GLIB_THREAD_API
 
 diff --git a/src/utils/fluid_sys.h b/src/utils/fluid_sys.h
-index a756fc0..73abd98 100644
+index f491254..1521c4c 100644
 --- a/src/utils/fluid_sys.h
 +++ b/src/utils/fluid_sys.h
 @@ -175,7 +175,7 @@ typedef gintptr  intptr_t;
@@ -472,9 +486,9 @@ index a756fc0..73abd98 100644
 -#include <glib/gstdio.h>
 +#include "glib_shim.h"
 
- /**
-  * Macro used for safely accessing a message from a GError and using a default
-@@ -183,7 +183,7 @@ typedef gintptr  intptr_t;
+ #ifdef __cplusplus
+ extern "C" {
+@@ -187,7 +187,7 @@ extern "C" {
   * @param err Pointer to a GError to access the message field of.
   * @return Message string
   */
@@ -483,7 +497,7 @@ index a756fc0..73abd98 100644
 
  #if defined(_WIN32) || defined(__CYGWIN__)
  char* fluid_get_windows_error(void);
-@@ -336,13 +336,13 @@ delete_fluid_cond(fluid_cond_t *cond)
+@@ -340,13 +340,13 @@ delete_fluid_cond(fluid_cond_t *cond)
  }
 
  /* Thread private data */
@@ -513,5 +527,5 @@ index 67e97ab..9dcfbb7 100644
  #if HAVE_STDLIB_H
  #include <stdlib.h> // malloc, free
 -- 
-2.47.1
+2.48.1
 

shared/packages.ini

@@ -107,7 +107,7 @@ arguments = "--disable-http --disable-examples"
 anitya_id = 10353
 
 [fluidsynth]
-version = 2.4.2
+version = 2.4.3
 url = "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v${version}.tar.gz"
 arguments = "-DLIB_SUFFIX=''"
 anitya_id = 10437

shared/packages.sh

@@ -72,9 +72,9 @@ OPUSFILE_URL="https://github.com/xiph/opusfile/releases/download/v0.12/opusfile-
 OPUSFILE_ARGS="--disable-http --disable-examples"
 OPUSFILE_DIR="opusfile-0.12"
 
-FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.4.2.tar.gz"
+FLUIDSYNTH_URL="https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.4.3.tar.gz"
 FLUIDSYNTH_ARGS="-DLIB_SUFFIX=''"
-FLUIDSYNTH_DIR="fluidsynth-2.4.2"
+FLUIDSYNTH_DIR="fluidsynth-2.4.3"
 
 FLUIDLITE_URL="https://github.com/divideconcept/FluidLite/archive/57a0e74e708f699b13d7c85b28a4e1ff5b71887c.zip"
 FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF"

windows/fluidsynth-easyrpg/fluidsynth-no-deps.patch

@@ -1,20 +1,21 @@
-From d11f0149429f8fc5a2f9ad79c7d9040bf72af5cc Mon Sep 17 00:00:00 2001
+From 379520cc8fe8fb35542bd5273d3d6d81cf4e8d61 Mon Sep 17 00:00:00 2001
 From: Ghabry
 Date: Fri, 17 Mar 2023 14:02:43 +0100
-Subject: [PATCH] Disable most features
+Subject: [PATCH 2/2] Disable most features
 
 ---
- CMakeLists.txt | 54 +++++++++++++++++++++++++-------------------------
- 1 file changed, 27 insertions(+), 27 deletions(-)
+ CMakeLists.txt | 52 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 433197fe..df81f4c7 100644
+index 8d48251..eb2da3b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,44 +76,44 @@ option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" of
+@@ -76,41 +76,41 @@ option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" of
  option ( enable-ubsan "compile and link against UBSan (for debugging fluidsynth internals)" off )
 
  # Options enabled by default
+-option ( enable-alsa "compile ALSA support (if it is available)" on )
 -option ( enable-aufile "compile support for sound file output" on )
 -option ( BUILD_SHARED_LIBS "Build a shared object or DLL" on )
 -option ( enable-dbus "compile DBUS support (if it is available)" on )
@@ -24,6 +25,7 @@ index 433197fe..df81f4c7 100644
 -option ( enable-libinstpatch "use libinstpatch (if available) to load DLS and GIG files" on )
 -option ( enable-libsndfile "compile libsndfile support (if it is available)" on )
 -option ( enable-midishare "compile MidiShare support (if it is available)" on )
++option ( enable-alsa "compile ALSA support (if it is available)" off )
 +option ( enable-aufile "compile support for sound file output" off )
 +option ( BUILD_SHARED_LIBS "Build a shared object or DLL" off )
 +option ( enable-dbus "compile DBUS support (if it is available)" off )
@@ -41,32 +43,27 @@ index 433197fe..df81f4c7 100644
 -option ( enable-wasapi "compile Windows WASAPI support (if it is available)" on )
 -option ( enable-waveout "compile Windows WaveOut support (if it is available)" on )
 -option ( enable-winmidi "compile Windows MIDI support (if it is available)" on )
--option ( enable-sdl2 "compile SDL2 audio support (if it is available)" on )
--option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
--option ( enable-pipewire "compile PipeWire support (if it is available)" on )
--option ( enable-readline "compile readline lib line editing (if it is available)" on )
--option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
--option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" on )
 +option ( enable-network "enable network support (requires BSD sockets)" off )
 +option ( enable-oss "compile OSS support (if it is available)" off )
 +option ( enable-dsound "compile DirectSound support (if it is available)" off )
 +option ( enable-wasapi "compile Windows WASAPI support (if it is available)" off )
 +option ( enable-waveout "compile Windows WaveOut support (if it is available)" off )
 +option ( enable-winmidi "compile Windows MIDI support (if it is available)" off )
-+option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off )
+ option ( enable-sdl2 "compile SDL2 audio support (if it is available)" off )
+-option ( enable-pulseaudio "compile PulseAudio support (if it is available)" on )
+-option ( enable-pipewire "compile PipeWire support (if it is available)" on )
+-option ( enable-readline "compile readline lib line editing (if it is available)" on )
+-option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" on )
+-option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" on )
+-option ( enable-unicode "enable UNICODE build for Windows" on )
 +option ( enable-pulseaudio "compile PulseAudio support (if it is available)" off )
 +option ( enable-pipewire "compile PipeWire support (if it is available)" off )
 +option ( enable-readline "compile readline lib line editing (if it is available)" off )
 +option ( enable-threads "enable multi-threading support (such as parallel voice synthesis)" off )
 +option ( enable-openmp "enable OpenMP support (parallelization of soundfont decoding, vectorization of voice mixing, etc.)" off )
++option ( enable-unicode "enable UNICODE build for Windows" off )
 
  # Platform specific options
- if ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
-     option ( enable-lash "compile LASH support (if it is available)" off )
--    option ( enable-alsa "compile ALSA support (if it is available)" on )
-+    option ( enable-alsa "compile ALSA support (if it is available)" off )
- endif ( CMAKE_SYSTEM MATCHES "Linux|FreeBSD|DragonFly" )
-
  if ( CMAKE_SYSTEM MATCHES "Linux" )
 -    option ( enable-systemd "compile systemd support (if it is available)" on )
 +    option ( enable-systemd "compile systemd support (if it is available)" off )
@@ -83,5 +80,5 @@ index 433197fe..df81f4c7 100644
 
  if ( CMAKE_SYSTEM MATCHES "OS2" )
 -- 
-2.44.0
+2.48.1