Skip to content

[sdl2-mixer] Add fluidsynth feature #18826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 5 commits into from
Jul 6, 2021
Merged

[sdl2-mixer] Add fluidsynth feature #18826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39a65ce
[sdl2-mixer] Add fluidsynth feature
MCJack123 Jul 6, 2021
4f0809f
[sdl2-mixer] Add fluidsynth feature
MCJack123 Jul 6, 2021
18fe39a
[sdl2-mixer] Add fluidsynth feature
MCJack123 Jul 6, 2021
777fbec
Updated versions & fixed style
MCJack123 Jul 6, 2021
d0ef574
Fixed version hash
MCJack123 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/sdl2-mixer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ports/sdl2-mixer/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
8 changes: 7 additions & 1 deletion ports/sdl2-mixer/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5678,7 +5678,7 @@
},
"sdl2-mixer": {
"baseline": "2.0.4",
"port-version": 11
"port-version": 12
},
"sdl2-net": {
"baseline": "2.0.1-8",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2-mixer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd",
"version": "2.0.4",
"port-version": 12
},
{
"git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16",
"version": "2.0.4",
Expand Down