diff options
| author | JackMacWindows <jackmacwindowslinux@gmail.com> | 2021-07-06 16:38:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-06 13:38:46 -0700 |
| commit | 92340aa815c688bced2598b52f6b0a4a73a5d127 (patch) | |
| tree | fa7dd88b3fe8f8d5c08dafef0689de160b6c9f57 | |
| parent | ae5b1cf41bfa74b88be6438076afe2fdc10608cb (diff) | |
| download | vcpkg-92340aa815c688bced2598b52f6b0a4a73a5d127.tar.gz vcpkg-92340aa815c688bced2598b52f6b0a4a73a5d127.zip | |
[sdl2-mixer] Add fluidsynth feature (#18826)
* [sdl2-mixer] Add fluidsynth feature
* [sdl2-mixer] Add fluidsynth feature
* [sdl2-mixer] Add fluidsynth feature
* Updated versions & fixed style
* Fixed version hash
| -rw-r--r-- | ports/sdl2-mixer/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | ports/sdl2-mixer/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/sdl2-mixer/vcpkg.json | 8 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/sdl2-mixer.json | 5 |
5 files changed, 27 insertions, 3 deletions
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 6b422142c..b350d5bc3 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -74,6 +74,18 @@ if(SDL_MIXER_ENABLE_OPUS) endif() endif() +# Fluidsynth support +if(SDL_MIXER_ENABLE_FLUIDSYNTH) + find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) + find_library(FLUIDSYNTH_LIBRARY fluidsynth) + list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) + if (SDL_DYNAMIC_LOAD) + get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + add_library(SDL2_mixer effect_position.c effect_stereoreverse.c diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 16e45c5d8..122df61e1 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libvorbis SDL_MIXER_ENABLE_OGGVORBIS opusfile SDL_MIXER_ENABLE_OPUS nativemidi SDL_MIXER_ENABLE_NATIVEMIDI + fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH ) vcpkg_configure_cmake( @@ -53,4 +54,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index acd9b060e..4ea851c9e 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.0.4", - "port-version": 11, + "port-version": 12, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://www.libsdl.org/projects/SDL_mixer", "dependencies": [ @@ -14,6 +14,12 @@ "dynamic-load": { "description": "Load plugins with dynamic call." }, + "fluidsynth": { + "description": "Support for FluidSynth MIDI/SF2 audio format.", + "dependencies": [ + "fluidsynth" + ] + }, "libflac": { "description": "Support for FLAC audio format.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ef3eaaabc..248f8756f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5682,7 +5682,7 @@ }, "sdl2-mixer": { "baseline": "2.0.4", - "port-version": 11 + "port-version": 12 }, "sdl2-net": { "baseline": "2.0.1-8", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index b563ccff5..2828ed5b1 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd", + "version": "2.0.4", + "port-version": 12 + }, + { "git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16", "version": "2.0.4", "port-version": 11 |