deps: update fluidsynth to 2.3.6

ZDoom · Aug 4, 2024 · 30148ac · 30148ac
1 parent fcdfe72
commit 30148ac
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/deps/fluidsynth/include/fluidsynth/settings.h b/deps/fluidsynth/include/fluidsynth/settings.h
@@ -48,6 +48,9 @@ extern "C" {
  *       // ...
  *     }
  * @endcode
+ * All string settings are encoded in UTF-8. This includes the names
+ * of the audio and MIDI devices, exposed as setting options.
+ * 
  * @sa @ref CreatingSettings
  *
  * @{

diff --git a/deps/fluidsynth/include/fluidsynth/version.h b/deps/fluidsynth/include/fluidsynth/version.h
@@ -31,10 +31,10 @@ extern "C" {
  *
  * @{
  */
-#define FLUIDSYNTH_VERSION       "2.3.5"           /**< String constant of libfluidsynth version. */
+#define FLUIDSYNTH_VERSION       "2.3.6"           /**< String constant of libfluidsynth version. */
 #define FLUIDSYNTH_VERSION_MAJOR 2     /**< libfluidsynth major version integer constant. */
 #define FLUIDSYNTH_VERSION_MINOR 3     /**< libfluidsynth minor version integer constant. */
-#define FLUIDSYNTH_VERSION_MICRO 5     /**< libfluidsynth micro version integer constant. */
+#define FLUIDSYNTH_VERSION_MICRO 6     /**< libfluidsynth micro version integer constant. */
 
 FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);
 FLUIDSYNTH_API char* fluid_version_str(void);

diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FindGLib2.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FindGLib2.cmake
@@ -35,7 +35,7 @@ find_package(PkgConfig QUIET)
 pkg_check_modules(PC_GLIB2 QUIET glib-2.0)
 pkg_check_modules(PC_GTHREAD2 QUIET gthread-2.0)
 pkg_check_modules(PC_GMODULE2 QUIET gmodule-2.0)
-pkg_check_modules(PC_GMODULE2 QUIET gobject-2.0)
+pkg_check_modules(PC_GOBJECT2 QUIET gobject-2.0)
 
 # Find the headers and libraries
 find_path(
@@ -209,7 +209,7 @@ if(GLib2_gobject-2_LIBRARY AND NOT TARGET GLib2::gobject-2)
   # Handle transitive dependencies
   if(PC_GOBJECT2_FOUND)
     get_target_properties_from_pkg_config("${GLib2_gobject-2_LIBRARY}"
-                                          "PC_OBJECT2" "_gobject2")
+                                          "PC_GOBJECT2" "_gobject2")
   else()
     find_package(libffi QUIET)
     set(_gobject2_link_libraries "libffi" "GLib2::glib-2")

diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake
@@ -10,13 +10,13 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "2.3.5")
+set(PACKAGE_VERSION "2.3.6")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("2.3.5" MATCHES "^([0-9]+)\\.([0-9]+)")
+  if("2.3.6" MATCHES "^([0-9]+)\\.([0-9]+)")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
 
@@ -27,7 +27,7 @@ else()
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "2.3.5")
+    set(CVF_VERSION_MAJOR "2.3.6")
     set(CVF_VERSION_MINOR "")
   endif()
 

diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/PkgConfigHelpers.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/PkgConfigHelpers.cmake
@@ -76,7 +76,8 @@ macro ( unset_pkg_config _prefix )
 endmacro ( unset_pkg_config )
 
 function ( get_target_properties_from_pkg_config _library _prefix _out_prefix )
-  if ( "${_library}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$" )
+  if ( NOT "${_library}" MATCHES "${CMAKE_IMPORT_LIBRARY_SUFFIX}$"
+       AND "${_library}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$" )
     set ( _cflags ${_prefix}_STATIC_CFLAGS_OTHER )
     set ( _link_libraries ${_prefix}_STATIC_LIBRARIES )
     set ( _library_dirs ${_prefix}_STATIC_LIBRARY_DIRS )

diff --git a/deps/fluidsynth/lib/libfluidsynth.a b/deps/fluidsynth/lib/libfluidsynth.a
diff --git a/deps/fluidsynth/lib/pkgconfig/fluidsynth.pc b/deps/fluidsynth/lib/pkgconfig/fluidsynth.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: FluidSynth
 Description: Software SoundFont synth
-Version: 2.3.5
+Version: 2.3.6
 Requires.private: glib-2.0 gthread-2.0 sndfile libinstpatch-1.0
 Libs: -L${libdir} -lfluidsynth
 Libs.private: -lm -Wl,-framework,CoreAudio,-framework,AudioUnit -Wl,-framework,CoreMIDI,-framework,CoreServices