Skip to content

Commit

Permalink
deps: update fluidsynth to 2.3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
alexey-lysiuk committed Oct 20, 2024
1 parent 4d94107 commit 1f0149b
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 6 deletions.
4 changes: 2 additions & 2 deletions deps/fluidsynth/include/fluidsynth/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ extern "C" {
*
* @{
*/
#define FLUIDSYNTH_VERSION "2.3.6" /**< String constant of libfluidsynth version. */
#define FLUIDSYNTH_VERSION "2.3.7" /**< 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 6 /**< libfluidsynth micro version integer constant. */
#define FLUIDSYNTH_VERSION_MICRO 7 /**< libfluidsynth micro version integer constant. */

FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);
FLUIDSYNTH_API char* fluid_version_str(void);
Expand Down
84 changes: 84 additions & 0 deletions deps/fluidsynth/lib/cmake/fluidsynth/Findoboe.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#[=======================================================================[.rst:
Findoboe
-------
Finds the oboe library.
Imported Targets
^^^^^^^^^^^^^^^^
This module provides the following imported targets, if found:
``oboe::oboe``
The oboe library
Result Variables
^^^^^^^^^^^^^^^^
This will define the following variables:
``oboe_FOUND``
True if the system has the oboe library.
For compatibility with upstream, the following variables are also set:
``oboe_INCLUDE_DIR``
``oboe_INCLUDE_DIRS``
``oboe_LIBRARY``
``oboe_LIBRARIES``
``OBOE_INCLUDE_DIR``
``OBOE_INCLUDE_DIRS``
``OBOE_LIBRARY``
``OBOE_LIBRARIES``
``OBOE_FOUND``
#]=======================================================================]

# Use pkg-config if available
find_package(PkgConfig QUIET)
pkg_check_modules(PC_OBOE QUIET oboe-1.0)

# Find the headers and library
find_path(
oboe_INCLUDE_DIR
NAMES "oboe/Oboe.h"
HINTS "${PC_OBOE_INCLUDEDIR}")

find_library(
_oboe_library
NAMES "oboe"
HINTS "${PC_OBOE_LIBDIR}")

# Extract additional flags if pkg-config is available
if(PC_OBOE_FOUND)
get_target_properties_from_pkg_config("${_oboe_library}" "PC_OBOE" "_oboe")
endif()

# Forward the result to CMake
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(oboe REQUIRED_VARS "_oboe_library"
"oboe_INCLUDE_DIR")

# Create the target
if(oboe_FOUND AND NOT TARGET oboe::oboe)
add_library(oboe::oboe UNKNOWN IMPORTED)
set_target_properties(
oboe::oboe
PROPERTIES IMPORTED_LOCATION "${_oboe_library}"
INTERFACE_COMPILE_OPTIONS "${_oboe_compile_options}"
INTERFACE_INCLUDE_DIRECTORIES "${oboe_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${_oboe_link_libraries}"
INTERFACE_LINK_DIRECTORIES "${_oboe_link_directories}")

# Set additional variables for compatibility with upstream config
set(oboe_INCLUDE_DIRS "${oboe_INCLUDE_DIR}")
set(oboe_LIBRARY oboe::oboe)
set(oboe_LIBRARIES oboe::oboe)
set(OBOE_INCLUDE_DIR "${${oboe_INCLUDE_DIR}}")
set(OBOE_INCLUDE_DIRS "${${oboe_INCLUDE_DIR}}")
set(OBOE_LIBRARY oboe::oboe)
set(OBOE_LIBRARIES oboe::oboe)
set(OBOE_FOUND TRUE)
endif()

mark_as_advanced(_oboe_library)
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
# The variable CVF_VERSION must be set before calling configure_file().


set(PACKAGE_VERSION "2.3.6")
set(PACKAGE_VERSION "2.3.7")

if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()

if("2.3.6" MATCHES "^([0-9]+)\\.([0-9]+)")
if("2.3.7" MATCHES "^([0-9]+)\\.([0-9]+)")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")

Expand All @@ -27,7 +27,7 @@ else()
string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
endif()
else()
set(CVF_VERSION_MAJOR "2.3.6")
set(CVF_VERSION_MAJOR "2.3.7")
set(CVF_VERSION_MINOR "")
endif()

Expand Down
Binary file modified deps/fluidsynth/lib/libfluidsynth.a
Binary file not shown.
2 changes: 1 addition & 1 deletion deps/fluidsynth/lib/pkgconfig/fluidsynth.pc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ includedir=${prefix}/include

Name: FluidSynth
Description: Software SoundFont synth
Version: 2.3.6
Version: 2.3.7
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
Expand Down

0 comments on commit 1f0149b

Please sign in to comment.