diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2021-04-08 03:06:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 10:06:55 -0700 |
| commit | 85a48c1ed558210cab67a03209510c4bf6e5e285 (patch) | |
| tree | a09d9080713e8979579d35e8540eb59bbafeadb0 /ports/wavpack | |
| parent | 4278a5f9eafbdadfaa65d7aafd914964841cba42 (diff) | |
| download | vcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.tar.gz vcpkg-85a48c1ed558210cab67a03209510c4bf6e5e285.zip | |
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
Diffstat (limited to 'ports/wavpack')
| -rw-r--r-- | ports/wavpack/CONTROL | 1 | ||||
| -rw-r--r-- | ports/wavpack/fix-symbol-exports.patch | 22 | ||||
| -rw-r--r-- | ports/wavpack/portfile.cmake | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL index f3cb5f3ac..0064da522 100644 --- a/ports/wavpack/CONTROL +++ b/ports/wavpack/CONTROL @@ -1,5 +1,6 @@ Source: wavpack
Version: 5.3.0
+Port-Version: 1
Homepage: https://github.com/dbry/WavPack
Description: WavPack encode/decode library, command-line programs, and several plugins
Supports: !(arm|arm64)
\ No newline at end of file diff --git a/ports/wavpack/fix-symbol-exports.patch b/ports/wavpack/fix-symbol-exports.patch new file mode 100644 index 000000000..999a05417 --- /dev/null +++ b/ports/wavpack/fix-symbol-exports.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70e1043f..d8cb8b10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -328,7 +328,7 @@ foreach(EXPORT_SYMBOL ${WAVPACK_EXPORT_SYMBOLS}) + list(APPEND FILE_CONTENTS "_${EXPORT_SYMBOL}\n") + endforeach() + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym ${FILE_CONTENTS}) +- target_link_libraries(wavpack PRIVATE "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") ++ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") + else() + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym\;\n\n};\n\nVERS_2 {\n global: sym;\n} VERS_1\;") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") +@@ -340,7 +340,7 @@ list(APPEND FILE_CONTENTS "${EXPORT_SYMBOL}\;\n") + endforeach() + list(APPEND FILE_CONTENTS "local: *\; }\;") + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map ${FILE_CONTENTS}) +- target_link_libraries(wavpack PRIVATE "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") ++ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") + endif() + endif() + diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index a030e1ec5..13d35a8f2 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master
PATCHES
OpenSSL.patch
+ fix-symbol-exports.patch
)
vcpkg_configure_cmake(
|
