Merge pull request #197 from EasyRPG/update/libraries

Automatic library update

Author: Ghabry

android/1_download_library.sh

@@ -138,6 +138,10 @@ download_and_extract $OPUSFILE_URL
 rm -rf $FLUIDSYNTH_DIR
 download_and_extract $FLUIDSYNTH_URL
 
+# nlohmann-json
+rm -rf $NLOHMANNJSON_DIR
+download_and_extract $NLOHMANNJSON_URL
+
 # inih
 rm -rf $INIH_DIR
 download_and_extract $INIH_URL

android/2_build_toolchain.sh

@@ -116,6 +116,7 @@ function build() {
 	install_lib $OPUS_DIR $OPUS_ARGS
 	install_lib $OPUSFILE_DIR $OPUSFILE_ARGS
 	install_lib_cmake $FLUIDSYNTH_DIR $FLUIDSYNTH_ARGS
+	install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
 	install_lib_meson $INIH_DIR $INIH_ARGS
 	install_lib $LHASA_DIR $LHASA_ARGS
 	install_lib_cmake $FMT_DIR $FMT_ARGS

shared/common.sh

@@ -209,6 +209,7 @@ function install_lib_cmake {
 			-DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS $CPPFLAGS" \
 			-DCMAKE_INSTALL_LIBDIR=lib $CMAKE_AR $CMAKE_NM $CMAKE_RANLIB $CMAKE_CCACHE \
 			-DCMAKE_INSTALL_PREFIX=$PLATFORM_PREFIX -DCMAKE_SYSTEM_NAME=$CMAKE_SYSTEM_NAME \
+			-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 			-DCMAKE_PREFIX_PATH=$PLATFORM_PREFIX $CMAKE_EXTRA_ARGS $@
 		cmake --build build --target clean
 		cmake --build build

shared/fluidsynth-no-deps.patch

@@ -1,17 +1,17 @@
-From 379520cc8fe8fb35542bd5273d3d6d81cf4e8d61 Mon Sep 17 00:00:00 2001
+From 2ea138dfcb72e765a24fc205798d0b2dfa5c5a3a 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 | 52 +++++++++++++++++++++++++-------------------------
- 1 file changed, 26 insertions(+), 26 deletions(-)
+ CMakeLists.txt | 54 +++++++++++++++++++++++++-------------------------
+ 1 file changed, 27 insertions(+), 27 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d48251..eb2da3b 100644
+index 9c655a7..9259e38 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -76,41 +76,41 @@ option ( enable-trap-on-fpe "enable SIGFPE trap on Floating Point Exceptions" of
+@@ -76,42 +76,42 @@ 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
@@ -50,12 +50,14 @@ index 8d48251..eb2da3b 100644
 +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-sdl3 "compile SDL3 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-sdl3 "compile SDL3 audio support (if it is available)" off )
 +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 )
@@ -80,5 +82,5 @@ index 8d48251..eb2da3b 100644
 
  if ( CMAKE_SYSTEM MATCHES "OS2" )
 -- 
-2.48.1
+2.49.0
 

shared/fluidsynth-no-glib.patch

@@ -1,4 +1,4 @@
-From 192ef394e0806aaff18aa0d04eeb56b9a7df058d Mon Sep 17 00:00:00 2001
+From ef44302fb67f131ad7814ad699d71b56173d7f69 Mon Sep 17 00:00:00 2001
 From: Ghabry
 Date: Fri, 17 Mar 2023 14:00:45 +0100
 Subject: [PATCH 1/2] Shim glib
@@ -24,10 +24,10 @@ Subject: [PATCH 1/2] Shim glib
  create mode 100644 src/glib_shim.h
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 75b8862..8d48251 100644
+index e9f9b95..9c655a7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -533,8 +533,8 @@ if ( CMAKE_VERSION VERSION_GREATER_EQUAL 3.15 AND VCPKG_TOOLCHAIN )
+@@ -536,8 +536,8 @@ if ( CMAKE_VERSION VERSION_GREATER_EQUAL 3.15 AND VCPKG_TOOLCHAIN )
  endif ()
 
  # Mandatory libraries: glib and gthread
@@ -52,18 +52,18 @@ index d2e0c5e..683d10c 100644
 
    # Optional dependencies
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0275227..65d8a1a 100644
+index 02270ab..06d4c21 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -108,6 +108,7 @@ endif ( OBOE_SUPPORT )
+@@ -112,6 +112,7 @@ endif ( OBOE_SUPPORT )
  set ( config_SOURCES ${FluidSynth_BINARY_DIR}/config.h )
 
  set ( libfluidsynth_SOURCES
 +    glib_shim.c
      utils/fluid_conv.c
      utils/fluid_conv.h
      utils/fluid_hash.c
-@@ -352,7 +353,7 @@ if ( TARGET OpenMP::OpenMP_C AND HAVE_OPENMP )
+@@ -367,7 +368,7 @@ if ( TARGET OpenMP::OpenMP_C AND HAVE_OPENMP )
      target_link_libraries ( libfluidsynth-OBJ PUBLIC OpenMP::OpenMP_C )
  endif()
 
@@ -73,7 +73,7 @@ index 0275227..65d8a1a 100644
  if ( TARGET SndFile::sndfile AND LIBSNDFILE_SUPPORT )
      target_link_libraries ( libfluidsynth-OBJ PUBLIC SndFile::sndfile )
 diff --git a/src/bindings/fluid_cmd.c b/src/bindings/fluid_cmd.c
-index 444b263..74780e1 100644
+index 461ada6..1012132 100644
 --- a/src/bindings/fluid_cmd.c
 +++ b/src/bindings/fluid_cmd.c
 @@ -433,6 +433,8 @@ static const fluid_cmd_t fluid_commands[] =
@@ -213,7 +213,7 @@ index 0000000..08582e3
 +
 +#endif
 diff --git a/src/rvoice/fluid_rvoice_mixer.c b/src/rvoice/fluid_rvoice_mixer.c
-index c1e2fb2..9255313 100644
+index 3274855..0d5cf3d 100644
 --- a/src/rvoice/fluid_rvoice_mixer.c
 +++ b/src/rvoice/fluid_rvoice_mixer.c
 @@ -478,7 +478,6 @@ fluid_rvoice_buffers_mix(fluid_rvoice_buffers_t *buffers,
@@ -269,10 +269,10 @@ index c1e2fb2..9255313 100644
          {
              int dsp_i = i * FLUID_MIXER_MAX_BUFFERS_DEFAULT * FLUID_BUFSIZE + j;
 diff --git a/src/sfloader/fluid_defsfont.c b/src/sfloader/fluid_defsfont.c
-index b601621..a82362d 100644
+index 69619c8..9ca418e 100644
 --- a/src/sfloader/fluid_defsfont.c
 +++ b/src/sfloader/fluid_defsfont.c
-@@ -395,8 +395,6 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
+@@ -379,8 +379,6 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
          }
      }
 
@@ -281,7 +281,7 @@ index b601621..a82362d 100644
      for(list = defsfont->sample; list; list = fluid_list_next(list))
      {
          sample = fluid_list_get(list);
-@@ -405,11 +403,9 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
+@@ -389,11 +387,9 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
          {
              /* SF3 samples get loaded individually, as most (or all) of them are in Ogg Vorbis format
               * anyway */
@@ -293,7 +293,7 @@ index b601621..a82362d 100644
                      {
                          FLUID_LOG(FLUID_ERR, "Failed to load sample '%s'", sample->name);
                          sample_parsing_result = FLUID_FAILED;
-@@ -431,7 +427,6 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
+@@ -415,7 +411,6 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
          }
          else
          {
@@ -302,7 +302,7 @@ index b601621..a82362d 100644
                  int modified;
                  /* Data pointers of SF2 samples point to large sample data block loaded above */
 diff --git a/src/sfloader/fluid_samplecache.c b/src/sfloader/fluid_samplecache.c
-index 64e9e9e..4c504c0 100644
+index 6e268da..fce84b9 100644
 --- a/src/sfloader/fluid_samplecache.c
 +++ b/src/sfloader/fluid_samplecache.c
 @@ -282,6 +282,7 @@ static fluid_samplecache_entry_t *get_samplecache_entry(SFData *sf,
@@ -342,10 +342,10 @@ index 21535c9..ee3aa0b 100644
      }
 
 diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c
-index 82cfac4..76fed3d 100644
+index f6beb07..cea4254 100644
 --- a/src/synth/fluid_synth.c
 +++ b/src/synth/fluid_synth.c
-@@ -637,8 +637,9 @@ new_fluid_synth(fluid_settings_t *settings)
+@@ -652,8 +652,9 @@ new_fluid_synth(fluid_settings_t *settings)
      double sample_rate_min, sample_rate_max;
 
      /* initialize all the conversion tables and other stuff */
@@ -356,7 +356,7 @@ index 82cfac4..76fed3d 100644
          fluid_synth_init();
      }
 
-@@ -817,7 +818,7 @@ new_fluid_synth(fluid_settings_t *settings)
+@@ -832,7 +833,7 @@ new_fluid_synth(fluid_settings_t *settings)
 
      fluid_atomic_int_set(&synth->ticks_since_start, 0);
      synth->tuning = NULL;
@@ -365,7 +365,7 @@ index 82cfac4..76fed3d 100644
 
      /* Initialize multi-core variables if multiple cores enabled */
      if(synth->cores > 1)
-@@ -1203,7 +1204,7 @@ delete_fluid_synth(fluid_synth_t *synth)
+@@ -1219,7 +1220,7 @@ delete_fluid_synth(fluid_synth_t *synth)
          FLUID_FREE(synth->tuning);
      }
 
@@ -374,7 +374,7 @@ index 82cfac4..76fed3d 100644
 
  #ifdef LADSPA
      /* Release the LADSPA effects unit */
-@@ -7451,7 +7452,7 @@ fluid_synth_tuning_iteration_start(fluid_synth_t *synth)
+@@ -7474,7 +7475,7 @@ fluid_synth_tuning_iteration_start(fluid_synth_t *synth)
  {
      fluid_return_if_fail(synth != NULL);
      fluid_synth_api_enter(synth);
@@ -383,7 +383,7 @@ index 82cfac4..76fed3d 100644
      fluid_synth_api_exit(synth);
  }
 
-@@ -7474,7 +7475,7 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
+@@ -7497,7 +7498,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 */
@@ -392,7 +392,7 @@ index 82cfac4..76fed3d 100644
      p = FLUID_POINTER_TO_INT(pval);
      b = (p >> 8) & 0xFF;
      p &= 0xFF;
-@@ -7503,12 +7504,11 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
+@@ -7526,12 +7527,11 @@ fluid_synth_tuning_iteration_next(fluid_synth_t *synth, int *bank, int *prog)
 
              if(p < 127)
              {
@@ -408,7 +408,7 @@ index 82cfac4..76fed3d 100644
 
              FLUID_API_RETURN(1);
 diff --git a/src/synth/fluid_synth.h b/src/synth/fluid_synth.h
-index bcd964f..56c7976 100644
+index 262bdec..f925537 100644
 --- a/src/synth/fluid_synth.h
 +++ b/src/synth/fluid_synth.h
 @@ -158,7 +158,7 @@ struct _fluid_synth_t
@@ -421,7 +421,7 @@ index bcd964f..56c7976 100644
      fluid_sample_timer_t *sample_timers; /**< List of timers triggered before a block is processed */
      unsigned int min_note_length_ticks; /**< If note-offs are triggered just after a note-on, they will be delayed */
 diff --git a/src/utils/fluid_sys.c b/src/utils/fluid_sys.c
-index babb11f..e82094b 100644
+index 9b45d58..50cbe61 100644
 --- a/src/utils/fluid_sys.c
 +++ b/src/utils/fluid_sys.c
 @@ -33,7 +33,7 @@
@@ -527,5 +527,5 @@ index 67e97ab..9dcfbb7 100644
  #if HAVE_STDLIB_H
  #include <stdlib.h> // malloc, free
 -- 
-2.48.1
+2.49.0
 

shared/packages.ini

@@ -8,7 +8,7 @@ arguments = "-DZLIB_BUILD_EXAMPLES=OFF"
 anitya_id = 5303
 
 [libpng]
-version = 1.6.47
+version = 1.6.48
 url = "https://download.sourceforge.net/libpng/libpng-${version}.tar.xz"
 arguments = "-DPNG_SHARED=OFF -DPNG_EXECUTABLES=OFF -DPNG_TESTS=OFF"
 anitya_id = 1705
@@ -20,21 +20,21 @@ arguments = "-DFT_DISABLE_BZIP2=ON -DFT_DISABLE_BROTLI=ON"
 anitya_id = 854
 
 [harfbuzz]
-version = 10.4.0
+version = 11.2.1
 url = "https://github.com/harfbuzz/harfbuzz/releases/download/${version}/harfbuzz-${version}.tar.xz"
 arguments = "-Dfreetype=enabled -Dicu=disabled -Dtests=disabled -Dutilities=disabled" # TODO disable subset
 anitya_id = 1299
 
 [pixman]
-version = 0.44.2
+version = 0.46.0
 url = "https://cairographics.org/releases/pixman-${version}.tar.gz"
 arguments = "-Dtests=disabled -Ddemos=disabled -Dlibpng=disabled"
 anitya_id = 3648
 
 [expat]
 version_major = 2
 version_minor = 7
-version_patch = 0
+version_patch = 1
 version = ${version_major}.${version_minor}.${version_patch}
 version_url = ${version_major}_${version_minor}_${version_patch}
 url = "https://github.com/libexpat/libexpat/releases/download/R_${version_url}/expat-${version}.tar.bz2"
@@ -71,7 +71,7 @@ arguments = "--disable-alsa --disable-sqlite --disable-full-suite --disable-exte
 anitya_id = 13277
 
 [libxmp-lite]
-version = 4.6.2
+version = 4.6.3
 url = "https://github.com/libxmp/libxmp/releases/download/libxmp-${version}/libxmp-lite-${version}.tar.gz"
 arguments = "-DBUILD_STATIC=ON -DBUILD_SHARED=OFF"
 anitya_id = 1784
@@ -107,7 +107,7 @@ arguments = "--disable-http --disable-examples"
 anitya_id = 10353
 
 [fluidsynth]
-version = 2.4.3
+version = 2.4.6
 url = "https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v${version}.tar.gz"
 arguments = "-DLIB_SUFFIX=''"
 anitya_id = 10437
@@ -118,20 +118,20 @@ url = "https://github.com/divideconcept/FluidLite/archive/${version}.zip"
 arguments = "-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF"
 
 [nlohmannjson]
-version = 3.11.3
+version = 3.12.0
 url = "https://github.com/nlohmann/json/archive/v${version}.tar.gz"
 directory = "json-${version}"
 arguments = "-DJSON_BuildTests=OFF"
 anitya_id = 11152
 
 [fmt]
-version = 11.1.4
+version = 11.2.0
 url = "https://github.com/fmtlib/fmt/releases/download/${version}/fmt-${version}.zip"
 arguments = "-DFMT_DOC=OFF -DFMT_TEST=OFF"
 anitya_id = 11526
 
 [inih]
-version = 58
+version = 60
 url = "https://github.com/benhoyt/inih/archive/refs/tags/r${version}.tar.gz"
 directory = "inih-r${version}"
 anitya_id = 11600
@@ -142,7 +142,7 @@ url = "https://github.com/fragglet/lhasa/releases/download/v${version}/lhasa-${v
 anitya_id = 14822
 
 [ICU]
-version_major = 76
+version_major = 77
 version_minor = 1
 version = ${version_major}-${version_minor}
 version_src = ${version_major}_${version_minor}
@@ -155,17 +155,17 @@ arguments = "--enable-strict=no --disable-tests --disable-samples
 anitya_id = 16134
 
 [icudata]
-version_major = 76
+version_major = 77
 version_minor = 1
 version = ${version_major}-${version_minor}
 _ini_comment = empty on purpose, otherwise polluted by default section
-directory =
+directory = 
 url = https://ci.easyrpg.org/job/icudata/lastSuccessfulBuild/artifact/icudata${version_major}_all.tar.gz
 files = "icudt*.dat"
 anitya_id = 16134
 
 [SDL2]
-version = 2.32.2
+version = 2.32.6
 url = "https://libsdl.org/release/SDL2-${version}.tar.gz"
 anitya_id = 4779