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/libsndfile | |
| 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/libsndfile')
| -rw-r--r-- | ports/libsndfile/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libsndfile/portfile.cmake | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ports/libsndfile/CONTROL b/ports/libsndfile/CONTROL index ed59ac139..913af809d 100644 --- a/ports/libsndfile/CONTROL +++ b/ports/libsndfile/CONTROL @@ -1,5 +1,6 @@ Source: libsndfile -Version: 1.0.29-9 +Version: 1.0.29 +Port-Version: 10 Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo Homepage: https://github.com/erikd/libsndfile Default-Features: external-libs diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index ce8f9427b..1e86fbffb 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -19,9 +19,6 @@ option(BUILD_EXECUTABLES "Build sndfile tools and install to folder tools" OFF) if("external-libs" IN_LIST FEATURES) set(SNDFILE_WITHOUT_EXTERNAL_LIBS OFF) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(FLAC_EXPORT_DEFINITION "-DFLAC__NO_DLL") - endif() else() set(SNDFILE_WITHOUT_EXTERNAL_LIBS ON) endif() @@ -37,7 +34,6 @@ vcpkg_configure_cmake( -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS} - -DCMAKE_C_FLAGS=${FLAC_EXPORT_DEFINITION} OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES} OPTIONS_DEBUG |