diff options
| author | Kevin Lu <6320810+kevinlul@users.noreply.github.com> | 2020-07-31 14:23:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 11:23:27 -0700 |
| commit | 62d4320409b23b2278f20c3eaa4b174c4e3f0431 (patch) | |
| tree | 14f9a22ce993f2584be77c5b8fc271af78b8a4ae /ports/sdl2-mixer | |
| parent | 4b0f9cbaeca120c32365fe095530a5f518a64376 (diff) | |
| download | vcpkg-62d4320409b23b2278f20c3eaa4b174c4e3f0431.tar.gz vcpkg-62d4320409b23b2278f20c3eaa4b174c4e3f0431.zip | |
[sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature (#12374)
* [sdl2-mixer] Fix FLAC symbol export when static linking
Fix regression introduced by #11152
* [sdl2-mixer] Add nativemidi default feature
Closes #10318
* [libsndfile] Revert to port version 8 as version 10
* [libflac] Use BUILD_SHARED_LIBS to properly export FLAC__NO_DLL via CMake
* [libflac] Force FLAC__NO_DLL in installed headers in static triplets
* [libflac] Modify headers on installation
Diffstat (limited to 'ports/sdl2-mixer')
| -rw-r--r-- | ports/sdl2-mixer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/sdl2-mixer/CONTROL | 7 | ||||
| -rw-r--r-- | ports/sdl2-mixer/portfile.cmake | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index b5b5eac61..cc9816d0b 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -91,7 +91,7 @@ add_library(SDL2_mixer music_wav.c version.rc) -if(WIN32 OR APPLE) +if((WIN32 OR APPLE) AND SDL_MIXER_ENABLE_NATIVEMIDI) list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c) target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES}) diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index 4ea51192e..ef18e139d 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,12 +1,17 @@ Source: sdl2-mixer -Version: 2.0.4-9 +Version: 2.0.4 +Port-Version: 10 Homepage: https://www.libsdl.org/projects/SDL_mixer Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2 +Default-Features: nativemidi Feature: dynamic-load Description: Load plugins with dynamic call +Feature: nativemidi +Description: Support for MIDI audio format on Windows and macOS. + Feature: libflac Description: Support for FLAC audio format. Build-Depends: libflac diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 74037d2f6..16e45c5d8 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libmodplug SDL_MIXER_ENABLE_MOD libvorbis SDL_MIXER_ENABLE_OGGVORBIS opusfile SDL_MIXER_ENABLE_OPUS + nativemidi SDL_MIXER_ENABLE_NATIVEMIDI ) vcpkg_configure_cmake( |