diff --git a/deps/fluidsynth/include/fluidsynth/version.h b/deps/fluidsynth/include/fluidsynth/version.h index d440352f..0ce76dc1 100644 --- 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.4" /**< String constant of libfluidsynth version. */ +#define FLUIDSYNTH_VERSION "2.3.5" /**< 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 4 /**< libfluidsynth micro version integer constant. */ +#define FLUIDSYNTH_VERSION_MICRO 5 /**< 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/FindInstPatch.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FindInstPatch.cmake index e7750459..11289265 100644 --- a/deps/fluidsynth/lib/cmake/fluidsynth/FindInstPatch.cmake +++ b/deps/fluidsynth/lib/cmake/fluidsynth/FindInstPatch.cmake @@ -37,7 +37,7 @@ find_path( find_library( InstPatch_LIBRARY - NAMES "instpatch-1.0" + NAMES "instpatch-1.0" "instpatch-2" HINTS "${PC_INSTPATCH_LIBDIR}") # Get version from pkg-config or read the config header diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FindOpus.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FindOpus.cmake index 0258d456..bf77e293 100644 --- a/deps/fluidsynth/lib/cmake/fluidsynth/FindOpus.cmake +++ b/deps/fluidsynth/lib/cmake/fluidsynth/FindOpus.cmake @@ -53,13 +53,13 @@ find_library( # Get the version from pkg-config if(PC_OPUS_VERSION) - set(Opus_VERSION "${PC_OPUS_VERSION}") + set(Opus_VERSION "${PC_OPUS_VERSION}.0") set(OPUS_VERSION "${Opus_VERSION}") set(OPUS_VERSION_STRING "${Opus_VERSION}") string(REPLACE "." ";" _opus_version_list "${Opus_VERSION}") list(GET _opus_version_list 0 OPUS_VERSION_MAJOR) list(GET _opus_version_list 1 OPUS_VERSION_MINOR) - list(GET _opus_version_list 2 OPUS_VERSION_PATCH) + list(GET _opus_version_list 2 OPUS_VERSION_PATCH) # might be missing if zero, hence adding the .0 above else() message(STATUS "Unable to get Opus version without pkg-config.") set(Opus_VERSION) diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FindSndFile.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FindSndFile.cmake index d77333ba..7eff1062 100644 --- a/deps/fluidsynth/lib/cmake/fluidsynth/FindSndFile.cmake +++ b/deps/fluidsynth/lib/cmake/fluidsynth/FindSndFile.cmake @@ -50,7 +50,7 @@ find_path( find_library( _sndfile_library - NAMES "sndfile" + NAMES "sndfile" "sndfile-1" HINTS "${PC_SNDFILE_LIBDIR}") # Get version from pkg-config or read the config header @@ -69,7 +69,8 @@ elseif(SndFile_INCLUDE_DIR) endif() # Check the features SndFile was built with -if(PC_SNDFILE_FOUND) +# 2024-01-02: Recent versions of libsndfile don't seem to provide a pkgconfig file and older version who did are lacking private libraries like OGG. +if(TRUE) #PC_SNDFILE_FOUND if("vorbis" IN_LIST PC_SNDFILE_STATIC_LIBRARIES) set(SndFile_WITH_EXTERNAL_LIBS TRUE) endif() diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/Findmpg123.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/Findmpg123.cmake index 76e04127..3cb35167 100644 --- a/deps/fluidsynth/lib/cmake/fluidsynth/Findmpg123.cmake +++ b/deps/fluidsynth/lib/cmake/fluidsynth/Findmpg123.cmake @@ -92,7 +92,7 @@ find_package_handle_standard_args( # Create the targets foreach(_component libmpg123 libout123 libsyn123) if(mpg123_${_component}_FOUND AND NOT TARGET MPG123::${_component}) - add_library(MPG123::${_component}) + add_library(MPG123::${_component} UNKNOWN IMPORTED) set_target_properties( MPG123::${_component} PROPERTIES IMPORTED_LOCATION "${mpg123_${_component}_LIBRARY}" diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthConfigVersion.cmake index 2dd5c023..17060a1a 100644 --- 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.4") +set(PACKAGE_VERSION "2.3.5") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.3.4" MATCHES "^([0-9]+)\\.([0-9]+)") + if("2.3.5" 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.4") + set(CVF_VERSION_MAJOR "2.3.5") set(CVF_VERSION_MINOR "") endif() diff --git a/deps/fluidsynth/lib/libfluidsynth.a b/deps/fluidsynth/lib/libfluidsynth.a index cd974d15..889326b1 100644 Binary files a/deps/fluidsynth/lib/libfluidsynth.a and b/deps/fluidsynth/lib/libfluidsynth.a differ diff --git a/deps/fluidsynth/lib/pkgconfig/fluidsynth.pc b/deps/fluidsynth/lib/pkgconfig/fluidsynth.pc index a4ecd1cd..e5e4432e 100644 --- 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.4 +Version: 2.3.5 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