mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-21 11:31:07 +00:00
deps: update fluidsynth to 2.4.0
This commit is contained in:
alexey.lysiuk
parent
b35fa67dc8
commit
36cdb36fc1
7 changed files with 20 additions and 97 deletions
11
deps/fluidsynth/include/fluidsynth/mod.h
vendored
11
deps/fluidsynth/include/fluidsynth/mod.h
vendored
|
|
@ -57,6 +57,15 @@ enum fluid_mod_flags
|
|||
FLUID_MOD_SIN = 0x80, /**< Custom non-standard sinus mapping function */
|
||||
};
|
||||
|
||||
/**
|
||||
* Transform types for the SoundFont2 modulators as defined by SoundFont 2.04 section 8.3.
|
||||
*/
|
||||
enum fluid_mod_transforms
|
||||
{
|
||||
FLUID_MOD_TRANSFORM_LINEAR = 0, /**< Linear: directly add the computed value to summing node */
|
||||
FLUID_MOD_TRANSFORM_ABS = 2 /**< Abs: add the absolute value of the computed to summing node */
|
||||
};
|
||||
|
||||
/**
|
||||
* General controller (if #FLUID_MOD_GC in flags). This
|
||||
* corresponds to SoundFont 2.04 PDF section 8.2.1
|
||||
|
|
@ -83,6 +92,7 @@ FLUIDSYNTH_API void fluid_mod_set_source1(fluid_mod_t *mod, int src, int flags);
|
|||
FLUIDSYNTH_API void fluid_mod_set_source2(fluid_mod_t *mod, int src, int flags);
|
||||
FLUIDSYNTH_API void fluid_mod_set_dest(fluid_mod_t *mod, int dst);
|
||||
FLUIDSYNTH_API void fluid_mod_set_amount(fluid_mod_t *mod, double amount);
|
||||
FLUIDSYNTH_API void fluid_mod_set_transform(fluid_mod_t *mod, int type);
|
||||
|
||||
FLUIDSYNTH_API int fluid_mod_get_source1(const fluid_mod_t *mod);
|
||||
FLUIDSYNTH_API int fluid_mod_get_flags1(const fluid_mod_t *mod);
|
||||
|
|
@ -90,6 +100,7 @@ FLUIDSYNTH_API int fluid_mod_get_source2(const fluid_mod_t *mod);
|
|||
FLUIDSYNTH_API int fluid_mod_get_flags2(const fluid_mod_t *mod);
|
||||
FLUIDSYNTH_API int fluid_mod_get_dest(const fluid_mod_t *mod);
|
||||
FLUIDSYNTH_API double fluid_mod_get_amount(const fluid_mod_t *mod);
|
||||
FLUIDSYNTH_API int fluid_mod_get_transform(fluid_mod_t *mod);
|
||||
|
||||
FLUIDSYNTH_API int fluid_mod_test_identity(const fluid_mod_t *mod1, const fluid_mod_t *mod2);
|
||||
FLUIDSYNTH_API int fluid_mod_has_source(const fluid_mod_t *mod, int cc, int ctrl);
|
||||
|
|
|
|||
6
deps/fluidsynth/include/fluidsynth/version.h
vendored
6
deps/fluidsynth/include/fluidsynth/version.h
vendored
|
|
@ -31,10 +31,10 @@ extern "C" {
|
|||
*
|
||||
* @{
|
||||
*/
|
||||
#define FLUIDSYNTH_VERSION "2.3.7" /**< String constant of libfluidsynth version. */
|
||||
#define FLUIDSYNTH_VERSION "2.4.0" /**< 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 7 /**< libfluidsynth micro version integer constant. */
|
||||
#define FLUIDSYNTH_VERSION_MINOR 4 /**< libfluidsynth minor version integer constant. */
|
||||
#define FLUIDSYNTH_VERSION_MICRO 0 /**< libfluidsynth micro version integer constant. */
|
||||
|
||||
FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);
|
||||
FLUIDSYNTH_API char* fluid_version_str(void);
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
#[=======================================================================[.rst:
|
||||
FindLASH
|
||||
-------
|
||||
|
||||
Finds the LASH library.
|
||||
|
||||
Imported Targets
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This module provides the following imported targets, if found:
|
||||
|
||||
``LASH::LASH``
|
||||
The LASH library
|
||||
|
||||
Result Variables
|
||||
^^^^^^^^^^^^^^^^
|
||||
|
||||
This will define the following variables:
|
||||
|
||||
``LASH_FOUND``
|
||||
True if the system has the LASH library.
|
||||
``LASH_VERSION``
|
||||
The version of the LASH library which was found.
|
||||
|
||||
#]=======================================================================]
|
||||
|
||||
# Use pkg-config if available
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules(PC_LASH QUIET lash-1.0)
|
||||
|
||||
# Find the headers and library
|
||||
find_path(
|
||||
LASH_INCLUDE_DIR
|
||||
NAMES "lash/lash.h"
|
||||
HINTS "${PC_LASH_INCLUDEDIR}"
|
||||
PATH_SUFFIXES "lash-1.0")
|
||||
|
||||
find_library(
|
||||
LASH_LIBRARY
|
||||
NAMES "lash"
|
||||
HINTS "${PC_LASH_LIBDIR}")
|
||||
|
||||
# Get version from pkg-config or read the config header
|
||||
if(PC_LASH_VERSION)
|
||||
set(LASH_VERSION "${PC_LASH_VERSION}")
|
||||
else()
|
||||
if(NOT LASH_FIND_VERSION)
|
||||
set(_assumed_version "0.5.0")
|
||||
else()
|
||||
set(_assumed_version "${LASH_FIND_VERSION}")
|
||||
endif()
|
||||
message(
|
||||
NOTICE
|
||||
"LASH does not expose its version outside of pkg-config. Assuming version ${_assumed_version}, expect failure if your version is lower."
|
||||
)
|
||||
set(LASH_VERSION ${_assumed_version})
|
||||
endif()
|
||||
|
||||
# Handle transitive dependencies
|
||||
if(PC_LASH_FOUND)
|
||||
get_target_properties_from_pkg_config("${LASH_LIBRARY}" "PC_LASH" "_lash")
|
||||
else()
|
||||
set(_lash_link_libraries "Jack::Jack" "Threads::Threads" "ALSA::ALSA" "uuid")
|
||||
endif()
|
||||
|
||||
# Forward the result to CMake
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(
|
||||
LASH
|
||||
REQUIRED_VARS "LASH_LIBRARY" "LASH_INCLUDE_DIR"
|
||||
VERSION_VAR "LASH_VERSION")
|
||||
|
||||
if(LASH_FOUND AND NOT TARGET LASH::LASH)
|
||||
add_library(LASH::LASH UNKNOWN IMPORTED)
|
||||
set_target_properties(
|
||||
LASH::LASH
|
||||
PROPERTIES IMPORTED_LOCATION "${LASH_LIBRARY}"
|
||||
INTERFACE_COMPILE_OPTIONS "${_lash_compile_options}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${LASH_INCLUDE_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "${_lash_link_libraries}"
|
||||
INTERFACE_LINK_DIRECTORIES "${_lash_link_directories}")
|
||||
endif()
|
||||
|
||||
mark_as_advanced(LASH_INCLUDE_DIR LASH_LIBRARY)
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
# Audio / MIDI driver support
|
||||
set(FLUIDSYNTH_SUPPORT_ALSA )
|
||||
set(FLUIDSYNTH_SUPPORT_ALSA FALSE)
|
||||
set(FLUIDSYNTH_SUPPORT_COREAUDIO 1)
|
||||
set(FLUIDSYNTH_SUPPORT_COREMIDI 1)
|
||||
set(FLUIDSYNTH_SUPPORT_DART )
|
||||
set(FLUIDSYNTH_SUPPORT_DSOUND )
|
||||
set(FLUIDSYNTH_SUPPORT_JACK FALSE)
|
||||
set(FLUIDSYNTH_SUPPORT_KAI )
|
||||
set(FLUIDSYNTH_SUPPORT_MIDISHARE FALSE)
|
||||
set(FLUIDSYNTH_SUPPORT_OBOE )
|
||||
set(FLUIDSYNTH_SUPPORT_OPENSLES )
|
||||
|
|
@ -28,7 +29,6 @@ set(FLUIDSYNTH_SUPPORT_DBUS 0)
|
|||
set(FLUIDSYNTH_SUPPORT_GETOPT 1)
|
||||
set(FLUIDSYNTH_SUPPORT_IPV6 1)
|
||||
set(FLUIDSYNTH_SUPPORT_LADSPA )
|
||||
set(FLUIDSYNTH_SUPPORT_LASH )
|
||||
set(FLUIDSYNTH_SUPPORT_NETWORK 1)
|
||||
set(FLUIDSYNTH_SUPPORT_READLINE )
|
||||
set(FLUIDSYNTH_SUPPORT_SYSTEMD )
|
||||
|
|
@ -92,10 +92,6 @@ if(NOT FLUIDSYNTH_IS_SHARED)
|
|||
message(WARN "LADSPA support was built in but gmodule could not be found.")
|
||||
endif()
|
||||
|
||||
if(FLUIDSYNTH_SUPPORT_LASH AND NOT TARGET LASH::LASH)
|
||||
find_dependency(LASH 0.3)
|
||||
endif()
|
||||
|
||||
if(FLUIDSYNTH_SUPPORT_LIBINSTPATCH AND NOT TARGET InstPatch::libinstpatch)
|
||||
find_dependency(InstPatch 1.1.0)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
# The variable CVF_VERSION must be set before calling configure_file().
|
||||
|
||||
|
||||
set(PACKAGE_VERSION "2.3.7")
|
||||
set(PACKAGE_VERSION "2.4.0")
|
||||
|
||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||
else()
|
||||
|
||||
if("2.3.7" MATCHES "^([0-9]+)\\.([0-9]+)")
|
||||
if("2.4.0" 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.7")
|
||||
set(CVF_VERSION_MAJOR "2.4.0")
|
||||
set(CVF_VERSION_MINOR "")
|
||||
endif()
|
||||
|
||||
|
|
|
|||
BIN
deps/fluidsynth/lib/libfluidsynth.a
vendored
BIN
deps/fluidsynth/lib/libfluidsynth.a
vendored
Binary file not shown.
2
deps/fluidsynth/lib/pkgconfig/fluidsynth.pc
vendored
2
deps/fluidsynth/lib/pkgconfig/fluidsynth.pc
vendored
|
|
@ -5,7 +5,7 @@ includedir=${prefix}/include
|
|||
|
||||
Name: FluidSynth
|
||||
Description: Software SoundFont synth
|
||||
Version: 2.3.7
|
||||
Version: 2.4.0
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue