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/libflac | |
| 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/libflac')
| -rw-r--r-- | ports/libflac/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libflac/portfile.cmake | 29 |
2 files changed, 30 insertions, 2 deletions
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL index 745494c77..4c57d1f68 100644 --- a/ports/libflac/CONTROL +++ b/ports/libflac/CONTROL @@ -1,5 +1,6 @@ Source: libflac -Version: 1.3.3-1 +Version: 1.3.3 +Port-Version: 2 Homepage: https://xiph.org/flac/ Description: Library for manipulating FLAC files Build-Depends: libogg diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index 72309d9bb..ab126edd9 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -9,6 +9,12 @@ vcpkg_from_github( "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile2.patch" ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_SHARED_LIBS ON) +else() + set(BUILD_SHARED_LIBS OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -16,7 +22,8 @@ vcpkg_configure_cmake( -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF - -DBUILD_TESTING=OFF) + -DBUILD_TESTING=OFF + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}) vcpkg_install_cmake() vcpkg_fixup_cmake_targets( @@ -28,6 +35,26 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/FLAC/export.h + "#if defined(FLAC__NO_DLL)" + "#if 0" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/FLAC++/export.h + "#if defined(FLAC__NO_DLL)" + "#if 0" + ) +else() + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/FLAC/export.h + "#if defined(FLAC__NO_DLL)" + "#if 1" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/FLAC++/export.h + "#if defined(FLAC__NO_DLL)" + "#if 1" + ) +endif() + # This license (BSD) is relevant only for library - if someone would want to install # FLAC cmd line tools as well additional license (GPL) should be included file(COPY ${SOURCE_PATH}/COPYING.Xiph DESTINATION ${CURRENT_PACKAGES_DIR}/share/libflac) |