diff --git a/.gitattributes b/.gitattributes
index fa1385d99a319b..d0c3b3e9ccf66d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,5 @@
* -text
+ports/** -linguist-detectable
+
+# Declare files that will always have LF line endings on checkout.
+scripts/ci.baseline.txt text eol=lf
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d3be89f6075413..b971df79de29c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,47 +289,25 @@ __pycache__/
/packages/
/scripts/buildsystems/tmp/
/toolsrc/build.rel/
-/toolsrc/msbuild.x86.debug/
-/toolsrc/msbuild.x86.release/
-/toolsrc/msbuild.x64.debug/
-/toolsrc/msbuild.x64.release/
+/toolsrc/windows-bootstrap/msbuild.x86.debug/
+/toolsrc/windows-bootstrap/msbuild.x86.release/
+/toolsrc/windows-bootstrap/msbuild.x64.debug/
+/toolsrc/windows-bootstrap/msbuild.x64.release/
+#ignore custom triplets
/triplets/*
#add vcpkg-designed triplets back in
-!triplets/community/arm64-mingw-dynamic.cmake
-!triplets/community/arm64-mingw-static.cmake
-!triplets/community/arm64-uwp.cmake
-!triplets/community/arm64-windows-static.cmake
-!triplets/community/arm-mingw-dynamic.cmake
-!triplets/community/arm-mingw-static.cmake
-!triplets/community/arm-windows.cmake
-!triplets/community/x64-mingw-dynamic.cmake
-!triplets/community/x64-mingw-static.cmake
-!triplets/community/x64-windows-static-md.cmake
-!triplets/community/x86-mingw-dynamic.cmake
-!triplets/community/x86-mingw-static.cmake
-!triplets/community/x86-uwp.cmake
-!triplets/community/x86-windows-static.cmake
-!triplets/community/x86-windows-static-md.cmake
-!triplets/community/x64-osx-dynamic.cmake
-!triplets/community/x64-android.cmake
-!triplets/community/x86-android.cmake
-!triplets/community/arm-android.cmake
-!triplets/community/arm64-android.cmake
-!triplets/community/arm64-ios.cmake
-!triplets/community/arm-ios.cmake
-!triplets/community/x64-ios.cmake
-!triplets/community/x86-ios.cmake
-!triplets/community/wasm32-emscripten.cmake
-!triplets/community/arm64-osx.cmake
-!triplets/arm-uwp.cmake
-!triplets/x64-uwp.cmake
-!triplets/x64-windows.cmake
-!triplets/x64-windows-static.cmake
-!triplets/x86-windows.cmake
-!triplets/arm64-windows.cmake
-!triplets/x64-linux.cmake
-!triplets/x64-osx.cmake
-#ignore custom triplets
+!/triplets/arm-uwp.cmake
+!/triplets/arm64-windows.cmake
+!/triplets/x64-linux.cmake
+!/triplets/x64-osx.cmake
+!/triplets/x64-uwp.cmake
+!/triplets/x64-windows-static.cmake
+!/triplets/x64-windows.cmake
+!/triplets/x86-windows.cmake
+
+!/triplets/community
+!/triplets/community/**
+
*.exe
*.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0d1b29f9969ef..dea1e5a4ab93c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,1625 @@
+vcpkg (2020.06.16 - 2020.7.31)
+---
+#### Total port count: 1429
+#### Total port count per triplet (tested):
+|triplet|ports available|
+|---|---|
+|**x64-windows**|1304|
+|x86-windows|1284|
+|x64-windows-static|1213|
+|**x64-osx**|1139|
+|**x64-linux**|1210|
+|arm64-windows|928|
+|x64-uwp|700|
+|arm-uwp|669|
+
+#### The following commands and options have been updated:
+- `x-package-info` ***[NEW COMMAND]***: Allows viewing of port information in a requested format (currently json)
+ - [(#12845)](https://github.com/microsoft/vcpkg/pull/12845) [vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (by @ras0219)
+- `--editable` ***[NEW OPTION]***: Suppress binary caching and source re-extraction for packages listed on the command line
+ - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219)
+ - [(#12366)](https://github.com/microsoft/vcpkg/pull/12366) [vcpkg] Improve informational message for `--editable` while cleaning sources (by @ras0219)
+- `--x-binarysource=` ***[NEW OPTION]***: Experimental: Support NuGet servers for retrieving and uploading of binary packages during builds
+ - [(#12058)](https://github.com/microsoft/vcpkg/pull/12058) [vcpkg] Implementation of --x-binarysource=nuget (and friends) (by @ras0219)
+- `install`
+ - `--x-write-nuget-packages-config` ***[NEW OPTION]***: Experimental: Write out a NuGet packages config-formatted file for use with external binary caching
+ - [(#12138)](https://github.com/microsoft/vcpkg/pull/12138) [vcpkg] Implement --x-write-nuget-packages-config= setting for `install` and `x-set-installed` (by @ras0219)
+- `x-set-installed`
+ - `--dry-run` ***[NEW OPTION]***: Perform a dry run by not actually building or installing
+ - [(#12132)](https://github.com/microsoft/vcpkg/pull/12132) [vcpkg-x-set-installed] Implement --dry-run (by @ras0219)
+- `--x-json`: Lift this option to the global scope to request json output from compatible commands (see `x-package-info`)
+ - [(#12845)](https://github.com/microsoft/vcpkg/pull/12845) [vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (by @ras0219)
+
+#### The following documentation has been updated:
+- [vcpkg_from_sourceforge](docs/maintainers/vcpkg_from_sourceforge.md) ***[NEW]***
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) (by @JackBoosY)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [vcpkg_fixup_pkgconfig](docs/maintainers/vcpkg_fixup_pkgconfig.md) ***[NEW]***
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [Binary Caching Specification](docs/specifications/binarycaching.md) ***[NEW]***
+ - [(#11204)](https://github.com/microsoft/vcpkg/pull/11204) [vcpkg] RFC: Binarycaching (by @ras0219-msft)
+- [README](README.md)
+ - [(#12093)](https://github.com/microsoft/vcpkg/pull/12093) [vcpkg docs] new README/Quick Start guide (by @strega-nil)
+- [Patching Example](docs/examples/patching.md)
+ - [(#11952)](https://github.com/microsoft/vcpkg/pull/11952) [Document]Mention --ignore-space-at-eol in patching.md (by @Pospelove)
+ - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219)
+- [vcpkg_fixup_cmake_targets](docs/maintainers/vcpkg_fixup_cmake_targets.md)
+ - [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖 (by @traversaro)
+- [Privacy](docs/about/privacy.md)
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil)
+- [Manifests](docs/specifications/manifests.md)
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil)
+- [Environment and Configuration](docs/users/config-environment.md)
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil)
+ - [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A)
+- [Buildsystem Integration](docs/users/integration.md)
+ - [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui)
+ - [(#12873)](https://github.com/microsoft/vcpkg/pull/12873) [vcpkg] Fix bullet lists for integration.md on readthedocs.io (by @ftheile)
+- [Installing and Using Packages](docs/examples/installing-and-using-packages.md)
+ - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219)
+ - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @PhoebeHui)
+- [Packaging Zipfiles](docs/examples/packaging-zipfiles.md)
+ - [(#12200)](https://github.com/microsoft/vcpkg/pull/12200) [vcpkg] Implement --editable (by @ras0219)
+- [CONTROL Files](docs/maintainers/control-files.md)
+ - [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil)
+- [Portfile Functions](docs/maintainers/portfile-functions.md)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [vcpkg_build_make](docs/maintainers/vcpkg_build_make.md)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [vcpkg_common_definitions](docs/maintainers/vcpkg_common_definitions.md)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md)
+ - [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [Triplets](docs/users/triplets.md)
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (by @Squareys)
+- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md)
+ - [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY)
+- [vcpkg_check_linkage.md](docs/maintainers/vcpkg_check_linkage.md)
+ - [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal)
+- [Overlay Triplets Example: Dynamic Linux Library](docs/examples/overlay-triplets-linux-dynamic.md)
+ - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial:: (by @PhoebeHui)
+
+#### The following *remarkable* changes have been made to vcpkg's infrastructure:
+- Port Manifest: New feature to allow projects to state their dependencies in a declarative format
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation (by @strega-nil)
+ - [(#12227)](https://github.com/microsoft/vcpkg/pull/12227) [vcpkg manifests] fix some issues (by @strega-nil)
+ - [(#12549)](https://github.com/microsoft/vcpkg/pull/12549) [vcpkg manifest] add feature support (by @strega-nil)
+- `vcpkg_from_sourceforge`: New maintainer helper function to retrieve sources from SourceForge
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2) (by @JackBoosY)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (by @JackBoosY)
+- `VCPKG_OVERLAY_PORTS`: New environment variable to allow users to override ports with alternate versions
+ - [(#12640)](https://github.com/microsoft/vcpkg/pull/12640) [vcpkg] add environment variable VCPKG_OVERLAY_PORTS (by @Neumann-A)
+
+#### The following *additional* changes have been made to vcpkg's infrastructure:
+- [(#12174)](https://github.com/microsoft/vcpkg/pull/12174) [vcpkg] Fix `vcpkg export --nuget` regressions (by @ras0219)
+- [(#11842)](https://github.com/microsoft/vcpkg/pull/11842) [vcpkg] Extract common paths settings to make_cmake_cmd... (by @BillyONeal)
+- [(#11977)](https://github.com/microsoft/vcpkg/pull/11977) [CHANGELOG] Update to 2020.06.15 (by @vicroms)
+- [(#11978)](https://github.com/microsoft/vcpkg/pull/11978) Attempt to mitigate Windows Defender detections by making provision-image.ps1 not a powershell script (by @BillyONeal)
+- [(#11015)](https://github.com/microsoft/vcpkg/pull/11015) [vcpkg] Fix issue #9781 by exporting from the installed directory (by @ras0219)
+- [(#11984)](https://github.com/microsoft/vcpkg/pull/11984) [breakpad] Fix build failure on OSX (by @JackBoosY)
+- [(#11981)](https://github.com/microsoft/vcpkg/pull/11981) [thrift] Update to 0.13.0 and fix OSX build (by @JackBoosY)
+- [(#11963)](https://github.com/microsoft/vcpkg/pull/11963) [libvpx] Support arm64-windows (by @JackBoosY)
+- [(#12000)](https://github.com/microsoft/vcpkg/pull/12000) [vcpkg] Clean tombstones in every build except PR validations (by @BillyONeal)
+- [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline (by @PhoebeHui)
+- [(#11938)](https://github.com/microsoft/vcpkg/pull/11938) [vcpkg] Add mirror to download Strawberry Perl (by @AenBleidd)
+- [(#11931)](https://github.com/microsoft/vcpkg/pull/11931) [vcpkg] Put user-defined configuration triplets path on top of the search queue (by @AenBleidd)
+- [(#11999)](https://github.com/microsoft/vcpkg/pull/11999) [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (by @BillyONeal)
+- [(#12049)](https://github.com/microsoft/vcpkg/pull/12049) [vcpkg] Delete unused --purge-tombstones and introduce BufferedPrint class (by @BillyONeal)
+- [(#11654)](https://github.com/microsoft/vcpkg/pull/11654) [vcpkg] Track compiler information in ABI (by @ras0219)
+- [(#11983)](https://github.com/microsoft/vcpkg/pull/11983) [libmicrohttpd] Support build on UNIX and use msbuild on Windows (by @JackBoosY)
+- [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499) (by @endrift)
+- [(#12074)](https://github.com/microsoft/vcpkg/pull/12074) [vcpkg] Do not fail just because cleaning tombstones failed in CI. (by @BillyONeal)
+- [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖 (by @traversaro)
+- [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors (by @JackBoosY)
+- [(#12082)](https://github.com/microsoft/vcpkg/pull/12082) [vcpkg] Commonize pipelines build powershell and don't use binary caching in CI (rather than PR) builds (by @BillyONeal)
+- [(#12113)](https://github.com/microsoft/vcpkg/pull/12113) [vcpkg] Add disk space report to Windows PR/CI (by @BillyONeal)
+- [(#12072)](https://github.com/microsoft/vcpkg/pull/12072) [vcpkg build] fix build command (by @strega-nil)
+- [(#12120)](https://github.com/microsoft/vcpkg/pull/12120) [vcpkg] Delete unnecessary tombstone deletion step now that CI rebuilds everything (by @BillyONeal)
+- [(#12091)](https://github.com/microsoft/vcpkg/pull/12091) [vcpkg] Use XDG/LOCALAPPDATA for default binary caching path (by @ras0219)
+- [(#12128)](https://github.com/microsoft/vcpkg/pull/12128) [vcpkg] Fix "[commands-build] build smoke test" (by @ras0219)
+- [(#12130)](https://github.com/microsoft/vcpkg/pull/12130) [vcpkg] Add write-only binary caching for CI. (by @BillyONeal)
+- [(#12101)](https://github.com/microsoft/vcpkg/pull/12101) [vcpkg] Add mingw dynamic libs triplet (by @longnguyen2004)
+- [(#12069)](https://github.com/microsoft/vcpkg/pull/12069) Fix typo in comment (by @freddy77)
+- [(#12144)](https://github.com/microsoft/vcpkg/pull/12144) [vcpkg baseline][paraview] Fix linux build (by @JackBoosY)
+- [(#12172)](https://github.com/microsoft/vcpkg/pull/12172) [vcpkg ci] add macos scripts to vcpkg repo (by @strega-nil)
+- [(#12176)](https://github.com/microsoft/vcpkg/pull/12176) [vcpkg] VM Update (by @BillyONeal)
+- [(#12192)](https://github.com/microsoft/vcpkg/pull/12192) Fix sourceparagraph:BooleanField (by @strega-nil)
+- [(#12191)](https://github.com/microsoft/vcpkg/pull/12191) Don't change manifest root when manifest isn't enabled. (by @dada2048)
+- [(#12170)](https://github.com/microsoft/vcpkg/pull/12170) [vcpkg] Enable NuGet-based binary caching via mono (by @ras0219)
+- [(#12145)](https://github.com/microsoft/vcpkg/pull/12145) [vcpkg] Update message in bootstrap.ps1 (by @PhoebeHui)
+- [(#12201)](https://github.com/microsoft/vcpkg/pull/12201) [vcpkg] Remove all uses of Foo::Foo() noexcept = default; to fix #9955 (by @ras0219)
+- [(#12203)](https://github.com/microsoft/vcpkg/pull/12203) [vcpkg] Improve performance of compiler tracking (by @ras0219)
+- [(#12212)](https://github.com/microsoft/vcpkg/pull/12212) [msbuild] Revert the importance to Normal (by @PhoebeHui)
+- [(#12197)](https://github.com/microsoft/vcpkg/pull/12197) [vcpkg] Remove the tombstones and 'ignore' baseline concepts. (by @BillyONeal)
+- [(#4608)](https://github.com/microsoft/vcpkg/pull/4608) [vcpkg] Use IncludePath and LibraryPath properties (by @FrankHeimes)
+- [(#12242)](https://github.com/microsoft/vcpkg/pull/12242) [vcpkg] Remove use of std::variant and std::visit to fix VS2015. (by @ras0219)
+- [(#12272)](https://github.com/microsoft/vcpkg/pull/12272) [vcpkg] Revert change which causes sources to be purged by default in `vcpkg build` (by @ras0219)
+- [(#12263)](https://github.com/microsoft/vcpkg/pull/12263) [vcpkg] Update toolsrc VERSION to 2020.06.15 (by @c72578)
+- [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (by @BillyONeal)
+- [(#12177)](https://github.com/microsoft/vcpkg/pull/12177) [vcpkg] Added python script to generate all packages file list, added to azur… (by @yaoleo34)
+- [(#11655)](https://github.com/microsoft/vcpkg/pull/11655) [vcpkg] Format the C++ in CI (by @strega-nil)
+- [(#12300)](https://github.com/microsoft/vcpkg/pull/12300) [libbson, vcpkg baseline] Remove passing and fix spurious failure. (by @BillyONeal)
+- [(#12140)](https://github.com/microsoft/vcpkg/pull/12140) [simdjson] Update to 0.4.6 (by @myd7349)
+- [(#11967)](https://github.com/microsoft/vcpkg/pull/11967) [evpp] Fix build error on OSX (by @JackBoosY)
+- [(#12314)](https://github.com/microsoft/vcpkg/pull/12314) [vcpkg ci] Update formatting CI (by @strega-nil)
+- [(#12259)](https://github.com/microsoft/vcpkg/pull/12259) [triplets][osx] add support for arm64 'apple silicon' (by @eklipse2k8)
+- [(#11754)](https://github.com/microsoft/vcpkg/pull/11754) [pcre2] Update to 10.35 (by @c72578)
+- [(#11753)](https://github.com/microsoft/vcpkg/pull/11753) Fix support for toolchains that set CMAKE_FIND_ROOT_PATH_MODE_* variables to ONLY (by @traversaro)
+- [(#12317)](https://github.com/microsoft/vcpkg/pull/12317) [vcpkg README] Fix links (by @strega-nil)
+- [(#12319)](https://github.com/microsoft/vcpkg/pull/12319) [vcpkg.targets] Fix #12292 regression with MSBuild targets (by @ras0219-msft)
+- [(#12323)](https://github.com/microsoft/vcpkg/pull/12323) [vcpkg] Ignore dependencies not found errors when downloading mode (by @JackBoosY)
+- [(#12257)](https://github.com/microsoft/vcpkg/pull/12257) [vcpkg] Fix MSBuild regressions #12062 and #12086. (by @ras0219)
+- [(#12037)](https://github.com/microsoft/vcpkg/pull/12037) [freerdp] Fix x64-osx triplet (by @AlexAltea)
+- [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (by @Neumann-A)
+- [(#8322)](https://github.com/microsoft/vcpkg/pull/8322) [kfr] Add new port (by @myd7349)
+- [(#12244)](https://github.com/microsoft/vcpkg/pull/12244) [cuda] correct env variables for newer cuda versions (by @Neumann-A)
+- [(#12256)](https://github.com/microsoft/vcpkg/pull/12256) [vcpkg] Move default binary cache from `$root/archives` to user-wide directory (by @ras0219)
+- [(#12350)](https://github.com/microsoft/vcpkg/pull/12350) [vcpkg] Remove unnecessary work queue (by @strega-nil)
+- [(#12367)](https://github.com/microsoft/vcpkg/pull/12367) [vcpkg build] fix #12355 (by @strega-nil)
+- [(#12369)](https://github.com/microsoft/vcpkg/pull/12369) [vcpkg formatting] Fix format regex (by @strega-nil)
+- [(#12178)](https://github.com/microsoft/vcpkg/pull/12178) [vcpkg] Add a schema file for vcpkg.json (by @Edhebi)
+- [(#12370)](https://github.com/microsoft/vcpkg/pull/12370) [vcpkg] Enable binary caching by default (by @ras0219)
+- [(#12386)](https://github.com/microsoft/vcpkg/pull/12386) [vcpkg] Add CMake heuristics for header-only libraries (by @ras0219)
+- [(#12378)](https://github.com/microsoft/vcpkg/pull/12378) [vcpkg] proper errorcheck during files installation (by @Maximus5)
+- [(#12384)](https://github.com/microsoft/vcpkg/pull/12384) [vcpkg-ci] Always publish file lists (by @ras0219)
+- [(#12254)](https://github.com/microsoft/vcpkg/pull/12254) [vcpkg] Track hashes of cmake script helpers in consuming portfiles (by @ras0219)
+- [(#12361)](https://github.com/microsoft/vcpkg/pull/12361) [vcpkg] Fix iOS toolchain detection when using the iOS community triplets (by @alcroito)
+- [(#12398)](https://github.com/microsoft/vcpkg/pull/12398) [libb2] Add supports and install pkg-conifg on macOS VM (by @PhoebeHui)
+- [(#12368)](https://github.com/microsoft/vcpkg/pull/12368) [vcpkg formatting] Turn off DeriveLineEnding (by @strega-nil)
+- [(#12429)](https://github.com/microsoft/vcpkg/pull/12429) [vcpkg] Fix ParagraphParser::required_field() (by @maksqwe)
+- [(#12400)](https://github.com/microsoft/vcpkg/pull/12400) [vcpkg] implement copy_symlink working for non-elevated processes (by @Maximus5)
+- [(#12432)](https://github.com/microsoft/vcpkg/pull/12432) vcpkg_configure_make: typo fix '_vcpkg_append_to_configure_environment' (by @kevinlul)
+- [(#12351)](https://github.com/microsoft/vcpkg/pull/12351) [vcpkg] Clean up command switch code (by @strega-nil)
+- [(#12179)](https://github.com/microsoft/vcpkg/pull/12179) [vcpkg] print list in json (by @dan-shaw)
+- [(#12084)](https://github.com/microsoft/vcpkg/pull/12084) Build fix with MinGW GCC 9.2.0 (by @cristianadam)
+- [(#12455)](https://github.com/microsoft/vcpkg/pull/12455) [libmicrohttpd] Add `platform.h` to restricted header list. (by @ras0219)
+- [(#12468)](https://github.com/microsoft/vcpkg/pull/12468) [vcpkg] Add NVTOOLSEXT_PATH to the env passthrough list (by @Neumann-A)
+- [(#12534)](https://github.com/microsoft/vcpkg/pull/12534) Add initial s390x support (by @lebdron)
+- [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (by @Neumann-A)
+- [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3 (by @cenit)
+- [(#12467)](https://github.com/microsoft/vcpkg/pull/12467) [vcpkg-acquire-msys] Install new keyring (by @emptyVoid)
+- [(#12460)](https://github.com/microsoft/vcpkg/pull/12460) [vcpkg] Improve format check failure message (by @JackBoosY)
+- [(#9248)](https://github.com/microsoft/vcpkg/pull/9248) fix issue #9228 : Add support to subgroups in gitlab (by @RamadanAhmed)
+- [(#12513)](https://github.com/microsoft/vcpkg/pull/12513) [vcpkg] EOL LF for ci.baseline.txt (by @Neumann-A)
+- [(#8628)](https://github.com/microsoft/vcpkg/pull/8628) [marble] Add new port (by @ig-or)
+- [(#12118)](https://github.com/microsoft/vcpkg/pull/12118) [mozjpeg] fix build (by @saucecontrol)
+- [(#12530)](https://github.com/microsoft/vcpkg/pull/12530) [libmodbus] Fix static linkage error (by @NancyLi1013)
+- [(#12514)](https://github.com/microsoft/vcpkg/pull/12514) [mpir] Fix build error if VCPKG_BUILD_TYPE is set as release or debug (by @NancyLi1013)
+- [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build (by @JackBoosY)
+- [(#12569)](https://github.com/microsoft/vcpkg/pull/12569) [vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (by @Neumann-A)
+- [(#12097)](https://github.com/microsoft/vcpkg/pull/12097) Fix vcpkg android toolchain so it adds flags that aren't just ignored (by @jamiebk)
+- [(#11021)](https://github.com/microsoft/vcpkg/pull/11021) [rsocket] Add new port (by @curoky)
+- [(#12104)](https://github.com/microsoft/vcpkg/pull/12104) Fix vcpkg_fixup_cmake_targets to work correctly on MinGW (by @koprok)
+- [(#12661)](https://github.com/microsoft/vcpkg/pull/12661) [vcpkg] Fix typo in link for installing and using packages (by @varunagrawal)
+- [(#12639)](https://github.com/microsoft/vcpkg/pull/12639) [vcpkg-ci] fix macos setup scripts (by @strega-nil)
+- [(#12586)](https://github.com/microsoft/vcpkg/pull/12586) [vcpkg] Fix build on Windows 8.1 SDK (by @strega-nil)
+- [(#12585)](https://github.com/microsoft/vcpkg/pull/12585) [vcpkg] Refactor Commands: Part 1 (by @strega-nil)
+- [(#10770)](https://github.com/microsoft/vcpkg/pull/10770) [cmake] Add cmake port to test qt (by @Neumann-A)
+- [(#10786)](https://github.com/microsoft/vcpkg/pull/10786) [tomlplusplus] Add new port (by @traversaro)
+- [(#12641)](https://github.com/microsoft/vcpkg/pull/12641) Refactor commands 2: Electric Boogaloo (by @strega-nil)
+- [(#12548)](https://github.com/microsoft/vcpkg/pull/12548) [vcpkg manifest] look at `platform` directives (by @strega-nil)
+- [(#12494)](https://github.com/microsoft/vcpkg/pull/12494) [qt-webengine] Fix building with vs2017 (by @Neumann-A)
+- [(#11376)](https://github.com/microsoft/vcpkg/pull/11376) [avro-cpp] new port (by @alexander-smyslov)
+- [(#11535)](https://github.com/microsoft/vcpkg/pull/11535) [mpg123] Allow cross-compiling, fix previous builds tainting rebuilds (by @kevinlul)
+- [(#12624)](https://github.com/microsoft/vcpkg/pull/12624) Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (by @BillyONeal)
+- [(#12423)](https://github.com/microsoft/vcpkg/pull/12423) [vcpkg] Add environment variable VCPKG_DEFAULT_BINARY_CACHE (by @Neumann-A)
+- [(#10670)](https://github.com/microsoft/vcpkg/pull/10670) [vcpkg] Fix [boost] find_package for MSVC2013 / v120 (by @ManuelKugelmann)
+- [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag (by @strega-nil)
+- [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1 (by @Neumann-A)
+- [(#12742)](https://github.com/microsoft/vcpkg/pull/12742) [wavpack] Fix failure on linux and osx (by @PhoebeHui)
+- [(#12727)](https://github.com/microsoft/vcpkg/pull/12727) [msbuild] Revert the importance to Normal (by @PhoebeHui)
+- [(#12717)](https://github.com/microsoft/vcpkg/pull/12717) [vcpkg] Fix prettify output not working in some cases (by @Deadpikle)
+- [(#12715)](https://github.com/microsoft/vcpkg/pull/12715) [vcpkg] Add VCPKG_TARGET_IS_IOS (by @Deadpikle)
+- [(#12716)](https://github.com/microsoft/vcpkg/pull/12716) [vcpkg] Fix arm64-osx triplet not building for arm64 (by @Deadpikle)
+- [(#12701)](https://github.com/microsoft/vcpkg/pull/12701) [vcpkg-ci-paraview] move into scripts/test_ports (by @Neumann-A)
+- [(#12699)](https://github.com/microsoft/vcpkg/pull/12699) [vcpkg baseline] remove qt translations from skip list (by @Neumann-A)
+- [(#12695)](https://github.com/microsoft/vcpkg/pull/12695) [ngspice] Initial port (by @marekr)
+- [(#12678)](https://github.com/microsoft/vcpkg/pull/12678) [vcpkg] Add missing check for x86 (by @arves100)
+- [(#12752)](https://github.com/microsoft/vcpkg/pull/12752) [vcpkg_build_qmake] Disable multi-threaded build when file fails to open (by @JackBoosY)
+- [(#12789)](https://github.com/microsoft/vcpkg/pull/12789) [vcpkg] Fix vs2015 build (by @strega-nil)
+- [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0 (by @kevinlul)
+- [(#12515)](https://github.com/microsoft/vcpkg/pull/12515) [pangolin] Fix build failure on UNIX (by @JackBoosY)
+- [(#12792)](https://github.com/microsoft/vcpkg/pull/12792) [log4cpp] Fix header file install path (by @LilyWangL)
+- [(#12784)](https://github.com/microsoft/vcpkg/pull/12784) [gSoap] Update to 2.8.105 and add a required shared directory (by @xgcssch)
+- [(#12768)](https://github.com/microsoft/vcpkg/pull/12768) [libtorrent] Update to 1.2.8 (by @FranciscoPombal)
+- [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp (by @ras0219)
+- [(#12630)](https://github.com/microsoft/vcpkg/pull/12630) [secp256k1] Fix build failures and export cmake targets (by @PhoebeHui)
+- [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit (by @ZehMatt)
+- [(#12528)](https://github.com/microsoft/vcpkg/pull/12528) [libass] Fix build error on x64-windows-static (by @LilyWangL)
+- [(#12634)](https://github.com/microsoft/vcpkg/pull/12634) [vcpkg] Improving android support (by @christophe-calmejane)
+- [(#9162)](https://github.com/microsoft/vcpkg/pull/9162) [crashrpt] Add new port (by @tbdrake)
+- [(#12810)](https://github.com/microsoft/vcpkg/pull/12810) [vcpkg] Make C++ the primary github language (by @strega-nil)
+- [(#12198)](https://github.com/microsoft/vcpkg/pull/12198) [vcpkg] Add `vcpkg export` to E2E tests. Enable E2E tests on all platforms. (by @ras0219)
+- [(#12698)](https://github.com/microsoft/vcpkg/pull/12698) [vcpkg] Rewrite CMake build system to be more target-based (by @strega-nil)
+- [(#12776)](https://github.com/microsoft/vcpkg/pull/12776) [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell (by @JackBoosY)
+- [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port (by @Neumann-A)
+- [(#12829)](https://github.com/microsoft/vcpkg/pull/12829) [vcpkg] Fix resolution of default features when using Manifest mode (by @ras0219)
+- [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues (by @Neumann-A)
+- [(#12818)](https://github.com/microsoft/vcpkg/pull/12818) [constexpr-contracts] Adds new port (by @cjdb)
+- [(#12876)](https://github.com/microsoft/vcpkg/pull/12876) [vcpkg] Reduce dependencies and contents of vcpkgpaths.h (by @ras0219)
+- [(#12866)](https://github.com/microsoft/vcpkg/pull/12866) [msys] Improve vcpkg_acquire_msys (by @PhoebeHui)
+- [(#12897)](https://github.com/microsoft/vcpkg/pull/12897) [vcpkg] Restore layering and purge unused ParagraphParseResult (by @ras0219)
+- [(#12895)](https://github.com/microsoft/vcpkg/pull/12895) [vcpkg_find_acquire_program] add version check for ninja (by @Neumann-A)
+- [(#12927)](https://github.com/microsoft/vcpkg/pull/12927) [meson] Update meson to 0.55.1 (by @Neumann-A)
+- [(#12837)](https://github.com/microsoft/vcpkg/pull/12837) Fix/clang10 linux (by @ignacionr)
+- [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp) (by @NancyLi1013)
+- [(#12774)](https://github.com/microsoft/vcpkg/pull/12774) [vcpkg] Use std::filesystem when Visual Studio is greater than 2015 (by @JackBoosY)
+- [(#12626)](https://github.com/microsoft/vcpkg/pull/12626) [vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG) (by @ras0219)
+- [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. (by @Sibras)
+- [(#12864)](https://github.com/microsoft/vcpkg/pull/12864) [vcpkg_execute_build_process] Re-fix qt5 components build (by @JackBoosY)
+- [(#13000)](https://github.com/microsoft/vcpkg/pull/13000) [vcpkg] Fix baseline (by @NancyLi1013)
+- [(#12985)](https://github.com/microsoft/vcpkg/pull/12985) [vcpkg] Add Forward Declarations (originally by @cngzhnp) (by @strega-nil)
+- [(#12976)](https://github.com/microsoft/vcpkg/pull/12976) [vcpkg] Update hint message (by @PhoebeHui)
+- [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version (by @NancyLi1013)
+- [(#13017)](https://github.com/microsoft/vcpkg/pull/13017) remove registries.h and fwd/registries.h... (by @strega-nil)
+- [(#12975)](https://github.com/microsoft/vcpkg/pull/12975) [openmpi/vcpkg_build_make] Disable parallel build (by @JackBoosY)
+- [(#13043)](https://github.com/microsoft/vcpkg/pull/13043) [vcpkg] Fix hint message (by @PhoebeHui)
+- [(#12046)](https://github.com/microsoft/vcpkg/pull/12046) [portmidi] Updated portmidi package to use alternative code source (by @stekyne)
+- [(#13066)](https://github.com/microsoft/vcpkg/pull/13066) [typo] Fix incorrect Path in readme (by @ninjaoflight)
+- [(#12910)](https://github.com/microsoft/vcpkg/pull/12910) [vcpkg] Fix editable bug (by @ras0219)
+- [(#12523)](https://github.com/microsoft/vcpkg/pull/12523) [vcpkg.cmake] check for vcpkg.json only in `${CMAKE_SOURCE_DIR}` (by @strega-nil)
+- [(#12964)](https://github.com/microsoft/vcpkg/pull/12964) [vcpkg] Do not use raw paths inside regexes (by @hanst99)
+- [(#13092)](https://github.com/microsoft/vcpkg/pull/13092) [vcpkg] Hotfix regression in #12523 (by @ras0219)
+- [(#13067)](https://github.com/microsoft/vcpkg/pull/13067) Sort file lists and failure logs together. (by @BillyONeal)
+- [(#12738)](https://github.com/microsoft/vcpkg/pull/12738) [vcpkg] Use https sources for common tools (by @janisozaur)
+- [(#13058)](https://github.com/microsoft/vcpkg/pull/13058) [Box2d] Update to 2.4.0 (by @JonLiu1993)
+- [(#12977)](https://github.com/microsoft/vcpkg/pull/12977) fix vcpkg_configure_cmake for case when having semicolons in OPTIONS (by @jgehw)
+- [(#12950)](https://github.com/microsoft/vcpkg/pull/12950) [vcpkg] Fix build on older compilers. (by @huahang)
+- [(#13104)](https://github.com/microsoft/vcpkg/pull/13104) [vcpkg] Fix vcpkg_acquire_msys failing on path with spaces (by @SupSuper)
+- [(#13125)](https://github.com/microsoft/vcpkg/pull/13125) Disable fluidlite in CI. (by @BillyONeal)
+- [(#13117)](https://github.com/microsoft/vcpkg/pull/13117) [vcpkg] Fix #13094 by avoiding the comma operator. (by @BillyONeal)
+- [(#13107)](https://github.com/microsoft/vcpkg/pull/13107) [VMSS] Fix the printed error message (by @JackBoosY)
+- [(#13069)](https://github.com/microsoft/vcpkg/pull/13069) [vcpkg] Fix upgrade for port-version (by @strega-nil)
+- [(#12982)](https://github.com/microsoft/vcpkg/pull/12982) [vcpkg_find_acquire_program] Cleanup and add CI testing (by @ras0219)
+- [(#13142)](https://github.com/microsoft/vcpkg/pull/13142) Allow use of VS LLVM clang-format. (by @BillyONeal)
+- [(#13148)](https://github.com/microsoft/vcpkg/pull/13148) [baseline] Skip check of clapack:x64-osx in the baseline (by @JackBoosY)
+
+
+The following 59 ports have been added:
+
+|port|version|
+|---|---|
+|[nanobench](https://github.com/microsoft/vcpkg/pull/11955)| 4.0.0
+|[cgns](https://github.com/microsoft/vcpkg/pull/9960)| 3.4.0-1
+|[paraview](https://github.com/microsoft/vcpkg/pull/9960)[#12067](https://github.com/microsoft/vcpkg/pull/12067) [#12144](https://github.com/microsoft/vcpkg/pull/12144) [#12149](https://github.com/microsoft/vcpkg/pull/12149) [#11596](https://github.com/microsoft/vcpkg/pull/11596) [#12342](https://github.com/microsoft/vcpkg/pull/12342) | 5.8.0-2
+|[drogon](https://github.com/microsoft/vcpkg/pull/12024)[#12931](https://github.com/microsoft/vcpkg/pull/12931) [#13007](https://github.com/microsoft/vcpkg/pull/13007) | v1.0.0-beta21
+|[libxdiff](https://github.com/microsoft/vcpkg/pull/12017)| 0.23
+|[efsw](https://github.com/microsoft/vcpkg/pull/11901)| 2020-06-08
+|[bitmagic](https://github.com/microsoft/vcpkg/pull/11890)| 6.4.0
+|[tgbot-cpp](https://github.com/microsoft/vcpkg/pull/11876)| 1.2.1
+|[ignition-plugin1](https://github.com/microsoft/vcpkg/pull/11275)| 1.1.0
+|[ppmagic](https://github.com/microsoft/vcpkg/pull/12253)| 2020-07-03
+|[getdns](https://github.com/microsoft/vcpkg/pull/12090)| 1.6.0
+|[font-chef](https://github.com/microsoft/vcpkg/pull/12293)| 1.0.1
+|[implot](https://github.com/microsoft/vcpkg/pull/11920)[#12835](https://github.com/microsoft/vcpkg/pull/12835) | 0.4
+|[threadpool](https://github.com/microsoft/vcpkg/pull/11650)| 0.2.5
+|[mygui](https://github.com/microsoft/vcpkg/pull/11991)| 2020-06-17
+|[kfr](https://github.com/microsoft/vcpkg/pull/8322)| 2020-06-15
+|[meshoptimizer](https://github.com/microsoft/vcpkg/pull/12211)| 0.14
+|[edlib](https://github.com/microsoft/vcpkg/pull/12490)| 1.2.6
+|[neargye-semver](https://github.com/microsoft/vcpkg/pull/12406)| 0.2.2
+|[marble](https://github.com/microsoft/vcpkg/pull/8628)| 19.08.2
+|[simple-fft](https://github.com/microsoft/vcpkg/pull/11929)| 2020-06-14
+|[stx](https://github.com/microsoft/vcpkg/pull/12011)| 1.0.1
+|[rsocket](https://github.com/microsoft/vcpkg/pull/11021)| 2020.05.04.00-1
+|[brpc](https://github.com/microsoft/vcpkg/pull/11524)| 0.9.7
+|[gamedev-framework](https://github.com/microsoft/vcpkg/pull/12426)[#12680](https://github.com/microsoft/vcpkg/pull/12680) | 0.17
+|[tomlplusplus](https://github.com/microsoft/vcpkg/pull/10786)[#12859](https://github.com/microsoft/vcpkg/pull/12859) | 2.1.0
+|[vcpkg-ci-paraview](https://github.com/microsoft/vcpkg/pull/12342)| 1
+|[avro-cpp](https://github.com/microsoft/vcpkg/pull/11376)| 1.9.2
+|[xframe](https://github.com/microsoft/vcpkg/pull/12427)| 0.3.0
+|[minc](https://github.com/microsoft/vcpkg/pull/11208)| 2.4.03
+|[nifticlib](https://github.com/microsoft/vcpkg/pull/11208)| 2020-04-30
+|[ngspice](https://github.com/microsoft/vcpkg/pull/12695)| 32
+|[josuttis-jthread](https://github.com/microsoft/vcpkg/pull/12497)[#13040](https://github.com/microsoft/vcpkg/pull/13040) | 2020-07-21
+|[lapack](https://github.com/microsoft/vcpkg/pull/12464)[#12805](https://github.com/microsoft/vcpkg/pull/12805) | 1
+|[qwtw](https://github.com/microsoft/vcpkg/pull/12748)[#12961](https://github.com/microsoft/vcpkg/pull/12961) | 3.1.0
+|[cppad](https://github.com/microsoft/vcpkg/pull/12560)| 20200000.3
+|[kf5completion](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5config](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5coreaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5crash](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5guiaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5i18n](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5itemmodels](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5itemviews](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5widgetsaddons](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[kf5windowsystem](https://github.com/microsoft/vcpkg/pull/11861)| 5.64.0
+|[libde265](https://github.com/microsoft/vcpkg/pull/11861)| 1.0.5
+|[libheif](https://github.com/microsoft/vcpkg/pull/11861)[#12856](https://github.com/microsoft/vcpkg/pull/12856) | 1.7.0
+|[quazip](https://github.com/microsoft/vcpkg/pull/11861)| 0.9.1
+|[vc](https://github.com/microsoft/vcpkg/pull/11861)| 1.4.1
+|[tlx](https://github.com/microsoft/vcpkg/pull/11943)| 0.5.20191212
+|[crashrpt](https://github.com/microsoft/vcpkg/pull/9162)| 1.4.3
+|[dbghelp](https://github.com/microsoft/vcpkg/pull/9162)| 0.0
+|[opencolorio-tools](https://github.com/microsoft/vcpkg/pull/12420)| 1.1.1
+|[lapack-reference](https://github.com/microsoft/vcpkg/pull/12805)[#12977](https://github.com/microsoft/vcpkg/pull/12977) [#12929](https://github.com/microsoft/vcpkg/pull/12929) | 3.8.0
+|[vcpkg-gfortran](https://github.com/microsoft/vcpkg/pull/12805)| 1
+|[constexpr-contracts](https://github.com/microsoft/vcpkg/pull/12818)| 2020-08-09
+|[fluidlite](https://github.com/microsoft/vcpkg/pull/13006)[#13125](https://github.com/microsoft/vcpkg/pull/13125) | 2020-08-20
+|[boost-uninstall](https://github.com/microsoft/vcpkg/pull/12851)| 1.73.0
+
+
+
+The following 345 ports have been updated:
+
+- slikenet `2019-10-22_1` -> `2019-10-22-2`
+ - [(#11987)](https://github.com/microsoft/vcpkg/pull/11987) [slikenet] Add cmake config and targets file
+
+- breakpad `2019-07-11-1` -> `2019-07-11-2`
+ - [(#11984)](https://github.com/microsoft/vcpkg/pull/11984) [breakpad] Fix build failure on OSX
+
+- plf-colony `2019-08-10` -> `5.33`
+ - [(#11993)](https://github.com/microsoft/vcpkg/pull/11993) [plf-colony] Update to 5.33
+
+- thrift `2020-02-08` -> `0.13.0`
+ - [(#11981)](https://github.com/microsoft/vcpkg/pull/11981) [thrift] Update to 0.13.0 and fix OSX build
+
+- libvpx `1.8.1-5` -> `1.8.1-7`
+ - [(#11963)](https://github.com/microsoft/vcpkg/pull/11963) [libvpx] Support arm64-windows
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+ - [(#12401)](https://github.com/microsoft/vcpkg/pull/12401) [liblzma, libvpx] Add mingw support
+ - [(#12706)](https://github.com/microsoft/vcpkg/pull/12706) [libvpx] fix pdb paths
+
+- libzip `rel-1-6-1` -> `1.7.1`
+ - [(#11982)](https://github.com/microsoft/vcpkg/pull/11982) [libzip] Update to 1.7.1
+ - [(#12610)](https://github.com/microsoft/vcpkg/pull/12610) [libzip] Fix find_package error
+
+- directxtex `jun2020` -> `jun2020b`
+ - [(#11971)](https://github.com/microsoft/vcpkg/pull/11971) [directxtk12][directxtex] Update to latest version
+ - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+ - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+
+- directxtk12 `jun2020` -> `jun2020b`
+ - [(#11971)](https://github.com/microsoft/vcpkg/pull/11971) [directxtk12][directxtex] Update to latest version
+ - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+ - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+
+- geographiclib `1.47-patch1-12` -> `1.47-patch1-16`
+ - [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12379)](https://github.com/microsoft/vcpkg/pull/12379) [geographiclib] Update to 1.50.1
+ - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag
+
+- polyclipping `6.4.2` -> `6.4.2-4`
+ - [(#11965)](https://github.com/microsoft/vcpkg/pull/11965) [vcpkg baseline] Retrigger failed ports in baseline
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- qhull `7.3.2-2` -> `8.0.0`
+ - [(#12015)](https://github.com/microsoft/vcpkg/pull/12015) [qhull] update version 8.0.0
+
+- jsoncons `0.153.0` -> `0.155.1`
+ - [(#12014)](https://github.com/microsoft/vcpkg/pull/12014) [jsoncons] Update to v0.153.3
+ - [(#12372)](https://github.com/microsoft/vcpkg/pull/12372) [jsoncons] Update to v0.154.1
+ - [(#12827)](https://github.com/microsoft/vcpkg/pull/12827) [jsoncons] Update to version 0.155.1
+
+- azure-c-shared-utility `2020-02-04.1` -> `2020-07-19`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+ - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19
+
+- azure-iot-sdk-c `2020-02-04.1-1` -> `2020-07-19`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+ - [(#12209)](https://github.com/microsoft/vcpkg/pull/12209) [azure-iot-sdk-c] Fix feature name and enable to build
+ - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19
+ - [(#12605)](https://github.com/microsoft/vcpkg/pull/12605) [azure-iot-sdk-c] Fix passing hsm_type_symm_key
+
+- azure-macro-utils-c `2020-02-04.1` -> `2020-06-17-1`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+
+- azure-uamqp-c `2020-02-04.1` -> `2020-07-19`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+ - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19
+
+- azure-uhttp-c `2020-02-04.1` -> `2020-07-19`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+ - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19
+
+- azure-umqtt-c `2020-02-04.1` -> `2020-07-19`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+ - [(#12493)](https://github.com/microsoft/vcpkg/pull/12493) [Azure-IoT-Sdk*] Update to 2020-07-19
+
+- umock-c `2020-02-04.1` -> `2020-06-17-1`
+ - [(#12013)](https://github.com/microsoft/vcpkg/pull/12013) [Azure-IoT-Sdk] Update to release 2020-06-17
+
+- tinyxml2 `8.0.0` -> `8.0.0-1`
+ - [(#11966)](https://github.com/microsoft/vcpkg/pull/11966) [tinyxml2] Fix generation of pkg-config file
+
+- nlohmann-json `3.7.3` -> `3.9.1`
+ - [(#11941)](https://github.com/microsoft/vcpkg/pull/11941) [nlohmann-json] Upgrade to 3.8.0
+ - [(#12117)](https://github.com/microsoft/vcpkg/pull/12117) [nlohmann-json] Always install multiple headers to allow forward declarations
+ - [(#12601)](https://github.com/microsoft/vcpkg/pull/12601) [nlohmann-json] Update to 3.9.0
+ - [(#12787)](https://github.com/microsoft/vcpkg/pull/12787) [nlohmann-json] Update to 3.9.1
+
+- trantor `v1.0.0-rc13` -> `v1.0.0-rc16`
+ - [(#11937)](https://github.com/microsoft/vcpkg/pull/11937) [trantor] Bump version to v1.0.0-rc14
+ - [(#12930)](https://github.com/microsoft/vcpkg/pull/12930) [trantor] Update to 1.0.0-rc16
+
+- graphicsmagick `1.3.35` -> `1.3.35-2`
+ - [(#11926)](https://github.com/microsoft/vcpkg/pull/11926) [graphicsmagick] fix Magick++.h header location.
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+
+- bitsery `5.0.3` -> `5.1.0`
+ - [(#11912)](https://github.com/microsoft/vcpkg/pull/11912) [bitsery] Update to 5.1.0 version
+
+- skyr-url `1.10.0` -> `1.12.0`
+ - [(#11911)](https://github.com/microsoft/vcpkg/pull/11911) [skyr-url] Updated version number of skyr-url
+ - [(#12214)](https://github.com/microsoft/vcpkg/pull/12214) [skyr-url] Changed version number to 1.12.0
+
+- vtk `9.0-2` -> `9.0.1`
+ - [(#9960)](https://github.com/microsoft/vcpkg/pull/9960) [CGNS/ParaView] Add new ports
+ - [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors
+ - [(#11399)](https://github.com/microsoft/vcpkg/pull/11399) [vtk] Added opengl feature.
+ - [(#12149)](https://github.com/microsoft/vcpkg/pull/12149) [vtk] update to 9.0.1
+ - [(#12472)](https://github.com/microsoft/vcpkg/pull/12472) [vtk|cuda] add nvcc to the path
+ - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- so5extra `1.4.0` -> `1.4.1`
+ - [(#12052)](https://github.com/microsoft/vcpkg/pull/12052) [so5extra] update to v.1.4.1.
+
+- sobjectizer `5.7.0.1` -> `5.7.1`
+ - [(#12051)](https://github.com/microsoft/vcpkg/pull/12051) [SObjectizer] update to v.5.7.1.
+
+- field3d `1.7.2` -> `1.7.3`
+ - [(#11747)](https://github.com/microsoft/vcpkg/pull/11747) [hdf5] Update HDF5 to 1.12
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+ - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency
+
+- hdf5 `1.10.5-12` -> `1.12.0`
+ - [(#11747)](https://github.com/microsoft/vcpkg/pull/11747) [hdf5] Update HDF5 to 1.12
+
+- freerdp `2.0.0-1` -> `2.1.1-1`
+ - [(#12050)](https://github.com/microsoft/vcpkg/pull/12050) [freerdp] Update to version 2.1.1
+ - [(#12037)](https://github.com/microsoft/vcpkg/pull/12037) [freerdp] Fix x64-osx triplet
+
+- openal-soft `1.20.1-1` -> `1.20.1-2`
+ - [(#12047)](https://github.com/microsoft/vcpkg/pull/12047) [openal-soft] Fix build failure by updating the library
+ - [(#12318)](https://github.com/microsoft/vcpkg/pull/12318) [openal-soft] Revert #12047
+ - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes
+
+- absent `0.3.0` -> `0.3.1`
+ - [(#12036)](https://github.com/microsoft/vcpkg/pull/12036) [absent] Bump version 0.3.1
+
+- cjson `2019-11-30` -> `2019-11-30-1`
+ - [(#12026)](https://github.com/microsoft/vcpkg/pull/12026) [cjson] fix windows-static for don't export symbols
+
+- open62541 `1.0.1` -> `1.1`
+ - [(#12023)](https://github.com/microsoft/vcpkg/pull/12023) [open62541] update to v1.1, add encryption support
+
+- abseil `2020-03-03-6` -> `2020-03-03-7`
+ - [(#12022)](https://github.com/microsoft/vcpkg/pull/12022) [abseil] Fix usage issue
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag
+ - [(#12781)](https://github.com/microsoft/vcpkg/pull/12781) [abseil] Fix CMake warning
+
+- nowide `10.0.1` -> `11.0.0`
+ - [(#12020)](https://github.com/microsoft/vcpkg/pull/12020) [nowide] Update to 11.0.0
+
+- cpp-httplib `0.5.1` -> `0.7.0`
+ - [(#12010)](https://github.com/microsoft/vcpkg/pull/12010) [cpp-httplib] Update library to 0.7.0
+
+- openmesh `8.0` -> `8.1`
+ - [(#12007)](https://github.com/microsoft/vcpkg/pull/12007) [openmesh] Fix install *.dll and add vcpkg-cmake-wrapper.cmake
+ - [(#11739)](https://github.com/microsoft/vcpkg/pull/11739) [openmesh] Upgrade to 8.1
+
+- cpprestsdk `2.10.16-2` -> `2.10.16-3`
+ - [(#12006)](https://github.com/microsoft/vcpkg/pull/12006) [cpprestsdk] Fix usage issue when building static
+
+- activemq-cpp `3.9.5-2` -> `3.9.5-3`
+ - [(#12005)](https://github.com/microsoft/vcpkg/pull/12005) [activemq-cpp] Fix static build
+
+- date `2019-11-08` -> `3.0.0`
+ - [(#11968)](https://github.com/microsoft/vcpkg/pull/11968) [date] Update to 3.0.0
+ - [(#12739)](https://github.com/microsoft/vcpkg/pull/12739) [date] Fix config.cmake and usage
+
+- libmicrohttpd `0.9.63-2` -> `0.9.63-3`
+ - [(#11983)](https://github.com/microsoft/vcpkg/pull/11983) [libmicrohttpd] Support build on UNIX and use msbuild on Windows
+ - [(#12455)](https://github.com/microsoft/vcpkg/pull/12455) [libmicrohttpd] Add `platform.h` to restricted header list.
+
+- llvm `10.0.0-3` -> `10.0.0-4`
+ - [(#11956)](https://github.com/microsoft/vcpkg/pull/11956) [llvm] fix issue #11916
+
+- ffmpeg `4.2-10` -> `4.2-13`
+ - [(#11946)](https://github.com/microsoft/vcpkg/pull/11946) [ffmpeg] Add avisynthplus support
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+ - [(#12083)](https://github.com/microsoft/vcpkg/pull/12083) [ffmpeg] Allow gpl builds without avisynthplus
+ - [(#12063)](https://github.com/microsoft/vcpkg/pull/12063) [ffmpeg] Fix tools dependency dll file
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+ - [(#12635)](https://github.com/microsoft/vcpkg/pull/12635) [ffmpeg] fix FindFFMPEG.cmake to work properly even without avresample
+ - [(#12843)](https://github.com/microsoft/vcpkg/pull/12843) [ffmpeg] Some libraries in ffmpeg can be optional
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+ - [(#13004)](https://github.com/microsoft/vcpkg/pull/13004) [ffmpeg] fix cmake module
+
+- imgui `1.76-1` -> `1.78`
+ - [(#11919)](https://github.com/microsoft/vcpkg/pull/11919) [imgui] Add Freetype feature
+ - [(#12155)](https://github.com/microsoft/vcpkg/pull/12155) [imgui] Update to 1.77
+ - [(#12329)](https://github.com/microsoft/vcpkg/pull/12329) [imgui] Split bindings to multiple features
+ - [(#12210)](https://github.com/microsoft/vcpkg/pull/12210) [ogre] Update to version 1.12.7 and fix link error
+ - [(#12890)](https://github.com/microsoft/vcpkg/pull/12890) [imgui] Add messages for unsupported features
+ - [(#13064)](https://github.com/microsoft/vcpkg/pull/13064) [imgui] Update to 1.78
+ - [(#12691)](https://github.com/microsoft/vcpkg/pull/12691) [libigl] fix imgui feature
+
+- x265 `3.2-3` -> `3.4`
+ - [(#11903)](https://github.com/microsoft/vcpkg/pull/11903) [x265] Delete the bin directory if the platform is Linux
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+ - [(#13048)](https://github.com/microsoft/vcpkg/pull/13048) [x265] Update source and version
+
+- wtl `10.0-5` -> `10.0.10077`
+ - [(#11893)](https://github.com/microsoft/vcpkg/pull/11893) [wtl] Update to 10.0.10077
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12688)](https://github.com/microsoft/vcpkg/pull/12688) [wtl ] Upgrade wtl to 10.0.10077.
+
+- icu `67.1` -> `67.1-2`
+ - [(#11897)](https://github.com/microsoft/vcpkg/pull/11897) [icu] Add tools
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+
+- cairo `1.16.0-4` -> `1.16.0-6`
+ - [(#11829)](https://github.com/microsoft/vcpkg/pull/11829) [cairo] Fix error in static build
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- pango `1.40.11-6` -> `1.40.11-7`
+ - [(#11829)](https://github.com/microsoft/vcpkg/pull/11829) [cairo] Fix error in static build
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- grpc `1.28.1-1` -> `1.31.1`
+ - [(#11791)](https://github.com/microsoft/vcpkg/pull/11791) [grpc] Update to 1.29.1
+ - [(#12611)](https://github.com/microsoft/vcpkg/pull/12611) [grpc] Fix generate plugin grpc_csharp_ext
+ - [(#12920)](https://github.com/microsoft/vcpkg/pull/12920) [grpc] grpc v1.30.2
+ - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1
+
+- offscale-libetcd-cpp `2019-07-10` -> `2019-07-10-1`
+ - [(#11791)](https://github.com/microsoft/vcpkg/pull/11791) [grpc] Update to 1.29.1
+
+- stlab `1.5.2` -> `1.5.2-1`
+ - [(#11787)](https://github.com/microsoft/vcpkg/pull/11787) [stlab] Fix cmake config file
+
+- ffnvcodec `9.1.23.1` -> `9.1.23.1-1`
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- libpq `12.2-2` -> `12.2-3`
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+ - [(#12415)](https://github.com/microsoft/vcpkg/pull/12415) [libpq] Remove broken features
+ - [(#12674)](https://github.com/microsoft/vcpkg/pull/12674) [libpq] only require bison and flex on Windows
+
+- tensorflow-cc `1.14-2` -> `1.14-3`
+ - [(#12080)](https://github.com/microsoft/vcpkg/pull/12080) Fix bootstrapping MSYS2 pacman (#11499)
+ - [(#12546)](https://github.com/microsoft/vcpkg/pull/12546) [tensorflow-cc] fix build issues on Windows
+
+- ignition-modularscripts `2020-05-09` -> `2020-05-16`
+ - [(#11275)](https://github.com/microsoft/vcpkg/pull/11275) [ignition-plugin1] Add new port 🤖
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+
+- apr `1.7.0` -> `1.7.0-1`
+ - [(#12067)](https://github.com/microsoft/vcpkg/pull/12067) [vcpkg baseline] Fix baseline errors
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+
+- argtable2 `2.13-4` -> `2.13-7`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- cunit `2.1.3-3` -> `2.1.3-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- epsilon `0.9.2-1` -> `0.9.2-4`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- freeglut `3.2.1-1` -> `3.2.1-4`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- freeimage `3.18.0-9` -> `3.18.0-12`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+
+- giflib `5.1.4-3` -> `5.1.4-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- gsoap `2.8.102` -> `2.8.105`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12784)](https://github.com/microsoft/vcpkg/pull/12784) [gSoap] Update to 2.8.105 and add a required shared directory
+
+- healpix `1.12.10-1` -> `1.12.10-5`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- irrlicht `1.8.4-5` -> `1.8.4-8`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#13137)](https://github.com/microsoft/vcpkg/pull/13137) [irrlicht] Patch moved sysctl.h header file
+
+- itpp `4.3.1-2` -> `4.3.1-5`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libaiff `5.0-3` -> `5.0-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libdisasm `0.23-3` -> `0.23-7`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libmad `0.15.1-5` -> `0.15.1-8`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libmikmod `3.3.11.1-5` -> `3.3.11.1-8`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libsquish `1.15-3` -> `1.15-7`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libssh `0.9.3-1` -> `0.9.3-2`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+
+- libusb-win32 `1.2.6.0-3` -> `1.2.6.0-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libuuid `1.0.3-4` -> `1.0.3-7`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- libxmp-lite `4.4.1-3` -> `4.4.1-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- mathgl `2.4.3-3` -> `2.4.3-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- mp3lame `3.100` -> `3.100-3`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- mpg123 `1.25.8-10` -> `1.25.8-12`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12287)](https://github.com/microsoft/vcpkg/pull/12287) [mpg123] Update portfile.cmake to accomodate OpenSUSE 15.x /lib /lib64
+ - [(#11535)](https://github.com/microsoft/vcpkg/pull/11535) [mpg123] Allow cross-compiling, fix previous builds tainting rebuilds
+
+- pcre `8.44-1` -> `8.44-4`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12252)](https://github.com/microsoft/vcpkg/pull/12252) [pcre] Use vcpkg_from_sourceforge as a fallback
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12629)](https://github.com/microsoft/vcpkg/pull/12629) [pcre] Fix installation when only building release
+
+- pcre2 `10.30-7` -> `10.35`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12233)](https://github.com/microsoft/vcpkg/pull/12233) [pcre2] Restore the https://ftp.pcre.org/ mirror in addition to the SourceForge mirrors.
+ - [(#11754)](https://github.com/microsoft/vcpkg/pull/11754) [pcre2] Update to 10.35
+ - [(#12347)](https://github.com/microsoft/vcpkg/pull/12347) [pcre2] Fix -mshstk needed with -fcf-protection
+
+- plplot `5.13.0-5` -> `5.13.0-8`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- podofo `0.9.6-8` -> `0.9.6-9`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- portmidi `0.217.1-1` -> `0.234`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12046)](https://github.com/microsoft/vcpkg/pull/12046) [portmidi] Updated portmidi package to use alternative code source
+
+- pthreads `3.0.0-5` -> `3.0.0-6`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+
+- qt5-base `5.12.8-4` -> `5.15.0`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12153)](https://github.com/microsoft/vcpkg/pull/12153) [qt5-base] fix static init fiasco and fix debug dll's not being copied
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+ - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency
+ - [(#12752)](https://github.com/microsoft/vcpkg/pull/12752) [vcpkg_build_qmake] Disable multi-threaded build when file fails to open
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- qwt `6.1.3-11` -> `6.1.4`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+
+- rapidxml `1.13-1` -> `1.13-4`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- sigslot `1.0.0` -> `1.0.0-3`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- soxr `0.1.3.` -> `0.1.3-2`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+
+- tclap `1.2.2-2` -> `1.2.2-3`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+
+- tinyfiledialogs `3.4.3-2` -> `3.6.3`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12137)](https://github.com/microsoft/vcpkg/pull/12137) [tinyfiledialogs] Update version and download path to v3.6.3
+
+- tinyxml `2.6.2-4` -> `2.6.2-7`
+ - [(#11899)](https://github.com/microsoft/vcpkg/pull/11899) [vcpkg] Add vcpkg_from_sourceforge (1/2)
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- openssl-unix `1.1.1d-4` -> `1.1.1g`
+ - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003
+ - [(#12544)](https://github.com/microsoft/vcpkg/pull/12544) [openssl-unix] Add mingw with dynamic libs support - take 2
+ - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict
+ - [(#12986)](https://github.com/microsoft/vcpkg/pull/12986) [openssl-unix] Fix #12919
+ - [(#12527)](https://github.com/microsoft/vcpkg/pull/12527) [openssl-unix] use xcrun for iOS triplet build
+
+- openssl-uwp `1.1.1d-1` -> `1.1.1g`
+ - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003
+ - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict
+
+- openssl-windows `1.1.1d-2` -> `1.1.1g`
+ - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003
+ - [(#12056)](https://github.com/microsoft/vcpkg/pull/12056) [openssl-windows] Added feature option to build openssl with no-pinshared flag
+ - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict
+
+- openssl `1.1.1d` -> `1.1.1g`
+ - [(#11882)](https://github.com/microsoft/vcpkg/pull/11882) [openssl] Update openssl 1.1.1g - continued from PR #11003
+ - [(#12867)](https://github.com/microsoft/vcpkg/pull/12867) [openssl] Interrupt the build process when files conflict
+
+- cmocka `1.1.5-1` -> `1.1.5`
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+ - [(#12828)](https://github.com/microsoft/vcpkg/pull/12828) [cmocka] Update to 2020-08-01
+
+- libarchive `3.4.1-3` -> `3.4.1`
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+
+- libiconv `1.16-3` -> `1.16`
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+
+- libxml2 `2.9.9-6` -> `2.9.9`
+ - [(#11757)](https://github.com/microsoft/vcpkg/pull/11757) [vcpkg manifest] Manifest Implementation
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+
+- suitesparse `5.4.0-5` -> `5.4.0-6`
+ - [(#11945)](https://github.com/microsoft/vcpkg/pull/11945) [suitesparse] Fixing `SuiteSparse_INCLUDE_DIRS` is not usable from the port.
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+
+- boost-locale `1.73.0` -> `1.73.0-1`
+ - [(#10943)](https://github.com/microsoft/vcpkg/pull/10943) [boost-locale] Fix boost-locale failing to build with ICU
+ - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp
+
+- monkeys-audio `5.38` -> `5.48`
+ - [(#12158)](https://github.com/microsoft/vcpkg/pull/12158) [monkeys-audio] Update to 5.46
+ - [(#12690)](https://github.com/microsoft/vcpkg/pull/12690) [monkeys-audio] Update to 5.48
+
+- google-cloud-cpp `1.14.0` -> `1.16.0`
+ - [(#12195)](https://github.com/microsoft/vcpkg/pull/12195) [google-cloud-cpp] Update to v1.15.0
+ - [(#12747)](https://github.com/microsoft/vcpkg/pull/12747) [google-cloud-cpp] Update to v1.16.0
+
+- infoware `0.5.3` -> `0.5.5`
+ - [(#12167)](https://github.com/microsoft/vcpkg/pull/12167) [infoware] Bump version to 0.5.4
+ - [(#13010)](https://github.com/microsoft/vcpkg/pull/13010) [infoware] Bump version to 0.5.5
+
+- sqlite3 `3.32.1` -> `3.32.3`
+ - [(#12185)](https://github.com/microsoft/vcpkg/pull/12185) update to sqlite3 3.32.3
+ - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial::
+ - [(#11532)](https://github.com/microsoft/vcpkg/pull/11532) [sqlite3] Sqlite3 geopoly and json1 features
+
+- plibsys `0.0.4-3` -> `0.0.4`
+ - [(#12196)](https://github.com/microsoft/vcpkg/pull/12196) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers
+
+- span-lite `0.5.0` -> `0.7.0`
+ - [(#12206)](https://github.com/microsoft/vcpkg/pull/12206) [span-lite] Update to 0.7.0
+
+- safeint `3.23` -> `3.24`
+ - [(#12217)](https://github.com/microsoft/vcpkg/pull/12217) [safeint] Update to 3.24
+
+- xerces-c `3.2.3` -> `3.2.3-1`
+ - [(#12205)](https://github.com/microsoft/vcpkg/pull/12205) [xerces-c] rename feature from xmlch_wchar to xmlch-wchar
+
+- libnice `0.1.15-3` -> `0.1.15-4`
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+
+- opencc `2020-04-26-4` -> `2020-04-26-6`
+ - [(#12018)](https://github.com/microsoft/vcpkg/pull/12018) [vcpkg_from_sourceforge] Add retry mirror function (2/2)
+ - [(#12246)](https://github.com/microsoft/vcpkg/pull/12246) [opencc] Fix regression on pipeline
+
+- exiv2 `0.27.2-1` -> `0.27.3`
+ - [(#12278)](https://github.com/microsoft/vcpkg/pull/12278) [Exiv2] update to 0.27.3
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- nanodbc `2.12.4-8` -> `2.12.4`
+ - [(#12274)](https://github.com/microsoft/vcpkg/pull/12274) [nanodbc] Set unixodbc as a dependency under non-Windows
+
+- doctest `2.3.7` -> `2.4.0`
+ - [(#12239)](https://github.com/microsoft/vcpkg/pull/12239) [doctest] update to 2.4.0
+
+- opengl `0.0-6` -> `0.0-7`
+ - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths.
+
+- wincrypt `0.0-1` -> `0.0-2`
+ - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths.
+
+- winsock2 `0.0-1` -> `0.0-2`
+ - [(#12232)](https://github.com/microsoft/vcpkg/pull/12232) [opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths.
+
+- openvr `1.10.30` -> `1.12.5`
+ - [(#12219)](https://github.com/microsoft/vcpkg/pull/12219) [openvr] Update to 1.12.5
+
+- utf8h `841cb2deb8eb806e73fff0e1f43a11fca4f5da45` -> `2020-06-14`
+ - [(#12218)](https://github.com/microsoft/vcpkg/pull/12218) [utf8h] Update to latest version
+
+- libyuv `fec9121-1` -> `fec9121-2`
+ - [(#12213)](https://github.com/microsoft/vcpkg/pull/12213) [libyuv] Find dependency port libjpeg-turbo
+ - [(#12338)](https://github.com/microsoft/vcpkg/pull/12338) [libyuv] Fix static build issue
+
+- polyhook2 `2020-06-02` -> `2020-08-04`
+ - [(#12189)](https://github.com/microsoft/vcpkg/pull/12189) [polyhook2] Update to latest
+ - [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit
+
+- ace `6.5.9-5` -> `6.5.11`
+ - [(#12183)](https://github.com/microsoft/vcpkg/pull/12183) [ace] 6.5.10
+ - [(#12954)](https://github.com/microsoft/vcpkg/pull/12954) [ace] Update to 6.5.11
+
+- curl `7.68.0-3` -> `7.71.1`
+ - [(#12141)](https://github.com/microsoft/vcpkg/pull/12141) [curl] Update to 7.71.0
+ - [(#12758)](https://github.com/microsoft/vcpkg/pull/12758) [curl] Fix tools
+ - [(#12800)](https://github.com/microsoft/vcpkg/pull/12800) [curl] Fix static build
+
+- robin-hood-hashing `3.4.0` -> `3.8.0`
+ - [(#12147)](https://github.com/microsoft/vcpkg/pull/12147) [robin-hood-hashing] Update to 3.7.0
+ - [(#12480)](https://github.com/microsoft/vcpkg/pull/12480) [robin-hood-hashing] Update to latest version
+
+- libexif `0.6.21-2` -> `0.6.22`
+ - [(#12161)](https://github.com/microsoft/vcpkg/pull/12161) [libexif] Update to 0.6.22
+
+- cli `1.1.1` -> `1.2.0`
+ - [(#12139)](https://github.com/microsoft/vcpkg/pull/12139) [cli] update the version to 1.2.0
+
+- libffi `3.3-2` -> `3.3-3`
+ - [(#12126)](https://github.com/microsoft/vcpkg/pull/12126) [libffi] Add pkgconfig file
+ - [(#12498)](https://github.com/microsoft/vcpkg/pull/12498) [libffi] fix crash in debug
+
+- angle `2020-05-15` -> `2020-05-15-1`
+ - [(#12111)](https://github.com/microsoft/vcpkg/pull/12111) [angle] Add egl renderer to list of files compiled for linux
+
+- caf `0.17.2` -> `0.17.3`
+ - [(#12068)](https://github.com/microsoft/vcpkg/pull/12068) [caf] Update to 0.17.3
+
+- aws-sdk-cpp `1.7.333` -> `1.8.4`
+ - [(#12316)](https://github.com/microsoft/vcpkg/pull/12316) aws-sdk-cpp version update
+
+- libcopp `1.2.1` -> `1.3.1`
+ - [(#12264)](https://github.com/microsoft/vcpkg/pull/12264) [libcoppp] Update version to 1.3.0
+
+- openimageio `2.1.9.0` -> `2.1.16.0-1`
+ - [(#11767)](https://github.com/microsoft/vcpkg/pull/11767) [openimageio] Update to version 2.1.16.0
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+ - [(#12592)](https://github.com/microsoft/vcpkg/pull/12592) [openimageio] Fix installed cmake file path
+ - [(#12856)](https://github.com/microsoft/vcpkg/pull/12856) [vcpkg baseline] Fix openimageio and pangolin build failures on Linux
+
+- evpp `0.7.0-2` -> `0.7.0-3`
+ - [(#11967)](https://github.com/microsoft/vcpkg/pull/11967) [evpp] Fix build error on OSX
+ - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12
+
+- protobuf `3.12.0-2` -> `3.13.0`
+ - [(#11851)](https://github.com/microsoft/vcpkg/pull/11851) [protobuf] Update to 3.12.3
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes
+ - [(#12776)](https://github.com/microsoft/vcpkg/pull/12776) [vcpkg_copy_tool_dependencies] Use vcpkg internal powershell
+ - [(#12918)](https://github.com/microsoft/vcpkg/pull/12918) [protobuf] protobuf v3.13.0
+
+- fontconfig `2.12.4-10` -> `2.12.4`
+ - [(#12322)](https://github.com/microsoft/vcpkg/pull/12322) [fontconfig] Fix fonts.conf install path
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- faad2 `2.9.1-1` -> `2.9.1`
+ - [(#12306)](https://github.com/microsoft/vcpkg/pull/12306) [Many ports] Fix invalid character in feature name
+
+- freetype `2.10.1-6` -> `2.10.2`
+ - [(#11846)](https://github.com/microsoft/vcpkg/pull/11846) [freetype] Update to 2.10.2
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+ - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw
+
+- cgal `5.0.2-1` -> `5.0.3`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12711)](https://github.com/microsoft/vcpkg/pull/12711) [cgal] Update cgal to 5.0.3
+
+- cutelyst2 `2.9.0` -> `2.9.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- kd-soap `1.8.0-1` -> `1.8.0-2`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- kf5archive `5.64.0` -> `5.64.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#11861)](https://github.com/microsoft/vcpkg/pull/11861) Adding libraries needed to build Krita
+
+- kf5holidays `5.64.0` -> `5.64.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- kf5plotting `5.64.0` -> `5.64.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- kf5syntaxhighlighting `5.64.0` -> `5.64.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- libqglviewer `2.7.2-2` -> `2.7.2-3`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- opencv2 `2.4.13.7-1` -> `2.4.13.7-2`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+
+- opencv3 `3.4.7-3` -> `3.4.7-4`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+
+- opencv4 `4.1.1-6` -> `4.3.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+
+- osg-qt `Qt4-1` -> `Qt4-2`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qca `2.2.1` -> `2.2.1-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qcustomplot `2.0.1-3` -> `2.0.1-4`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qscintilla `2.11.4-1` -> `2.11.4-2`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt-advanced-docking-system `3.2.5-1` -> `3.2.5-2`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-3d `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-activeqt `5.12.8-1` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-androidextras `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-canvas3d `5.12.8` -> `0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-charts `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-connectivity `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+
+- qt5-datavis3d `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-declarative `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-doc `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-gamepad `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-graphicaleffects `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-imageformats `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+
+- qt5-location `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+
+- qt5-macextras `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-mqtt `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-multimedia `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-networkauth `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-purchasing `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-quickcontrols `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-quickcontrols2 `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-remoteobjects `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-script `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-scxml `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-sensors `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-serialbus `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-serialport `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-speech `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-svg `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-tools `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-translations `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-virtualkeyboard `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-wayland `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-webchannel `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-webengine `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12494)](https://github.com/microsoft/vcpkg/pull/12494) [qt-webengine] Fix building with vs2017
+
+- qt5-webglplugin `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-websockets `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-webview `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-winextras `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-x11extras `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5-xmlpatterns `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- qt5 `5.12.8` -> `5.15.0`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+ - [(#12471)](https://github.com/microsoft/vcpkg/pull/12471) [vcpkg format-manifest] Add convert-control flag
+ - [(#12864)](https://github.com/microsoft/vcpkg/pull/12864) [vcpkg_execute_build_process] Re-fix qt5 components build
+
+- qtkeychain `v0.9.1` -> `v0.9.1-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- soqt `1.6.0` -> `1.6.0-1`
+ - [(#11596)](https://github.com/microsoft/vcpkg/pull/11596) [qt5] update qt to 5.15 and make ports depend on qt5-base[core].
+
+- range-v3 `0.10.0-20200425` -> `0.10.0-20200708`
+ - [(#12346)](https://github.com/microsoft/vcpkg/pull/12346) [range-v3] updates range-v3
+
+- azure-storage-cpp `7.4.0` -> `7.5.0`
+ - [(#12333)](https://github.com/microsoft/vcpkg/pull/12333) [azure-storage-cpp] Upgrade to 7.5.0
+
+- directxmesh `jun2020` -> `jul2020`
+ - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+ - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+
+- directxtk `jun2020` -> `jul2020`
+ - [(#12332)](https://github.com/microsoft/vcpkg/pull/12332) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+ - [(#13060)](https://github.com/microsoft/vcpkg/pull/13060) [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
+
+- cuda `10.1-1` -> `10.1`
+ - [(#12244)](https://github.com/microsoft/vcpkg/pull/12244) [cuda] correct env variables for newer cuda versions
+
+- pybind11 `2.4.3` -> `2.5.0`
+ - [(#12394)](https://github.com/microsoft/vcpkg/pull/12394) [pybind11] Update to v2.5.0
+
+- corrade `2019.10-1` -> `2020.06`
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
+
+- magnum-extras `2019.10` -> `2020.06`
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
+
+- magnum-integration `2019.10` -> `2020.06`
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
+
+- magnum-plugins `2019.10-2` -> `2020.06`
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
+ - [(#12458)](https://github.com/microsoft/vcpkg/pull/12458) [magnum-plugins] Fix file conflict with stb
+
+- magnum `2019.10-2` -> `2020.06`
+ - [(#12211)](https://github.com/microsoft/vcpkg/pull/12211) [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06
+
+- zstd `1.4.4-1` -> `1.4.4`
+ - [(#12407)](https://github.com/microsoft/vcpkg/pull/12407) [zstd] fix pkg-config files
+
+- string-theory `3.2` -> `3.3`
+ - [(#12440)](https://github.com/microsoft/vcpkg/pull/12440) [string-theory] Update to 3.3
+
+- nrf-ble-driver `4.1.1-2` -> `4.1.2`
+ - [(#12436)](https://github.com/microsoft/vcpkg/pull/12436) [nrf-ble-driver] Update to v4.1.2
+
+- folly `2019.10.21.00-2` -> `2019.10.21.00`
+ - [(#12419)](https://github.com/microsoft/vcpkg/pull/12419) [folly] Fix build error C3861
+
+- boost-modular-build-helper `1.73.0-1` -> `1.73.0`
+ - [(#12417)](https://github.com/microsoft/vcpkg/pull/12417) [boost-modular-build-helper] Remove has_icu.lib
+ - [(#12535)](https://github.com/microsoft/vcpkg/pull/12535) [boost] s390x support
+ - [(#12634)](https://github.com/microsoft/vcpkg/pull/12634) [vcpkg] Improving android support
+ - [(#9224)](https://github.com/microsoft/vcpkg/pull/9224) [boost-modular-build-helper] Fix issue that link incorrect dependent libraries
+ - [(#12851)](https://github.com/microsoft/vcpkg/pull/12851) [boost-uninstall] Add port to easily uninstall all boost components
+
+- liblzma `5.2.4-5` -> `5.2.5`
+ - [(#12401)](https://github.com/microsoft/vcpkg/pull/12401) [liblzma, libvpx] Add mingw support
+ - [(#7226)](https://github.com/microsoft/vcpkg/pull/7226) [liblzma] Patch headers to fix https://github.com/OpenTTD/OpenTTD/pull/7614
+
+- pugixml `1.10-1` -> `1.10`
+ - [(#12441)](https://github.com/microsoft/vcpkg/pull/12441) [pugixml] Fix pkgconfig file
+
+- hiredis `2019-11-2-1` -> `2019-11-2`
+ - [(#12354)](https://github.com/microsoft/vcpkg/pull/12354) [hiredis] Fix feature ssl build error on windows
+
+- eigen3 `3.3.7-5` -> `3.3.7`
+ - [(#12279)](https://github.com/microsoft/vcpkg/pull/12279) [eigen3] Fix eigen3 and cuda compatibility issue
+
+- zlib `1.2.11-6` -> `1.2.11`
+ - [(#12133)](https://github.com/microsoft/vcpkg/pull/12133) [zlib] Add pkgconfig file
+ - [(#12753)](https://github.com/microsoft/vcpkg/pull/12753) [zlib, libpng] Fix pkg-config for mingw
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- libmupdf `1.16.1-1` -> `1.17.0`
+ - [(#12483)](https://github.com/microsoft/vcpkg/pull/12483) [libmupdf] Update libmupdf to 1.17.0
+
+- bzip2 `1.0.6-5` -> `1.0.6-6`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12880)](https://github.com/microsoft/vcpkg/pull/12880) [bzip2] fixes for building release-only
+
+- gmp `6.2.0-1` -> `6.2.0-2`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12664)](https://github.com/microsoft/vcpkg/pull/12664) [mpir, gmp] Add message to handle the conflicts between these two ports
+
+- libpng `1.6.37-9` -> `1.6.37-10`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12753)](https://github.com/microsoft/vcpkg/pull/12753) [zlib, libpng] Fix pkg-config for mingw
+
+- nettle `3.5.1-1` -> `3.5.1-2`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+
+- ompl `1.4.2-4` -> `1.5.0`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+ - [(#12529)](https://github.com/microsoft/vcpkg/pull/12529) [qt5 components] Disable parallel build
+ - [(#11737)](https://github.com/microsoft/vcpkg/pull/11737) [ompl]: upgrade to 1.5.0
+
+- sdl1 `1.2.15-11` -> `1.2.15`
+ - [(#11550)](https://github.com/microsoft/vcpkg/pull/11550) [vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries
+
+- alembic `1.7.12-1` -> `1.7.13`
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+ - [(#12735)](https://github.com/microsoft/vcpkg/pull/12735) [alembic] Update to 1.7.13
+
+- opencv `4.1.1-1` -> `4.3.0`
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+
+- openexr `2.3.0-5` -> `2.5.0`
+ - [(#11130)](https://github.com/microsoft/vcpkg/pull/11130) [opencv4] update to v4.3
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- libftdi1 `1.4` -> `1.4-1`
+ - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux
+
+- libusb `1.0.23` -> `1.0.23-1`
+ - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux
+ - [(#12656)](https://github.com/microsoft/vcpkg/pull/12656) [libusb] build fails on windows due to symlink in extracted archive
+ - [(#13057)](https://github.com/microsoft/vcpkg/pull/13057) [libusb] Add vcpkg-cmake-wrapper
+
+- treehopper `1.11.3-3` -> `1.11.3-4`
+ - [(#9561)](https://github.com/microsoft/vcpkg/pull/9561) [libusb] Fix issue to support linux
+
+- outcome `2.1` -> `2.1.3`
+ - [(#12078)](https://github.com/microsoft/vcpkg/pull/12078) [outcome] Update library and fix portfile
+
+- librdkafka `1.2.0-2` -> `1.5.0`
+ - [(#12095)](https://github.com/microsoft/vcpkg/pull/12095) [librdkafka] Upgrade to 1.4.4
+ - [(#12731)](https://github.com/microsoft/vcpkg/pull/12731) [librdkafka] Update to 1.5.0
+
+- glew `2.1.0-7` -> `2.1.0-8`
+ - [(#12103)](https://github.com/microsoft/vcpkg/pull/12103) Mingw port fixes
+
+- mozjpeg `2020-06-02` -> `2020-06-02-1`
+ - [(#12118)](https://github.com/microsoft/vcpkg/pull/12118) [mozjpeg] fix build
+
+- fltk `1.3.5-2` -> `1.3.5`
+ - [(#12273)](https://github.com/microsoft/vcpkg/pull/12273) [fltk] Force static library due to global variables. Fix CMake Targets.
+
+- nana `1.7.2-3` -> `1.7.2`
+ - [(#12543)](https://github.com/microsoft/vcpkg/pull/12543) [nana] Fix the version and language standard
+
+- winpcap `4.1.3-3` -> `4.1.3`
+ - [(#12542)](https://github.com/microsoft/vcpkg/pull/12542) [winpcap] Remove the keyword 'inline' macro
+
+- boost-build `1.73.0-1` -> `1.73.0`
+ - [(#12535)](https://github.com/microsoft/vcpkg/pull/12535) [boost] s390x support
+ - [(#12851)](https://github.com/microsoft/vcpkg/pull/12851) [boost-uninstall] Add port to easily uninstall all boost components
+
+- restinio `0.6.8` -> `0.6.9`
+ - [(#12087)](https://github.com/microsoft/vcpkg/pull/12087) [RESTinio] Update to v.0.6.8.1
+ - [(#12889)](https://github.com/microsoft/vcpkg/pull/12889) [restinio] update to 0.6.9
+ - [(#13018)](https://github.com/microsoft/vcpkg/pull/13018) [restinio] update to v.0.6.10
+
+- fizz `2020.02.03.00` -> `2020.02.03.00`
+ - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12
+
+- libevent `2.1.11-5` -> `2.1.12`
+ - [(#12277)](https://github.com/microsoft/vcpkg/pull/12277) [libevent] update to 2.1.12
+
+- libflac `1.3.3-1` -> `1.3.3`
+ - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature
+ - [(#12761)](https://github.com/microsoft/vcpkg/pull/12761) [flac] Disable stack smash protection and FORTIFY_SOURCE for mingw
+
+- libsndfile `1.0.29-9` -> `1.0.29`
+ - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature
+ - [(#12921)](https://github.com/microsoft/vcpkg/pull/12921) [libsndfile] Update to 1.0.29
+
+- sdl2-mixer `2.0.4-9` -> `2.0.4`
+ - [(#12374)](https://github.com/microsoft/vcpkg/pull/12374) [sdl2-mixer] Fix FLAC symbol export when static linking, add nativemidi default feature
+
+- physx `4.1.1-3` -> `4.1.1`
+ - [(#12413)](https://github.com/microsoft/vcpkg/pull/12413) [physx] Add patch for NVIDIAGameWorks/PhysX#322.
+ - [(#12710)](https://github.com/microsoft/vcpkg/pull/12710) [physx] Add support for checked and profile builds.
+
+- wxwidgets `3.1.3-1` -> `3.1.4`
+ - [(#12485)](https://github.com/microsoft/vcpkg/pull/12485) [wxwidgets] Adding wxWidgets resource compiler (wxrc) to /tools/wxwidgets directory
+ - [(#12733)](https://github.com/microsoft/vcpkg/pull/12733) [wxwidgets] Update to 3.1.4
+ - [(#12885)](https://github.com/microsoft/vcpkg/pull/12885) [wxwidgets] copy pdbs
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- osgearth `2.10.2-1` -> `3.0`
+ - [(#12531)](https://github.com/microsoft/vcpkg/pull/12531) [osgearth] update to 3.0
+
+- netcdf-c `4.7.3-1` -> `4.7.3`
+ - [(#12342)](https://github.com/microsoft/vcpkg/pull/12342) [qt5-base] Add zstd as a dependency
+ - [(#12755)](https://github.com/microsoft/vcpkg/pull/12755) [netcdf-c] also depend on embree on osx
+ - [(#12434)](https://github.com/microsoft/vcpkg/pull/12434) [netcdf-c] Fix dependency libmath
+
+- arrow `0.17.1` -> `1.0.0`
+ - [(#12537)](https://github.com/microsoft/vcpkg/pull/12537) [Arrow] Update to 1.0.0
+
+- libigl `2.1.0-2` -> `2.2.0`
+ - [(#10252)](https://github.com/microsoft/vcpkg/pull/10252) [libigl] Fix configure error and dependencies
+ - [(#12691)](https://github.com/microsoft/vcpkg/pull/12691) [libigl] fix imgui feature
+
+- asiosdk `2.3.3` -> `2.3.3-1`
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- jxrlib `2019.10.9` -> `2019.10.9-1`
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- libmodman `2.0.1-1` -> `2.0.1-2`
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- libproxy `0.4.15-1` -> `0.4.15-2`
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- stb `2020-02-08` -> `2020-02-08-1`
+ - [(#12157)](https://github.com/microsoft/vcpkg/pull/12157) [many ports] Remove _find_package guards that break *_FOUND
+
+- itk `5.0.1-2` -> `5.1.0`
+ - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- opencl `2.2-2-1` -> `2.2`
+ - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1
+
+- openjpeg `2.3.1-1` -> `2.3.1`
+ - [(#11208)](https://github.com/microsoft/vcpkg/pull/11208) [ITK] Update to 5.1
+
+- pbc `0.5.14-2` -> `0.5.14`
+ - [(#12732)](https://github.com/microsoft/vcpkg/pull/12732) [vcpkg baseline] Fix pbc build failure with x64-osx
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- libodb-sqlite `2.4.0-6` -> `2.4.0`
+ - [(#12516)](https://github.com/microsoft/vcpkg/pull/12516) [sqlite3] Namespaced targets with unofficial::
+
+- gtkmm `3.22.2-2` -> `3.22.2`
+ - [(#12637)](https://github.com/microsoft/vcpkg/pull/12637) [gtkmm] fix missing symbol exports with gtkmm release build
+
+- wavpack `5.2.0` -> `5.2.0`
+ - [(#12742)](https://github.com/microsoft/vcpkg/pull/12742) [wavpack] Fix failure on linux and osx
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- shapelib `1.4.1-2` -> `1.5.0`
+ - [(#12737)](https://github.com/microsoft/vcpkg/pull/12737) [shapelib] Update to 1.5.0
+
+- teemo `1.3` -> `2.1`
+ - [(#12728)](https://github.com/microsoft/vcpkg/pull/12728) [teemo] Update to v2.1
+
+- quill `1.3.1` -> `1.4.0`
+ - [(#12683)](https://github.com/microsoft/vcpkg/pull/12683) [quill] Update to version 1.3.3
+ - [(#12924)](https://github.com/microsoft/vcpkg/pull/12924) [quill] Update to 1.4.0
+
+- libmariadb `3.1.7-1` -> `3.1.7`
+ - [(#12669)](https://github.com/microsoft/vcpkg/pull/12669) [libmariadb] Include bundled zlib and openssl
+
+- brotli `1.0.7-1` -> `1.0.7`
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- cairomm `1.15.3-4` -> `1.15.3`
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- freetype-gl `2019-03-29-3` -> `2019-03-29`
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- libraqm `0.7.0-1` -> `0.7.0`
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+
+- sfml `2.5.1-7` -> `2.5.1`
+ - [(#12405)](https://github.com/microsoft/vcpkg/pull/12405) [brotli] add pkgconfig / [freetype] depend on brotli
+ - [(#11800)](https://github.com/microsoft/vcpkg/pull/11800) [sfml][imgui-sfml] Push SFML_STATIC_LIBRARIES setting into `sfml`
+
+- fmt `6.2.1` -> `7.0.3`
+ - [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0
+ - [(#12806)](https://github.com/microsoft/vcpkg/pull/12806) [fmt] Update to 7.0.3
+
+- spdlog `1.6.1` -> `1.7.0`
+ - [(#12312)](https://github.com/microsoft/vcpkg/pull/12312) [fmt] Update to 7.0.2 + [spdlog] Update to 1.7.0
+
+- armadillo `2019-04-16-8` -> `2019-04-16`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+
+- blaze `3.7` -> `3.8`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+ - [(#12916)](https://github.com/microsoft/vcpkg/pull/12916) [blaze] Update to Blaze 3.8
+
+- ceres `1.14.0-7` -> `1.14.0`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+
+- clapack `3.2.1-13` -> `3.2.1`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+ - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port
+
+- dlib `19.19-1` -> `19.21`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+ - [(#13061)](https://github.com/microsoft/vcpkg/pull/13061) [dlib] Update to v19.21
+
+- geogram `1.6.9-7` -> `1.7.5`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+ - [(#12562)](https://github.com/microsoft/vcpkg/pull/12562) [geogram] update to 1.7.5
+ - [(#12626)](https://github.com/microsoft/vcpkg/pull/12626) [vcpkg_find_acquire_program] Enable find_acquire(PKGCONFIG)
+
+- mlpack `3.2.2-3` -> `3.2.2`
+ - [(#12464)](https://github.com/microsoft/vcpkg/pull/12464) [lapack] add metaport lapack to switch lapack impl with an overlay
+ - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port
+
+- pangolin `0.5-7` -> `0.5`
+ - [(#12515)](https://github.com/microsoft/vcpkg/pull/12515) [pangolin] Fix build failure on UNIX
+ - [(#12856)](https://github.com/microsoft/vcpkg/pull/12856) [vcpkg baseline] Fix openimageio and pangolin build failures on Linux
+
+- orocos-kdl `1.4-2` -> `1.4`
+ - [(#12794)](https://github.com/microsoft/vcpkg/pull/12794) [ocoros-kdl] Fix the CMake config file
+
+- log4cpp `2.9.1-2` -> `2.9.1`
+ - [(#12792)](https://github.com/microsoft/vcpkg/pull/12792) [log4cpp] Fix header file install path
+
+- bond `9.0.0` -> `9.0.2`
+ - [(#12782)](https://github.com/microsoft/vcpkg/pull/12782) [bond] Update to v9.0.2
+
+- libtorrent `1.2.7` -> `1.2.9`
+ - [(#12768)](https://github.com/microsoft/vcpkg/pull/12768) [libtorrent] Update to 1.2.8
+ - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp
+ - [(#12946)](https://github.com/microsoft/vcpkg/pull/12946) [libtorrent] minor version bump and python patch adjustment
+
+- boost-context `1.73.0-1` -> `1.73.0`
+ - [(#12762)](https://github.com/microsoft/vcpkg/pull/12762) [boost] Add Supports fields and more accurately handle arm64-windows/x64-uwp
+
+- secp256k1 `2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2` -> `2017-19-10`
+ - [(#12630)](https://github.com/microsoft/vcpkg/pull/12630) [secp256k1] Fix build failures and export cmake targets
+
+- xbyak `5.911` -> `5.93`
+ - [(#12577)](https://github.com/microsoft/vcpkg/pull/12577) [Xbyak] Update to 5.93
+
+- tiff `4.0.10-9` -> `4.1.0`
+ - [(#12559)](https://github.com/microsoft/vcpkg/pull/12559) [tiff] Update 4.0.10 to 4.1.0
+
+- asmjit `2020-05-08` -> `2020-07-22`
+ - [(#12524)](https://github.com/microsoft/vcpkg/pull/12524) [asmjit] Update to the latest commit
+
+- libressl `2.9.1-2` -> `2.9.1`
+ - [(#11949)](https://github.com/microsoft/vcpkg/pull/11949) [libressl] add download mirror
+
+- darknet `2020-03-02` -> `2020-06-29`
+ - [(#11037)](https://github.com/microsoft/vcpkg/pull/11037) [darknet] ready for yolo_v4
+
+- embree3 `3.8.0` -> `3.11.0`
+ - [(#12555)](https://github.com/microsoft/vcpkg/pull/12555) [embree3] Update to 3.11.0
+
+- fribidi `1.0.9-1` -> `1.0.10`
+ - [(#12517)](https://github.com/microsoft/vcpkg/pull/12517) [fribidi] Update to 1.0.10
+
+- opencolorio `1.1.1-2` -> `1.1.1`
+ - [(#12420)](https://github.com/microsoft/vcpkg/pull/12420) [opencolorio-tools] Separate feature application to avoid circular dependency
+ - [(#12869)](https://github.com/microsoft/vcpkg/pull/12869) [opencolorio] Update repository
+
+- osg `3.6.4-3` -> `3.6.5`
+ - [(#12672)](https://github.com/microsoft/vcpkg/pull/12672) [osg] Update to 3.6.5
+
+- openblas `0.3.9-1` -> `0.3.9`
+ - [(#12805)](https://github.com/microsoft/vcpkg/pull/12805) [lapack-reference|fortran] Add new port
+ - [(#12956)](https://github.com/microsoft/vcpkg/pull/12956) [openblas] Fix generating pkg-config file
+
+- farmhash `1.1-1` -> `1.1`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- freexl `1.0.4-9` -> `1.0.4`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- libcrafter `0.3-1` -> `0.3`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- libmagic `5.37-1` -> `5.37`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- libwandio `4.2.1-2` -> `4.2.1`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- ocilib `4.6.4-1` -> `4.6.4`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- x264 `157-303c484ec828ed0-8` -> `157-303c484ec828ed0`
+ - [(#11836)](https://github.com/microsoft/vcpkg/pull/11836) [vcpkg/scripts/make] trying to iron out some issues
+
+- wpilib `2020.1.1` -> `2020.3.2`
+ - [(#12373)](https://github.com/microsoft/vcpkg/pull/12373) [wpilib] Update to 2020.3.2
+
+- proj4 `6.3.1-1` -> `6.3.1`
+ - [(#12875)](https://github.com/microsoft/vcpkg/pull/12875) [proj4] use sqlite3 config cmake, make sqlite3 private
+
+- tool-meson `0.54.2` -> `0.55.1`
+ - [(#12927)](https://github.com/microsoft/vcpkg/pull/12927) [meson] Update meson to 0.55.1
+
+- apr-util `1.6.1-1` -> `1.6.1`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- expat `2.2.7` -> `2.2.9`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- gdal `2.4.1-9` -> `2.4.1`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+ - [(#12541)](https://github.com/microsoft/vcpkg/pull/12541) [gdal] Fix static build issue
+
+- io2d `2019-07-11-2` -> `2019-07-11`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- libkml `1.3.0-4` -> `1.3.0`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- poco `1.9.2-2` -> `1.9.2`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- readosm `1.1.0-2` -> `1.1.0`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- skia `2020-05-18-1` -> `2020-05-18`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- spatialite-tools `4.3.0-2` -> `4.3.0`
+ - [(#9146)](https://github.com/microsoft/vcpkg/pull/9146) [expat] Update the version to 2.2.9 (add support for uwp)
+
+- xlnt `1.4.0-1` -> `1.5.0`
+ - [(#12972)](https://github.com/microsoft/vcpkg/pull/12972) [xlnt] Upgrade xlnt to 1.5.0
+
+- fdk-aac `2018-07-08-1` -> `2018-07-08-2`
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- opus `1.3.1-3` -> `1.3.1`
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+ - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw
+
+- sdl2 `2.0.12-1` -> `2.0.12`
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- speex `1.2.0-4` -> `1.2.0`
+ - [(#11277)](https://github.com/microsoft/vcpkg/pull/11277) [ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora.
+
+- pcl `1.9.1-13` -> `1.11.0`
+ - [(#10042)](https://github.com/microsoft/vcpkg/pull/10042) [pcl] Update to 1.10.0
+ - [(#13020)](https://github.com/microsoft/vcpkg/pull/13020) [pcl] check SSE flags
+
+- tinygltf `2.2.0` -> `2020-07-28`
+ - [(#12608)](https://github.com/microsoft/vcpkg/pull/12608) [tinygltf] update to v2.4.0
+
+- pmdk `1.8` -> `1.9`
+ - [(#12863)](https://github.com/microsoft/vcpkg/pull/12863) [pmdk] Update to 1.9
+
+- kangaru `4.2.2` -> `4.2.4`
+ - [(#12932)](https://github.com/microsoft/vcpkg/pull/12932) [kangaru] Update to v4.2.4
+
+- intel-mkl `2018.0.1` -> `2020.0.0`
+ - [(#12978)](https://github.com/microsoft/vcpkg/pull/12978) [intel-mkl] Update to 2020.0.0
+
+- fluidsynth `2.1.0` -> `2.1.4`
+ - [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version
+
+- redis-plus-plus `1.1.1` -> `1.1.2`
+ - [(#12974)](https://github.com/microsoft/vcpkg/pull/12974) [fluidsynth/redis-plus-plus] Update to the latest released version
+
+- openxr-loader `1.0.3.0` -> `1.0.11`
+ - [(#12060)](https://github.com/microsoft/vcpkg/pull/12060) [openxr-loader] Update to latest version, official repo
+
+- libmediainfo `20.03` -> `20.08`
+ - [(#12944)](https://github.com/microsoft/vcpkg/pull/12944) [libmediainfo] Update to 20.08
+
+- wt `4.2.2` -> `4.4.0`
+ - [(#13005)](https://github.com/microsoft/vcpkg/pull/13005) [wt] Update to 4.4.0
+
+- libjpeg-turbo `2.0.4` -> `2.0.5`
+ - [(#12973)](https://github.com/microsoft/vcpkg/pull/12973) [libjpeg-turbo] Update to 2.0.5
+
+- berkeleydb `4.8.30-4` -> `4.8.30`
+ - [(#12870)](https://github.com/microsoft/vcpkg/pull/12870) [berkeleydb] Fix build error with Visual Studio 16.7.0
+
+- libmodplug `0.8.9.0-5` -> `0.8.9.0`
+ - [(#12886)](https://github.com/microsoft/vcpkg/pull/12886) [many ports] Fix various problems with mingw
+
+- imgui-sfml `2.1-1` -> `2.1-2`
+ - [(#11800)](https://github.com/microsoft/vcpkg/pull/11800) [sfml][imgui-sfml] Push SFML_STATIC_LIBRARIES setting into `sfml`
+
+- re2 `2020-01-01` -> `2020-06-01`
+ - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1
+
+- upb `2019-10-21-2` -> `2020-08-19`
+ - [(#13084)](https://github.com/microsoft/vcpkg/pull/13084) [grpc][upb][re2] grpc v1.31.1
+
+- box2d `2019-12-31` -> `2.4.0`
+ - [(#13058)](https://github.com/microsoft/vcpkg/pull/13058) [Box2d] Update to 2.4.0
+
+- cpp-taskflow `2.2.0-1` -> `2.5.0`
+ - [(#12923)](https://github.com/microsoft/vcpkg/pull/12923) [cpp-taskflow] Update to 2.5.0
+
+- aubio `0.4.9-1` -> `0.4.9`
+ - [(#12921)](https://github.com/microsoft/vcpkg/pull/12921) [libsndfile] Update to 1.0.29
+
+- libfreenect2 `0.2.0-4` -> `0.2.0`
+ - [(#13057)](https://github.com/microsoft/vcpkg/pull/13057) [libusb] Add vcpkg-cmake-wrapper
+
+
+
+-- vcpkg team vcpkg@microsoft.com THU, 27 Aug 02:20:00 -0800
+
vcpkg (2020.04.20 - 2020.06.15)
---
#### Total port count: 1402
diff --git a/README.md b/README.md
index 1764b5a1137a9b..1189325290ddd2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
# Vcpkg: Overview
+
[中文总览](README_zh_CN.md)
Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.
@@ -17,7 +18,6 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
[](https://dev.azure.com/vcpkg/public/_build/latest?definitionId=29&branchName=master)
-
# Table of Contents
- [Vcpkg: Overview](#vcpkg-overview)
@@ -254,7 +254,7 @@ and go to the CMake settings (Build, Execution, Deployment > CMake).
Finally, in `CMake options`, add the following line:
```
--DCMAKE_TOOLCHAIN_FILE=C:/Users/nimazzuc/src/vcpkg/scripts/buildsystems/vcpkg.cmake
+-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
```
Unfortunately, you'll have to add this to each profile.
@@ -324,7 +324,7 @@ you may use a simple `vcpkg install --feature-flags=manifests`
For more information, check out the [manifest][getting-started:manifest-spec]
specification.
-[getting-started:using-a-package]: docs/examples/intalling-and-using-packages.md
+[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
[getting-started:integration]: docs/users/integration.md
[getting-started:git]: https://git-scm.com/downloads
[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
@@ -353,7 +353,6 @@ $ ./vcpkg integrate bash
depending on the shell you use, then restart your console.
-
# Examples
See the [documentation](docs/index.md) for specific walkthroughs,
diff --git a/README_zh_CN.md b/README_zh_CN.md
index 286976dc832dbe..33aae2ecf3a45e 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -1,6 +1,7 @@
-# Vcpkg 总览
+# Vcpkg: 总览
+
+[English Overview](README.md)
-## 概要
Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。
这个工具和生态链正在不断发展，我们一直期待您的贡献！
@@ -17,8 +18,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。
# 目录
-- [Vcpkg 总览](#vcpkg-总览)
- - [概要](#概要)
+- [Vcpkg: 总览](#vcpkg-总览)
- [目录](#目录)
- [入门](#入门)
- [快速开始: Windows](#快速开始-windows)
@@ -91,14 +91,14 @@ vcpkg团队和贡献者可以看到它的地方，
> .\vcpkg\vcpkg integrate install
```
-在此之后， 您可以创建一个非cmake项目 (或打开已有的项目)。
+在此之后，您可以创建一个非cmake项目 (或打开已有的项目)。
在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件并无需添加额外配置。
若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。
-为了在IDE以外在cmake中使用vcpkg， 您需要使用以下工具链文件:
+为了在IDE以外在cmake中使用vcpkg，您需要使用以下工具链文件:
-```
+```cmd
> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake
> cmake --build [build directory]
```
@@ -140,11 +140,11 @@ $ ./vcpkg/vcpkg install [packages to install]
$ ./vcpkg/vcpkg search [search term]
```
-为了在cmake中使用vcpkg， 您需要使用以下工具链文件:
+为了在cmake中使用vcpkg，您需要使用以下工具链文件:
-```
-> cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake
-> cmake --build [build directory]
+```sh
+$ cmake -B [build directory] -S . -DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake
+$ cmake --build [build directory]
```
在cmake中，您仍需通过 `find_package` 来使用第三方库。
@@ -158,7 +158,7 @@ $ ./vcpkg/vcpkg search [search term]
在Linux的不同发行版中，您需要安装不同的工具包:
-- Debian， Ubuntu， popOS， 或其他基于 Debian 的发行版:
+- Debian，Ubuntu，popOS或其他基于 Debian 的发行版:
```sh
$ sudo apt-get update
@@ -174,7 +174,7 @@ $ scl enable devtoolset-7 bash
```
对于其他的发行版，请确保已安装 g++ 6 或更新的版本。
-若您希望添加特定发行版的说明， [请提交一个 PR][contributing:submit-pr]!
+若您希望添加特定发行版的说明，[请提交一个 PR][contributing:submit-pr]!
## 安装 macOS Developer Tools
@@ -192,7 +192,7 @@ $ xcode-select --install
### 在 macOS 10.15 之前版本中安装 GCC
此条只在您的macOS版本低于 10.15 时是必须的。
-安装homebrew应当很轻松， 请查阅 以获取更多信息。
+安装homebrew应当很轻松，请查阅 以获取更多信息。
为了更简便，请使用以下命令:
```sh
@@ -209,7 +209,7 @@ $ brew install gcc
## 在 CMake 中使用 vcpkg
-若您希望在CMake中使用vcpkg， 以下内容可能帮助您：
+若您希望在CMake中使用vcpkg，以下内容可能帮助您：
### Visual Studio Code 中的 CMake Tools
@@ -234,15 +234,15 @@ $ brew install gcc
### CLion 中使用 vcpkg
打开 Toolchains 设置
-(File > Settings on Windows and Linux， CLion > Preferences on macOS)，
-并打开 CMake 设置 (Build， Execution， Deployment > CMake)。
+(File > Settings on Windows and Linux, CLion > Preferences on macOS)，
+并打开 CMake 设置 (Build, Execution, Deployment > CMake)。
最后在 `CMake options` 中添加以下行:
```
--DCMAKE_TOOLCHAIN_FILE=C:/Users/nimazzuc/src/vcpkg/scripts/buildsystems/vcpkg.cmake
+-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
```
-遗憾的是， 您必须手动将此选项加入每个项目配置文件中。
+遗憾的是，您必须手动将此选项加入每个项目配置文件中。
### 将 vcpkg 作为一个子模块
@@ -293,7 +293,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/
请查阅 [清单][getting-started:manifest-spec] 获取更多信息。
-[getting-started:using-a-package]: docs/examples/intalling-and-using-packages.md
+[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
[getting-started:integration]: docs/users/integration.md
[getting-started:git]: https://git-scm.com/downloads
[getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
@@ -315,7 +315,7 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/
或
-```
+```sh
$ ./vcpkg integrate bash
```
diff --git a/docs/examples/installing-and-using-packages.md b/docs/examples/installing-and-using-packages.md
index f98de78ab14917..011df93a4cc9f9 100644
--- a/docs/examples/installing-and-using-packages.md
+++ b/docs/examples/installing-and-using-packages.md
@@ -47,8 +47,8 @@ Total elapsed time: 12.04 s
The package sqlite3:x86-windows provides CMake targets:
- find_package(sqlite3 CONFIG REQUIRED)
- target_link_libraries(main PRIVATE sqlite3)
+ find_package(unofficial-sqlite3 CONFIG REQUIRED)
+ target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3))
```
@@ -118,11 +118,11 @@ Now let's make a simple CMake project with a main file.
cmake_minimum_required(VERSION 3.0)
project(test)
-find_package(sqlite3 CONFIG REQUIRED)
+find_package(unofficial-sqlite3 CONFIG REQUIRED)
add_executable(main main.cpp)
-target_link_libraries(main PRIVATE sqlite3)
+target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
```
```cpp
// main.cpp
diff --git a/docs/examples/overlay-triplets-linux-dynamic.md b/docs/examples/overlay-triplets-linux-dynamic.md
index 7d0540927d4c49..5d79013377afb1 100644
--- a/docs/examples/overlay-triplets-linux-dynamic.md
+++ b/docs/examples/overlay-triplets-linux-dynamic.md
@@ -55,8 +55,8 @@ Total elapsed time: 44.82 s
The package sqlite3:x64-linux-dynamic provides CMake targets:
- find_package(sqlite3 CONFIG REQUIRED)
- target_link_libraries(main PRIVATE sqlite3)
+ find_package(unofficial-sqlite3 CONFIG REQUIRED)
+ target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
```
Overlay triplets enables your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.
@@ -115,8 +115,8 @@ Total elapsed time: 44.82 s
The package sqlite3:x64-linux provides CMake targets:
- find_package(sqlite3 CONFIG REQUIRED)
- target_link_libraries(main PRIVATE sqlite3)
+ find_package(unofficial-sqlite3 CONFIG REQUIRED)
+ target_link_libraries(main PRIVATE unofficial::sqlite3::sqlite3)
```
Note that the default triplet is masked by your custom triplet:
diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md
index 0b653225802bfd..e0fde7e6885c63 100644
--- a/docs/maintainers/maintainer-guide.md
+++ b/docs/maintainers/maintainer-guide.md
@@ -208,6 +208,34 @@ Note that if a library generates CMake integration files (`foo-config.cmake`), r
Finally, DLL files on Windows should never be renamed post-build because it breaks the generated LIBs.
+## Code format
+
+### Vcpkg internal code
+
+We require the c/c++ code inside vcpkg to follow the clang-format, if you change them. Please perform the following steps after modification:
+
+- Use Visual Studio:
+1. Configure your [clang-format tools](https://devblogs.microsoft.com/cppblog/clangformat-support-in-visual-studio-2017-15-7-preview-1/).
+2. Open the modified file.
+3. Use shortcut keys Ctrl+K, Ctrl+D to format the current file.
+
+- Use tools:
+1. Install [llvm clang-format](https://releases.llvm.org/download.html#10.0.0)
+2. Run command:
+```cmd
+> LLVM_PATH/bin/clang-format.exe -style=file -i changed_file.cpp
+```
+
+### Manifest
+
+We require that the manifest file needs to be formatted, perform the following steps to solve this issue:
+
+1. Format all changed manifest files.
+```cmd
+> vcpkg x-format-manifest --all
+```
+2. Commit changes to your branch.
+
## Useful implementation notes
### Portfiles are run in Script Mode
diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md
index 406325dba08f84..eb20e97c861919 100644
--- a/docs/maintainers/vcpkg_check_linkage.md
+++ b/docs/maintainers/vcpkg_check_linkage.md
@@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail,
## Examples
-* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake)
+* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake)
## Source
-[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
+[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md
index d020dbb69a4da3..00324dc1cd2906 100644
--- a/docs/maintainers/vcpkg_configure_cmake.md
+++ b/docs/maintainers/vcpkg_configure_cmake.md
@@ -29,6 +29,8 @@ This should be specified unless the port is known to not work under Ninja.
Disables running the CMake configure step in parallel.
This is needed for libraries which write back into their source directory during configure.
+This also disables CMAKE_DISABLE_SOURCE_CHANGES.
+
### NO_CHARSET_FLAG
Disables passing `utf-8` as the default character set to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS`.
diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md
index a838bb974e6b84..ae83ccb92fe4af 100644
--- a/docs/maintainers/vcpkg_find_acquire_program.md
+++ b/docs/maintainers/vcpkg_find_acquire_program.md
@@ -16,6 +16,7 @@ The current list of programs includes:
- 7Z
- ARIA2 (Downloader)
- BISON
+- CLANG
- DARK
- DOXYGEN
- FLEX
diff --git a/docs/specifications/registries.md b/docs/specifications/registries.md
new file mode 100644
index 00000000000000..48b392a5c1d684
--- /dev/null
+++ b/docs/specifications/registries.md
@@ -0,0 +1,285 @@
+# Package Federation: Custom Registries
+
+As it is now, vcpkg has over 1400 ports in the default registry (the `/ports` directory).
+For the majority of users, this repository of packages is enough. However, many enterprises
+need to more closely control their dependencies for one reason or another, and this document
+lays out a method which we will build into vcpkg for exactly that reason.
+
+## Background
+
+A registry is simply a set of packages. In fact, there is already a registry in vcpkg: the default one.
+Package federation, implemented via custom registries, allows one to add new packages,
+edit existing packages, and have as much or as little control as one likes over the dependencies that one uses.
+It gives the control over dependencies that an enterprise requires.
+
+### How Does the Current Default Registry Work?
+
+Of course, the existing vcpkg tool does have packages in the official,
+default registry. The way we describe these packages is in the ports tree –
+at the base of the vcpkg install directory, there is a directory named ports,
+which contains on the order of 1300 directories, one for each package. Then,
+in each package directory, there are at least two files: a CONTROL or
+vcpkg.json file, which contains the name, version, description, and features
+of the package; and a portfile.cmake file which contains the information on
+how to download and build the package. There may be other files in this
+registry, like patches or usage instructions, but only those two files are
+needed.
+
+### Existing vcpkg Registry-like Features
+
+There are some existing features in vcpkg that act somewhat like a custom
+registry. The most obvious feature that we have is overlay ports – this
+feature allows you to specify any number of directories as "overlays", which
+either contain a package definition directly, or which contain some number of
+package directories; these overlays will be used instead of the ports tree
+for packages that exist in both places, and are specified exclusively on the
+command line. Additionally, unfortunately, if one installs a package from
+overlay ports that does not exist in the ports tree, one must pass these
+overlays to every vcpkg installation command.
+
+There is also the less obvious "feature" which works by virtue of the ports
+tree being user-editable: one can always edit the ports tree on their own
+machine, and can even fork vcpkg and publish their own ports tree.
+Unfortunately, this then means that any updates to the source tree require
+merges, as opposed to being able to fast-forward to the newest sources.
+
+### Why Registries?
+
+There are many reasons to want custom registries; however, the most important reasons are:
+
+* Legal requirements – a company like Microsoft or Google
+ needs the ability to strictly control the code that goes into their products,
+ making certain that they are following the licenses strictly.
+ * There have been examples in the past where a library which is licensed under certain terms contains code
+ which is not legally allowed to be licensed under those terms (see [this example][legal-example],
+ where a person tried to merge Microsoft-owned, Apache-licensed code into the GPL-licensed libstdc++).
+* Technical requirements – a company may wish to run their own tests on the packages they ship,
+ such as [fuzzing].
+* Other requirements – an organization may wish to strictly control its dependencies for a myriad of other reasons.
+* Newer versions – vcpkg may not necessarily always be up to date for all libraries in our registry,
+ and an organization may require a newer version than we ship;
+ they can very easily update this package and have the version that they want.
+* Port modifications – vcpkg has somewhat strict policies on port modifications,
+ and an organization may wish to make different modifications than we do.
+ It may allow that organization to make certain that the package works on triplets
+ that our team does not test as extensively.
+* Testing – just like port modifications, if a team wants to do specific testing on triplets they care about,
+ they can do so via their custom registry.
+
+Then, there is the question of why vcpkg needs a new solution for custom registries,
+beyond the existing overlay ports feature. There are two big reasons –
+the first is to allow a project to define the registries that they use for their dependencies,
+and the second is the clear advantage in the user experience of the vcpkg tool.
+If a project requires specific packages to come from specific registries,
+they can do so without worrying that a user accidentally misses the overlay ports part of a command.
+Additionally, beyond a feature which makes overlay ports easier to use,
+custom registries allow for more complex and useful infrastructure around registries.
+In the initial custom registry implementation, we will allow overlay ports style paths,
+as well as git repositories, which means that people can run and use custom registries
+without writing their own infrastructure around getting people that registry.
+
+It is the intention of vcpkg to be the most user-friendly package manager for C++,
+and this allows us to fulfill on that intention even further.
+As opposed to having to write `--overlay-ports=path/to/overlay` for every command one runs,
+or adding an environment variable `VCPKG_OVERLAY_PORTS`,
+one can simply write vcpkg install and the registries will be taken care of for you.
+As opposed to having to use git submodules, or custom registry code for every project,
+one can write and run the infrastructure in one place,
+and every project that uses that registry requires only a few lines of JSON.
+
+[legal-example]: https://gcc.gnu.org/legacy-ml/libstdc++/2019-09/msg00054.html
+[fuzzing]: https://en.wikipedia.org/wiki/Fuzzing
+
+## Specification
+
+We will be adding a new file that vcpkg understands - `vcpkg-configuration.json`.
+The way that vcpkg will find this file is different depending on what mode vcpkg is in:
+in classic mode, vcpkg finds this file alongside the vcpkg binary, in the root directory.
+In manifest mode, vcpkg finds this file alongside the manifest. For the initial implementation,
+this is all vcpkg will look for; however, in the future, vcpkg will walk the tree and include
+configuration all along the way: this allows for overriding defaults.
+The specific algorithm for applying this is not yet defined, since currently only one
+`vcpkg-configuration.json` is allowed.
+
+The only thing allowed in a `vcpkg-configuration.json` is a `` object.
+
+A `` is an object:
+* Optionally, `"default-registry"`: A `` or `null`
+* Optionally, `"registries"`: An array of ``s
+
+Since this is the first RFC that adds anything to this field,
+as of now the only properties that can live in that object will be
+these.
+
+A `` is an object matching one of the following:
+* ``:
+ * `"kind"`: The string `"builtin"`
+* ``:
+ * `"kind"`: The string `"directory"`
+ * `"path"`: A path
+* ``:
+ * `"kind"`: The string `"git"`
+ * `"repository"`: A URI
+ * Optionally, `"path"`: An absolute path into the git repository
+ * Optionally, `"ref"`: A git reference
+
+A `` is a `` object, plus the following properties:
+* Optionally, `"scopes"`: An array of ``s
+* Optionally, `"packages"`: An array of ``s
+
+The `"packages"` and `"scopes"` fields of distinct registries must be disjoint,
+and each `` must have at least one of the `"scopes"` and `"packages"` property,
+since otherwise there's no point.
+
+As an example, a package which uses a different default registry, and a different registry for boost,
+might look like the following:
+
+```json
+{
+ "default-registry": {
+ "kind": "directory",
+ "path": "vcpkg-ports"
+ },
+ "registries": [
+ {
+ "kind": "git",
+ "repository": "https://github.com/boostorg/vcpkg-ports",
+ "ref": "v1.73.0",
+ "scopes": [ "boost" ]
+ },
+ {
+ "kind": "builtin",
+ "packages": [ "cppitertools" ]
+ }
+ ]
+}
+```
+
+This will install `fmt` from `/vcpkg-ports`,
+`cppitertools` from the registry that ships with vcpkg,
+and any `boost` dependencies from `https://github.com/boostorg/vcpkg-ports`.
+Notably, this does not replace behavior up the tree -- only the `vcpkg-configuration.json`s
+for the current invocation do anything.
+
+### Behavior
+
+When a vcpkg command requires the installation of dependencies,
+it will generate the initial list of dependencies from the package,
+and then run the following algorithm on each dependency:
+
+1. Figure out which registry the package should come from by doing the following:
+ 1. If there is a registry in the registry set which contains the dependency name in the `"packages"` array,
+ then use that registry.
+ 2. For every scope, in order from most specific to least,
+ if there is a registry in the registry set which contains that scope in the `"scopes"` array,
+ then use that registry.
+ (For example, for `"cat.meow.cute"`, check first for `"cat.meow.cute"`, then `"cat.meow"`, then `"cat"`).
+ 3. If the default registry is not `null`, use that registry.
+ 4. Else, error.
+2. Then, add that package's dependencies to the list of packages to find, and repeat for the next dependency.
+
+vcpkg will also rerun this algorithm whenever an install is run with different configuration.
+
+### How Registries are Layed Out
+
+There are three kinds of registries, but they only differ in how the registry gets onto one's filesystem.
+Once the registry is there, package lookup runs the same, with each kind having it's own way of defining its
+own root.
+
+In order to find a port `meow` in a registry with root `R`, vcpkg first sees if `R/meow` exists;
+if it does, then the port root is `R/meow`. Otherwise, see if `R/m-` exists; if it does,
+then the port root is `R/m-/meow`. (note: this algorithm may be extended further in the future).
+
+For example, given the following port root:
+
+```
+R/
+ abseil/...
+ b-/
+ boost/...
+ boost-build/...
+ banana/...
+ banana/...
+```
+
+The port root for `abseil` is `R/abseil`; the port root for `boost` is `R/b-/boost`;
+the port root for `banana` is `R/banana` (although this duplication is not recommended).
+
+The reason we are making this change to allow more levels in the ports tree is that ~1300
+ports are hard to look through in a tree view, and this allows us to see only the ports we're
+interested in. Additionally, no port name may end in a `-`, so this means that these port subdirectories
+will never intersect with actual ports. Additionally, since we use only ASCII for port names,
+we don't have to worry about graphemes vs. code units vs. code points -- in ASCII, they are equivalent.
+
+Let's now look at how different registry kinds work:
+
+#### ``
+
+For a ``, there is no configuration required.
+The registry root is simply `/ports`.
+
+#### ``
+
+For a ``, it is again fairly simple.
+Given `$path` the value of the `"path"` property, the registry root is either:
+
+* If `$path` is absolute, then the registry root is `$path`.
+* If `$path` is drive-relative (only important on Windows), the registry root is
+ `(drive of vcpkg.json)/$path`
+* If `$path` is relative, the registry root is `(directory of vcpkg.json)/$path`
+
+Note that the path to vcpkg.json is _not_ canonicalized; it is used exactly as it is seen by vcpkg.
+
+#### ``
+
+This registry is the most complex. We would like to cache existing registries,
+but we don't want to ignore new updates to the registry.
+It is the opinion of the author that we want to find more updates than not,
+so we will update the registry whenever the `vcpkg.json` or `vcpkg-configuration.json`
+is modified. We will do so by keeping a sha512 of the `vcpkg.json` and `vcpkg-configuration.json`
+inside the `vcpkg-installed` directory.
+
+We will download the specific ref of the repository to a central location (and update as needed),
+and the root will be either: ``, if the `"path"` property is not defined,
+or else `/` if it is defined.
+The `"path"` property must be absolute, without a drive, and will be treated as relative to
+the path to the repository. For example:
+
+```json
+{
+ "kind": "git",
+ "repository": "https://github.com/microsoft/vcpkg",
+ "path": "/ports"
+}
+```
+
+is the correct way to refer to the registry built in to vcpkg, at the latest version.
+
+The following are all incorrect:
+
+```json
+{
+ "$reason": "path can't be drive-absolute",
+ "kind": "git",
+ "repository": "https://github.com/microsoft/vcpkg",
+ "path": "F:/ports"
+}
+```
+
+```json
+{
+ "$reason": "path can't be relative",
+ "kind": "git",
+ "repository": "https://github.com/microsoft/vcpkg",
+ "path": "ports"
+}
+```
+
+```json
+{
+ "$reason": "path _really_ can't be relative like that",
+ "kind": "git",
+ "repository": "https://github.com/microsoft/vcpkg",
+ "path": "../../meow/ports"
+}
+```
diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md
index ffa988cbc38346..22f7ff84a2d3e1 100644
--- a/docs/users/config-environment.md
+++ b/docs/users/config-environment.md
@@ -38,11 +38,19 @@ Example: `D:\2017`
This environment variable can be set to a triplet name which will be used for unqualified triplet references in command lines.
+#### VCPKG_OVERLAY_PORTS
+
+This environment variable allows users to override ports with alternate versions according to the
+[ports overlay](../specifications/ports-overlay.md) specification. List paths to overlays using
+the platform dependent PATH seperator (Windows `;` | others `:`)
+
+Example (Windows): `C:\custom-ports\boost;C:\custom-ports\sqlite3`
+
#### VCPKG_FORCE_SYSTEM_BINARIES
This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries.
-### VCPKG_KEEP_ENV_VARS
+#### VCPKG_KEEP_ENV_VARS
This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to
the build environment.
diff --git a/docs/users/integration.md b/docs/users/integration.md
index e9a9c42cda0ac0..e9d8940aa500c3 100644
--- a/docs/users/integration.md
+++ b/docs/users/integration.md
@@ -22,6 +22,7 @@ This will implicitly add Include Directories, Link Directories, and Link Librari
For the vast majority of libraries, this is all you need to do -- just File -> New Project and write code! However, some libraries perform conflicting behaviors such as redefining `main()`. Since you need to choose per-project which of these conflicting options you want, you will need to add those libraries to your linker inputs manually.
Here are some examples, though this is not an exhaustive list:
+
- Gtest provides `gtest`, `gmock`, `gtest_main`, and `gmock_main`
- SDL2 provides `SDL2main`
- SFML provides `sfml-main`
@@ -81,6 +82,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
#### Manual compiler settings
Libraries are installed into the `installed\` subfolder, partitioned by architecture (e.g. x86-windows):
+
* The header files are installed to `installed\x86-windows\include`
* Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link`
* Release `.dll` files are installed to `installed\x86-windows\bin`
@@ -112,6 +114,7 @@ Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/
### Triplet selection
Every integration mechanism besides manually adding the folders will deduce a [triplet][] for your project as one of:
+
- x86-windows
- x64-windows
- x86-uwp
diff --git a/docs/users/triplets.md b/docs/users/triplets.md
index 10ac31fd5736e4..b587a91e5288d3 100644
--- a/docs/users/triplets.md
+++ b/docs/users/triplets.md
@@ -78,6 +78,15 @@ This option also has forms for configuration-specific and C flags:
- `VCPKG_C_FLAGS_DEBUG`
- `VCPKG_C_FLAGS_RELEASE`
+### VCPKG_LINKER_FLAGS
+Sets additional linker flags to be used while building dynamic libraries and
+executables in the absence of `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`.
+
+This option also has forms for configuration-specific flags:
+- `VCPKG_LINKER_FLAGS`
+- `VCPKG_LINKER_FLAGS_DEBUG`
+- `VCPKG_LINKER_FLAGS_RELEASE`
+
### VCPKG_DEP_INFO_OVERRIDE_VARS
Replaces the default computed list of triplet "Supports" terms.
diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json
index f183916e6613ff..92c53d327f5a79 100644
--- a/ports/3fd/vcpkg.json
+++ b/ports/3fd/vcpkg.json
@@ -16,7 +16,7 @@
"name": "poco",
"platform": "windows"
},
- "sqlite3",
- "rapidxml"
+ "rapidxml",
+ "sqlite3"
]
}
diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
index 7e93a3bf0d0092..4ed90058413b0c 100644
--- a/ports/7zip/CMakeLists.txt
+++ b/ports/7zip/CMakeLists.txt
@@ -108,6 +108,7 @@ set(SRC_C
C/Lzma2Enc.c
C/LzmaDec.c
C/LzmaEnc.c
+ C/LzmaLib.c
C/MtCoder.c
C/MtDec.c
C/Ppmd7.c
@@ -311,6 +312,7 @@ add_library(7zip
${SRC_CRYPTO}
${SRC_C}
CPP/7zip/Archive/Archive2.def
+ C/Util/LzmaLib/LzmaLib.def
)
target_compile_definitions(7zip
@@ -334,6 +336,14 @@ target_include_directories(7zip
set(PUBLIC_HEADERS
C/7zTypes.h
+ C/Alloc.h
+ C/LzFind.h
+ C/LzFindMt.h
+ C/LzHash.h
+ C/LzmaDec.h
+ C/LzmaEnc.h
+ C/LzmaLib.h
+ C/Threads.h
CPP/7zip/Archive/IArchive.h
CPP/7zip/ICoder.h
CPP/7zip/IDecl.h
diff --git a/ports/7zip/CONTROL b/ports/7zip/CONTROL
index 42cb47b345bba6..73150ef444e68c 100644
--- a/ports/7zip/CONTROL
+++ b/ports/7zip/CONTROL
@@ -1,3 +1,4 @@
Source: 7zip
Version: 19.00
+Port-Version: 1
Description: Library for archiving file with a high compression ratio.
diff --git a/ports/abseil/fix-cmake-threads-dependency.patch b/ports/abseil/fix-cmake-threads-dependency.patch
new file mode 100644
index 00000000000000..0dda75e36ab3d4
--- /dev/null
+++ b/ports/abseil/fix-cmake-threads-dependency.patch
@@ -0,0 +1,13 @@
+diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in
+index 60847fa77..6d23f63d3 100644
+--- a/CMake/abslConfig.cmake.in
++++ b/CMake/abslConfig.cmake.in
+@@ -1,6 +1,7 @@
+ # absl CMake configuration file.
+
+-include(FindThreads)
++include(CMakeFindDependencyMacro)
++find_dependency(Threads)
+
+ @PACKAGE_INIT@
+
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 8fcf0bb7630b42..0b62c6c2e25407 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -7,9 +7,12 @@ set(ABSEIL_PATCHES
# This patch is an upstream commit, the related PR: https://github.com/abseil/abseil-cpp/pull/637
fix-MSVCbuildfail.patch
-
+
# Remove this patch in next update, see https://github.com/google/cctz/pull/145
fix-arm-build.patch
+
+ # This patch is an upstream commit: https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802
+ fix-cmake-threads-dependency.patch
)
if("cxx17" IN_LIST FEATURES)
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index cfc1022ea4f9cc..79e6c308b5d097 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -1,14 +1,14 @@
{
"name": "abseil",
"version-string": "2020-03-03",
- "port-version": 7,
- "homepage": "https://github.com/abseil/abseil-cpp",
+ "port-version": 8,
"description": [
"an open-source collection designed to augment the C++ standard library.",
"Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
"In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
"Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."
],
+ "homepage": "https://github.com/abseil/abseil-cpp",
"features": [
{
"name": "cxx17",
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 6190d4a1f412bc..eca959e3ec6c9b 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,5 +1,5 @@
Source: ace
-Version: 6.5.10
+Version: 6.5.11
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
Description: The ADAPTIVE Communication Environment
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index f06b2c468ff610..61212814763ede 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -1,7 +1,7 @@
# Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter"
# when invoking `prj_install.pl`.
# So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it.
-set(ACE_VERSION 6.5.10)
+set(ACE_VERSION 6.5.11)
string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION})
if("tao" IN_LIST FEATURES)
@@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip"
FILENAME ACE-TAO-${ACE_VERSION}.zip
- SHA512 1b6453bb692dde6a51090a1ea57677d9241a54ebb7edf32838dbf413f7515b83ae77f407998609f6dcd7cc37b2d4973f2b5cb1ad2f92f75caa686efd08c3a0b5
+ SHA512 82c4aa9718814f72f6ecc45da064d8d30f104d9b4785f357525c4c4a8ceb709e5885ddb1c4729df0cab9f69282c8f58cce3a23573a74e1dbdc677a6a54c1c894
)
else()
# VCPKG_TARGET_IS_LINUX
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz"
FILENAME ACE-TAO-${ACE_VERSION}.tar.gz
- SHA512 d0b8c6b398fba62dce75daa2f8759113c1235be3dc3d1c88ecce668d804a1acd6f40bc7e38eede3000c7f85e9da2123b84da1357375f5ee29b1a002cd9d6e0f8
+ SHA512 82d69ed23b049948b104677afb93fcaad4468335268b101e5b7d73aa15b380d120253415b42cadf6ba45bbf2ed3771d51f7b56c56eb93ff9e33a044f118f9191
)
endif()
else()
@@ -26,14 +26,14 @@ else()
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip"
FILENAME ACE-src-${ACE_VERSION}.zip
- SHA512 d17b4bf41ea6804594a8363d2b8776b5981d305df75b99cda5fe05dd021261a424e1038a522c8dc175f8ea2ee15e064676cbd615bd6c3c6339ef174a0e8a0914
+ SHA512 36f286240ac81c9de0c4a21a54e9e61a4efd0ae9e8381732dadfba496768b697dec9fb448e0d252293bfd686e114c644c7602ddbdbe74c5d73eb6423d00d0ae5
)
else(VCPKG_TARGET_IS_WINDOWS)
# VCPKG_TARGET_IS_LINUX
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz"
FILENAME ACE-src-${ACE_VERSION}.tar.gz
- SHA512 a92edae9e120f2220272f138907fc25e53753d3b21a446460e8682d0cae6f5c6e5fa08d398630f6d1e189bc47ce8e69a52143635f459292522753549fd7ad9ab
+ SHA512 e47e1ef2e8d517aed3c647a1e7dd9ac8b54ed187f9d6adf1e535bb7c4da6e8e808d72850ae18f2e42842ea9487ef774f7af90d1fbede17e0858e2b5846650580
)
endif()
endif()
diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL
index a7acd59194766c..35f86f28ce02e9 100644
--- a/ports/akali/CONTROL
+++ b/ports/akali/CONTROL
@@ -1,4 +1,5 @@
Source: akali
Version: 1.41
+Port-Version: 1
Description: C++ Common Library.
-Homepage: https://github.com/winsoft666/akali
\ No newline at end of file
+Homepage: https://github.com/winsoft666/akali
diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL
index 54442f2e444166..e58acda672ab63 100644
--- a/ports/alembic/CONTROL
+++ b/ports/alembic/CONTROL
@@ -1,5 +1,7 @@
Source: alembic
-Version: 1.7.12-1
+Version: 1.7.13
+Port-Version: 1
Build-Depends: ilmbase, hdf5
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
Homepage: https://alembic.io/
+Supports: windows & !arm & !uwp & !static
diff --git a/ports/alembic/fix-C1083.patch b/ports/alembic/fix-C1083.patch
deleted file mode 100644
index 15de9f514f9f26..00000000000000
--- a/ports/alembic/fix-C1083.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/lib/Alembic/Abc/Foundation.h b/lib/Alembic/Abc/Foundation.h
-index 9760c49..fbab6a0 100644
---- a/lib/Alembic/Abc/Foundation.h
-+++ b/lib/Alembic/Abc/Foundation.h
-@@ -40,11 +40,11 @@
- #include
- #include
-
--#include
--#include
--#include
--#include
--#include
-+#include
-+#include
-+#include
-+#include
-+#include
-
- #include
- #include
-diff --git a/lib/Alembic/AbcGeom/Foundation.h b/lib/Alembic/AbcGeom/Foundation.h
-index 301efc3..2bb0f6b 100644
---- a/lib/Alembic/AbcGeom/Foundation.h
-+++ b/lib/Alembic/AbcGeom/Foundation.h
-@@ -39,8 +39,8 @@
-
- #include
-
--#include
--#include
-+#include
-+#include
-
-
- namespace Alembic {
-diff --git a/lib/Alembic/Util/Foundation.h b/lib/Alembic/Util/Foundation.h
-index d7f40dd..a41bb97 100644
---- a/lib/Alembic/Util/Foundation.h
-+++ b/lib/Alembic/Util/Foundation.h
-@@ -63,7 +63,7 @@
-
- #include
-
--#include
-+#include
-
- #include
- #include
diff --git a/ports/alembic/fix-find-openexr-ilmbase.patch b/ports/alembic/fix-find-openexr-ilmbase.patch
index 6a72711f425964..f35f17df35ec4f 100644
--- a/ports/alembic/fix-find-openexr-ilmbase.patch
+++ b/ports/alembic/fix-find-openexr-ilmbase.patch
@@ -2,7 +2,7 @@ diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
index cd00d70..0e50512 100644
--- a/cmake/AlembicIlmBase.cmake
+++ b/cmake/AlembicIlmBase.cmake
-@@ -33,11 +33,25 @@
+@@ -33,11 +33,17 @@
##
##-*****************************************************************************
@@ -16,17 +16,9 @@ index cd00d70..0e50512 100644
+ set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR)
+ set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY})
+ set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY})
-+ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OpenEXR_IEXMATH_LIBRARY})
++ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IMATH_LIBRARY})
+ set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY})
-+ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY})
-+
-+ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
-+ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-+ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
-+ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
-+ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
-+ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
-+
++ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY})
SET(ALEMBIC_ILMBASE_LIBS
${ALEMBIC_ILMBASE_IMATH_LIB}
${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
@@ -46,348 +38,13 @@ diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake
index 0833b32..a9180cd 100644
--- a/cmake/AlembicOpenEXR.cmake
+++ b/cmake/AlembicOpenEXR.cmake
-@@ -38,8 +38,12 @@
+@@ -38,8 +38,8 @@
FIND_PACKAGE( OpenEXR )
IF( OPENEXR_FOUND )
- SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} )
+ SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR )
SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} )
-+
-+ MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
-+ MESSAGE( STATUS "OPENEXR LIB: ${ALEMBIC_OPENEXR_LIBRARIES}" )
-+
# SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} )
SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" )
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-deleted file mode 100644
-index 679a02f..0000000
---- a/cmake/Modules/FindIlmBase.cmake
-+++ /dev/null
-@@ -1,190 +0,0 @@
--##-*****************************************************************************
--##
--## Copyright (c) 2009-2016,
--## Sony Pictures Imageworks Inc. and
--## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
--##
--## All rights reserved.
--##
--## Redistribution and use in source and binary forms, with or without
--## modification, are permitted provided that the following conditions are
--## met:
--## * Redistributions of source code must retain the above copyright
--## notice, this list of conditions and the following disclaimer.
--## * Redistributions in binary form must reproduce the above
--## copyright notice, this list of conditions and the following disclaimer
--## in the documentation and/or other materials provided with the
--## distribution.
--## * Neither the name of Industrial Light & Magic nor the names of
--## its contributors may be used to endorse or promote products derived
--## from this software without specific prior written permission.
--##
--## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--##
--##-*****************************************************************************
--
--#-******************************************************************************
--#-******************************************************************************
--# FIRST, ILMBASE STUFF
--#-******************************************************************************
--#-******************************************************************************
--
--# If ILMBASE_ROOT was defined in the environment, use it.
--IF(NOT ILMBASE_ROOT AND NOT $ENV{ILMBASE_ROOT} STREQUAL "")
-- SET(ILMBASE_ROOT $ENV{ILMBASE_ROOT})
--ENDIF()
--
--IF(NOT DEFINED ILMBASE_ROOT)
-- MESSAGE(STATUS "ILMBASE_ROOT is undefined" )
-- IF ( ${CMAKE_HOST_UNIX} )
-- IF( ${DARWIN} )
-- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-- ELSE()
-- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-- ENDIF()
-- ELSE()
-- IF ( ${WINDOWS} )
-- # TODO: set to 32-bit or 64-bit path
-- SET( ALEMBIC_ILMBASE_ROOT "C:/Program Files (x86)/ilmbase-1.0.1/" )
-- ELSE()
-- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-- ENDIF()
-- ENDIF()
--ELSE()
-- SET( ALEMBIC_ILMBASE_ROOT ${ILMBASE_ROOT} )
--ENDIF()
--
--SET(_ilmbase_FIND_COMPONENTS
-- Half
-- Iex
-- IexMath
-- IlmThread
-- Imath
--)
--
--SET(_ilmbase_SEARCH_DIRS
-- ${ALEMBIC_ILMBASE_ROOT}
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local
-- /usr
-- /sw
-- /opt/local
-- /opt/csw
-- /opt
-- /usr/freeware
--)
--
--FIND_PATH(ILMBASE_INCLUDE_DIR
-- NAMES
-- IlmBaseConfig.h
-- HINTS
-- ${_ilmbase_SEARCH_DIRS}
-- PATH_SUFFIXES
-- include
-- include/OpenEXR
--)
--
--# If the headers were found, get the version from config file, if not already set.
--IF(ILMBASE_INCLUDE_DIR)
-- SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})
-- IF(NOT ILMBASE_VERSION)
--
-- FIND_FILE(_ilmbase_CONFIG
-- NAMES
-- IlmBaseConfig.h
-- PATHS
-- "${ILMBASE_INCLUDE_DIR}"
-- "${ILMBASE_INCLUDE_DIR}/OpenEXR"
-- )
--
-- IF(_ilmbase_CONFIG)
-- FILE(STRINGS "${_ilmbase_CONFIG}" ILMBASE_BUILD_SPECIFICATION
-- REGEX "^[ \t]*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"[.0-9]+\".*$")
-- ELSE()
-- MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${ILMBASE_INCLUDE_DIR}\"")
-- ENDIF()
--
-- IF(ILMBASE_BUILD_SPECIFICATION)
-- STRING(REGEX REPLACE ".*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"([.0-9]+)\".*"
-- "\\2" _ilmbase_libs_ver_init ${ILMBASE_BUILD_SPECIFICATION})
-- ELSE()
-- MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_ilmbase_libs_ver_init}.")
-- ENDIF()
--
-- UNSET(_ilmbase_CONFIG CACHE)
--
-- ENDIF()
--
-- SET("ILMBASE_VERSION" ${_ilmbase_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
-- UNSET(_ilmbase_libs_ver_init)
--
-- STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
--ENDIF()
--
--
--SET(_ilmbase_LIBRARIES)
--FOREACH(COMPONENT ${_ilmbase_FIND_COMPONENTS})
-- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
--
-- FIND_LIBRARY(ALEMBIC_ILMBASE_${UPPERCOMPONENT}_LIB
-- NAMES
-- ${COMPONENT}-${_ilmbase_libs_ver} ${COMPONENT}
-- HINTS
-- ${_ilmbase_SEARCH_DIRS}
-- PATH_SUFFIXES
-- lib64 lib
-- )
-- LIST(APPEND _ilmbase_LIBRARIES "${ILMBASE_${UPPERCOMPONENT}_LIBRARY}")
--ENDFOREACH()
--
--UNSET(_ilmbase_libs_ver)
--
--IF ( ${ALEMBIC_ILMBASE_HALF_LIB} STREQUAL "ALEMBIC_ILMBASE_HALF_LIB-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
--ENDIF()
--
--IF ( ${ALEMBIC_ILMBASE_IEX_LIB} STREQUAL "ALEMBIC_ILMBASE_IEX_LIB-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
--ENDIF()
--
--IF ( DEFINED USE_IEXMATH AND USE_IEXMATH )
-- IF ( ${ALEMBIC_ILMBASE_IEXMATH_LIB} STREQUAL
-- "ALEMBIC_ILMBASE_IEXMATH_LIB-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IexMath, IlmThread, Imath) not found, required" )
-- ENDIF()
--ENDIF()
--
--IF ( ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} STREQUAL "ALEMBIC_ILMBASE_ILMTHREAD_LIB-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
--ENDIF()
--
--IF ( ${ALEMBIC_ILMBASE_IMATH_LIB} STREQUAL "ALEMBIC_ILMBASE_IMATH_LIB-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
--ENDIF()
--
--IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRECTORY-NOTFOUND" )
-- MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
--ENDIF()
--
--
--MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
--MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
--MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
--MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
--MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
--MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
--
--SET( ILMBASE_FOUND TRUE )
-diff --git a/cmake/Modules/FindOpenEXR.cmake b/cmake/Modules/FindOpenEXR.cmake
-deleted file mode 100644
-index 935fe6f..0000000
---- a/cmake/Modules/FindOpenEXR.cmake
-+++ /dev/null
-@@ -1,129 +0,0 @@
--##-*****************************************************************************
--##
--## Copyright (c) 2009-2011,
--## Sony Pictures Imageworks Inc. and
--## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
--##
--## All rights reserved.
--##
--## Redistribution and use in source and binary forms, with or without
--## modification, are permitted provided that the following conditions are
--## met:
--## * Redistributions of source code must retain the above copyright
--## notice, this list of conditions and the following disclaimer.
--## * Redistributions in binary form must reproduce the above
--## copyright notice, this list of conditions and the following disclaimer
--## in the documentation and/or other materials provided with the
--## distribution.
--## * Neither the name of Industrial Light & Magic nor the names of
--## its contributors may be used to endorse or promote products derived
--## from this software without specific prior written permission.
--##
--## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--##
--##-*****************************************************************************
--
--
--# We shall worry about windowsification later.
--
--#-******************************************************************************
--#-******************************************************************************
--# NOW, OPENEXR STUFF. EXR IS OPTIONAL, WHERASE ILMBASE IS NOT
--#-******************************************************************************
--#-******************************************************************************
--
--IF(NOT DEFINED OPENEXR_ROOT)
-- IF ( ${CMAKE_HOST_UNIX} )
-- IF( ${DARWIN} )
-- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
-- ELSE()
-- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_OPENEXR_ROOT "/usr/local/openexr-1.6.1/" )
-- ENDIF()
-- ELSE()
-- IF ( ${WINDOWS} )
-- # TODO: set to 32-bit or 64-bit path
-- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
-- ELSE()
-- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
-- ENDIF()
-- ENDIF()
--ELSE()
-- SET( ALEMBIC_OPENEXR_ROOT ${OPENEXR_ROOT} )
--ENDIF()
--
--IF(NOT $ENV{OPENEXR_ROOT}x STREQUAL "x")
-- SET( ALEMBIC_OPENEXR_ROOT $ENV{OPENEXR_ROOT})
--ELSE()
-- SET( ENV{OPENEXR_ROOT} ${OPENEXR_ROOT} )
--ENDIF()
--
--
--SET(LIBRARY_PATHS
-- ${ALEMBIC_OPENEXR_ROOT}/lib
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local/lib
-- /usr/lib
-- /sw/lib
-- /opt/local/lib
-- /opt/csw/lib
-- /opt/lib
-- /usr/freeware/lib64
--)
--
--SET(INCLUDE_PATHS
-- ${ALEMBIC_OPENEXR_ROOT}/include/OpenEXR/
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local/include/OpenEXR/
-- /usr/local/include
-- /usr/include
-- /sw/include # Fink
-- /opt/local/include # DarwinPorts
-- /opt/csw/include # Blastwave
-- /opt/include
-- /usr/freeware/include
--)
--
--FIND_PATH( ALEMBIC_OPENEXR_INCLUDE_PATH ImfRgba.h
-- PATHS
-- ${INCLUDE_PATHS}
-- DOC "The directory where ImfRgba.h resides" )
--
--FIND_LIBRARY( ALEMBIC_OPENEXR_ILMIMF_LIB IlmImf
-- PATHS
-- ${LIBRARY_PATHS}
-- DOC "The IlmImf library" )
--
--
--SET( OPENEXR_FOUND TRUE )
--
--IF ( ${ALEMBIC_OPENEXR_INCLUDE_PATH} STREQUAL "ALEMBIC_OPENEXR_INCLUDE_PATH-NOTFOUND" )
-- MESSAGE( STATUS "OpenEXR include path not found, disabling" )
-- SET( OPENEXR_FOUND FALSE )
--ENDIF()
--
--IF ( ${ALEMBIC_OPENEXR_ILMIMF_LIB} STREQUAL "ALEMBIC_OPENEXR_ILMIMF_LIB-NOTFOUND" )
-- MESSAGE( STATUS "OpenEXR libraries not found, disabling" )
-- SET( OPENEXR_FOUND FALSE )
-- SET( ALEMBIC_OPENEXR_LIBS NOTFOUND )
--ENDIF()
--
--IF (OPENEXR_FOUND)
-- MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
-- SET( ALEMBIC_OPENEXR_LIBS ${ALEMBIC_OPENEXR_ILMIMF_LIB} )
--ENDIF()
--
--
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
index ecd1974940e0a3..6c9a2b57d32a5d 100644
--- a/ports/alembic/portfile.cmake
+++ b/ports/alembic/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux")
+
vcpkg_buildpath_length_warning(37)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@@ -5,14 +7,16 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO alembic/alembic
- REF 1.7.12
- SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
+ REF cfe114639ef7ad084d61e71ab86a17e708d838ae #v1.7.13
+ SHA512 38b797c1179e759870f10afc4a2182bc3e874eacecc9627c879d3a5cf35e49c83cae80600678427e5c22d6576d0e6280ce3cf0a2ac505f1df74ec4a8bdb083b5
HEAD_REF master
PATCHES
- fix-C1083.patch
fix-find-openexr-ilmbase.patch
)
+file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindIlmBase.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindOpenEXR.cmake)
+
if(NOT VCPKG_TARGET_IS_WINDOWS)
# In debug mode with g++, alembic defines -Werror
# so we need to disable some warnings to avoid build errors
@@ -49,20 +53,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll)
- file(READ ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-debug.cmake DEBUG_CONFIG)
+ file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake DEBUG_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll"
"\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-debug.cmake "${DEBUG_CONFIG}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake "${DEBUG_CONFIG}")
- file(READ ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-release.cmake RELEASE_CONFIG)
+ file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake RELEASE_CONFIG)
string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll"
"\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}")
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/alembic/AlembicTargets-release.cmake "${RELEASE_CONFIG}")
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake "${RELEASE_CONFIG}")
else()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alembic)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/alembic RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL
index 766aeb919830e3..f3e54d01394585 100644
--- a/ports/apr-util/CONTROL
+++ b/ports/apr-util/CONTROL
@@ -1,5 +1,6 @@
Source: apr-util
-Version: 1.6.1-1
+Version: 1.6.1
+Port-Version: 2
Homepage: https://apr.apache.org/
Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
Build-Depends: expat, apr, openssl
diff --git a/ports/apr-util/use-vcpkg-expat.patch b/ports/apr-util/use-vcpkg-expat.patch
index 28bcb51dce4de7..f124fcdd51ecdc 100644
--- a/ports/apr-util/use-vcpkg-expat.patch
+++ b/ports/apr-util/use-vcpkg-expat.patch
@@ -1,116 +1,124 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ae90b19..b0e86e2c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,8 +29,9 @@ OPTION(APR_HAS_LDAP "LDAP support" ON)
- OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
- OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
- OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF)
--SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files")
--SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with")
-+
-+find_path(APR_INCLUDE_DIR apr.h)
-+find_library(APR_LIBRARIES NAMES libapr-1 apr-1)
-
- IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
- MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
-@@ -65,8 +66,8 @@ IF(NOT EXPAT_FOUND)
- MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
- ENDIF()
-
--SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
--SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
-+find_path(XMLLIB_INCLUDE_DIR expat.h)
-+find_library(XMLLIB_LIBRARIES NAMES expat)
-
- SET(LDAP_LIBRARIES)
- IF(APR_HAS_LDAP)
-@@ -229,17 +230,21 @@ SET(dbd_drivers)
- # Note: The WINNT definition on some targets is used only by libaprutil.rc.
-
- # libaprutil-1 is shared, aprutil-1 is static
-+if(BUILD_SHARED_LIBS)
- ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
- SET(install_targets ${install_targets} libaprutil-1)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
- TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
--SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
-+SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT")
-
-+else(BUILD_SHARED_LIBS)
- ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
- SET(install_targets ${install_targets} aprutil-1)
- TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
- SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
--
-+endif(BUILD_SHARED_LIBS)
-+
-+if(BUILD_SHARED_LIBS)
- IF(APU_HAVE_CRYPTO)
- IF(NOT OPENSSL_FOUND)
- MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
-@@ -249,7 +254,7 @@ IF(APU_HAVE_CRYPTO)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
-- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
-+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_crypto_openssl")
- TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
- ENDIF()
-
-@@ -260,8 +265,8 @@ IF(APU_HAVE_ODBC)
- SET(dbd_drivers ${dbd_drivers} odbc)
- TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
- SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
-- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
-- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
-+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_IMPORT;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT")
-+ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_dbd_odbc")
- ENDIF()
-
- IF(APR_HAS_LDAP)
-@@ -271,11 +276,12 @@ IF(APR_HAS_LDAP)
- SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
- TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES})
- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
-- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
-+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_ldap")
- SET(apr_ldap_libraries apr_ldap-1)
- ELSE()
- SET(apr_ldap_libraries)
- ENDIF()
-+endif(BUILD_SHARED_LIBS)
-
- IF(APR_BUILD_TESTAPR)
- ENABLE_TESTING()
-@@ -289,7 +295,7 @@ IF(APR_BUILD_TESTAPR)
- ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
- ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
-
-- IF(TEST_STATIC_LIBS)
-+ IF(NOT BUILD_SHARED_LIBS)
- SET(whichapr aprutil-1)
- SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
- ELSE()
-@@ -325,13 +331,15 @@ INSTALL(TARGETS ${install_targets}
- ARCHIVE DESTINATION lib
- )
-
--IF(INSTALL_PDB)
-- INSTALL(FILES ${install_bin_pdb}
-- DESTINATION bin
-- CONFIGURATIONS RelWithDebInfo Debug)
--ENDIF()
-+#IF(INSTALL_PDB)
-+# INSTALL(FILES ${install_bin_pdb}
-+# DESTINATION bin
-+# CONFIGURATIONS RelWithDebInfo Debug)
-+#ENDIF()
-
--INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
-+if(NOT DISABLE_INSTALL_HEADERS)
-+ INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
-+endif()
-
- STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
- MESSAGE(STATUS "")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9ae90b1..71a50b0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,16 +21,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+ FIND_PACKAGE(OpenSSL)
+
+-FIND_PACKAGE(expat)
+-
+ OPTION(APU_HAVE_CRYPTO "Crypto support" OFF)
+ OPTION(APU_HAVE_ODBC "Build ODBC DBD driver" ON)
+ OPTION(APR_HAS_LDAP "LDAP support" ON)
+ OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON)
+ OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
+ OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF)
+-SET(APR_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE STRING "Directory with APR include files")
+-SET(APR_LIBRARIES "${CMAKE_INSTALL_PREFIX}/lib/libapr-1.lib" CACHE STRING "APR library to link with")
++find_path(APR_INCLUDE_DIR apr.h)
++find_library(APR_LIBRARIES NAMES libapr-1 apr-1)
+
+ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
+ MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+@@ -61,13 +59,13 @@ IF(APR_HAS_LDAP)
+ SET(apr_has_ldap_10 1)
+ ENDIF()
+
+-IF(NOT EXPAT_FOUND)
++find_path(XMLLIB_INCLUDE_DIR expat.h)
++find_library(XMLLIB_LIBRARIES NAMES libexpat libexpatMD)
++
++IF(NOT XMLLIB_LIBRARIES)
+ MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!")
+ ENDIF()
+
+-SET(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS})
+-SET(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES})
+-
+ SET(LDAP_LIBRARIES)
+ IF(APR_HAS_LDAP)
+ SET(LDAP_LIBRARIES wldap32)
+@@ -229,17 +227,21 @@ SET(dbd_drivers)
+ # Note: The WINNT definition on some targets is used only by libaprutil.rc.
+
+ # libaprutil-1 is shared, aprutil-1 is static
++if(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(libaprutil-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libaprutil.rc)
+ SET(install_targets ${install_targets} libaprutil-1)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libaprutil-1.pdb)
+ TARGET_LINK_LIBRARIES(libaprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+-SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;XML_STATIC;WINNT")
++SET_TARGET_PROPERTIES(libaprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_EXPORT;APR_DECLARE_IMPORT;XML_STATIC;WINNT")
+
++else(BUILD_SHARED_LIBS)
+ ADD_LIBRARY(aprutil-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
+ SET(install_targets ${install_targets} aprutil-1)
+ TARGET_LINK_LIBRARIES(aprutil-1 ${APR_LIBRARIES} ${XMLLIB_LIBRARIES})
+ SET_TARGET_PROPERTIES(aprutil-1 PROPERTIES COMPILE_DEFINITIONS "APU_DECLARE_STATIC;APR_DECLARE_STATIC;APU_DSO_MODULE_BUILD;XML_STATIC")
++endif(BUILD_SHARED_LIBS)
+
++if(BUILD_SHARED_LIBS)
+ IF(APU_HAVE_CRYPTO)
+ IF(NOT OPENSSL_FOUND)
+ MESSAGE(FATAL_ERROR "Only OpenSSL-based crypto is currently implemented in the cmake build")
+@@ -249,7 +251,7 @@ IF(APU_HAVE_CRYPTO)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_crypto_openssl-1.pdb)
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES INCLUDE_DIRECTORIES "${APR_INCLUDE_DIRECTORIES};${OPENSSL_INCLUDE_DIR}")
+ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
+- SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_crypto_openssl")
++ SET_TARGET_PROPERTIES(apr_crypto_openssl-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_crypto_openssl")
+ TARGET_LINK_LIBRARIES(apr_crypto_openssl-1 libaprutil-1 ${APR_LIBRARIES} ${OPENSSL_LIBRARIES})
+ ENDIF()
+
+@@ -260,8 +262,8 @@ IF(APU_HAVE_ODBC)
+ SET(dbd_drivers ${dbd_drivers} odbc)
+ TARGET_LINK_LIBRARIES(apr_dbd_odbc-1 libaprutil-1 ${APR_LIBRARIES} odbc32 odbccp32)
+ SET_PROPERTY(TARGET apr_dbd_odbc-1 APPEND PROPERTY LINK_FLAGS /export:apr_dbd_odbc_driver)
+- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_EXPORT;APR_DECLARE_EXPORT;APU_DSO_MODULE_BUILD;WINNT")
+- SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_dbd_odbc")
++ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_DEFINITIONS "APU_HAVE_ODBC;HAVE_SQL_H;APU_DECLARE_IMPORT;APR_DECLARE_IMPORT;APU_DSO_MODULE_BUILD;WINNT")
++ SET_TARGET_PROPERTIES(apr_dbd_odbc-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_dbd_odbc")
+ ENDIF()
+
+ IF(APR_HAS_LDAP)
+@@ -271,11 +273,12 @@ IF(APR_HAS_LDAP)
+ SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/apr_ldap-1.pdb)
+ TARGET_LINK_LIBRARIES(apr_ldap-1 libaprutil-1 ${APR_LIBRARIES} ${LDAP_LIBRARIES})
+ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_DEFINITIONS "WINNT")
+- SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_EXPORT=1 -DAPU_DECLARE_EXPORT=1 -DDLL_NAME=apr_ldap")
++ SET_TARGET_PROPERTIES(apr_ldap-1 PROPERTIES COMPILE_FLAGS "-DAPR_DECLARE_IMPORT -DAPU_DECLARE_IMPORT -DDLL_NAME=apr_ldap")
+ SET(apr_ldap_libraries apr_ldap-1)
+ ELSE()
+ SET(apr_ldap_libraries)
+ ENDIF()
++endif(BUILD_SHARED_LIBS)
+
+ IF(APR_BUILD_TESTAPR)
+ ENABLE_TESTING()
+@@ -289,7 +292,7 @@ IF(APR_BUILD_TESTAPR)
+ ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
+ ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
+
+- IF(TEST_STATIC_LIBS)
++ IF(NOT BUILD_SHARED_LIBS)
+ SET(whichapr aprutil-1)
+ SET(apiflag "-DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC")
+ ELSE()
+@@ -325,13 +328,9 @@ INSTALL(TARGETS ${install_targets}
+ ARCHIVE DESTINATION lib
+ )
+
+-IF(INSTALL_PDB)
+- INSTALL(FILES ${install_bin_pdb}
+- DESTINATION bin
+- CONFIGURATIONS RelWithDebInfo Debug)
+-ENDIF()
+-
+-INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
++if(NOT DISABLE_INSTALL_HEADERS)
++ INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)
++endif()
+
+ STRING(TOUPPER "${CMAKE_BUILD_TYPE}" buildtype)
+ MESSAGE(STATUS "")
diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL
index 607f6c4d4abbe2..2c9c0c691cae7c 100644
--- a/ports/apr/CONTROL
+++ b/ports/apr/CONTROL
@@ -1,5 +1,6 @@
Source: apr
-Version: 1.7.0-1
+Version: 1.7.0
+Port-Version: 2
Homepage: https://apr.apache.org/
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
Supports: !uwp
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
index b3ede1a1da2243..39f2370018299a 100644
--- a/ports/apr/portfile.cmake
+++ b/ports/apr/portfile.cmake
@@ -82,7 +82,7 @@ else()
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc
"-lapr-\${APR_MAJOR_VERSION}" "-lapr-1"
)
- vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl)
+ vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt)
endif()
# Handle copyright
diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json
index 9137c655f6866d..438522292049c3 100644
--- a/ports/argparse/vcpkg.json
+++ b/ports/argparse/vcpkg.json
@@ -2,6 +2,6 @@
"name": "argparse",
"version-string": "2.1",
"description": "Argument parser for modern C++",
- "license": "MIT",
- "homepage": "https://github.com/p-ranav/argparse"
+ "homepage": "https://github.com/p-ranav/argparse",
+ "license": "MIT"
}
diff --git a/ports/argtable3/CONTROL b/ports/argtable3/CONTROL
deleted file mode 100644
index f894b4fc5ba7f9..00000000000000
--- a/ports/argtable3/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: argtable3
-Version: 2019-08-21
-Description: A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options
-Homepage: www.argtable.org
diff --git a/ports/argtable3/fix-cmake.patch b/ports/argtable3/fix-cmake.patch
deleted file mode 100644
index 320e6385e939a3..00000000000000
--- a/ports/argtable3/fix-cmake.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 57bd7a1..e19e677 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,10 +65,6 @@ if(ARGTABLE3_ENABLE_CONAN AND EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath-link,${LINK_FLAGS}")
- endif()
-
--if(ARGTABLE3_ENABLE_TESTS)
-- enable_testing()
--endif()
--
- set(ARGTABLE3_AMALGAMATION_SRC_FILE ${PROJECT_SOURCE_DIR}/dist/argtable3.c)
- set(ARGTABLE3_SRC_FILES
- ${PROJECT_SOURCE_DIR}/src/arg_cmd.c
-@@ -88,18 +84,11 @@ set(ARGTABLE3_SRC_FILES
- ${PROJECT_SOURCE_DIR}/src/getopt_long.c
- )
-
--# Platform specific settings for installation
--if(UNIX)
-- include(GNUInstallDirs)
-- set(ARGTABLE3_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
-- set(ARGTABLE3_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
-- set(ARGTABLE3_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/argtable3)
--elseif(WIN32)
-- set(ARGTABLE3_INSTALL_LIBDIR "lib")
-- set(ARGTABLE3_INSTALL_INCLUDEDIR "include")
-- set(ARGTABLE3_INSTALL_CMAKEDIR "cmake")
--endif(UNIX)
--
- add_subdirectory(src)
--add_subdirectory(tests)
-+
-+if(ARGTABLE3_ENABLE_TESTS)
-+ enable_testing()
-+ add_subdirectory(tests)
-+endif()
-+
- add_subdirectory(examples)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 429b143..f45c071 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,9 +28,19 @@
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ################################################################################
-
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -Wpedantic")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
-+include(GNUInstallDirs)
-+
-+if(UNIX)
-+ set(ARGTABLE3_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/argtable3)
-+elseif(WIN32)
-+ set(ARGTABLE3_INSTALL_CMAKEDIR "cmake")
-+endif(UNIX)
-+
-+if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -Wpedantic")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
-+endif()
-
- add_definitions(-D_XOPEN_SOURCE=700)
-
-@@ -46,6 +56,7 @@ if(WIN32)
- "${PROJECT_BINARY_DIR}/src/version.rc"
- )
- add_library(argtable3 SHARED ${ARGTABLE3_SRC_FILES} "${PROJECT_BINARY_DIR}/src/version.rc")
-+ target_compile_definitions(argtable3 INTERFACE argtable3_IMPORTS)
- else()
- add_library(argtable3 SHARED ${ARGTABLE3_SRC_FILES})
- endif()
-@@ -57,8 +68,18 @@ target_include_directories(argtable3 PRIVATE ${PROJECT_SOURCE_DIR}/src)
- set_target_properties(argtable3 argtable3_static PROPERTIES
- VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
- SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR})
--
--install(TARGETS argtable3 EXPORT ${ARGTABLE3_PACKAGE_NAME}Config DESTINATION ${ARGTABLE3_INSTALL_LIBDIR})
--install(TARGETS argtable3_static EXPORT ${ARGTABLE3_PACKAGE_NAME}Config ARCHIVE DESTINATION ${ARGTABLE3_INSTALL_LIBDIR})
--install(FILES "${PROJECT_SOURCE_DIR}/src/argtable3.h" DESTINATION ${ARGTABLE3_INSTALL_INCLUDEDIR})
-+if(BUILD_SHARED_LIBS)
-+install(TARGETS argtable3
-+ EXPORT ${ARGTABLE3_PACKAGE_NAME}Config
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+else()
-+install(TARGETS argtable3_static
-+ EXPORT ${ARGTABLE3_PACKAGE_NAME}Config
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+endif()
-+install(FILES "${PROJECT_SOURCE_DIR}/src/argtable3.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- install(EXPORT ${ARGTABLE3_PACKAGE_NAME}Config DESTINATION ${ARGTABLE3_INSTALL_CMAKEDIR})
diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake
index 18d994cc540973..4e90c02e07b737 100644
--- a/ports/argtable3/portfile.cmake
+++ b/ports/argtable3/portfile.cmake
@@ -1,13 +1,9 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO argtable/argtable3
- REF bbc4ec20991e87ecf8dcf288aef777b55b78daa7
- SHA512 050f54ead2d029715d8f10e63ff555027ead61fbfa18bd955e3b99e080f9178ad5c41937c5d62477885143f27bb9e7e505a7120b95bfcd899a60719584191f1c
+ REF 1c1bb23b305c8cf349328fc0cacd7beb7a575ff4 # v3.1.5
+ SHA512 13150c8adc1eda107b6df65a2e276510a66bd912f6067d7cc72951735a4c20307144b04cda959cdd24f160da3810ba8bb35e48992ff4281e44ed2331d030fb1d
HEAD_REF master
- PATCHES
- fix-cmake.patch
)
vcpkg_configure_cmake(
@@ -29,14 +25,9 @@ elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT})
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
endif()
-file(COPY
- ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/include
-)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
vcpkg_replace_string(
@@ -46,8 +37,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
)
endif()
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json
new file mode 100644
index 00000000000000..37c2ec78b4bf3b
--- /dev/null
+++ b/ports/argtable3/vcpkg.json
@@ -0,0 +1,6 @@
+{
+ "name": "argtable3",
+ "version-string": "3.1.5",
+ "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options",
+ "homepage": "www.argtable.org"
+}
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
index 463b8e670cf805..850809579a8f54 100644
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@@ -1,4 +1,5 @@
Source: armadillo
-Version: 2019-04-16-8
+Version: 2019-04-16
+Port-Version: 10
Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
-Build-Depends: openblas (!osx), clapack (!osx)
+Build-Depends: openblas, lapack
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL
index 0b171b34f919bd..f8bb9cbd629a02 100644
--- a/ports/arrow/CONTROL
+++ b/ports/arrow/CONTROL
@@ -1,6 +1,6 @@
Source: arrow
-Version: 0.17.1
-Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl
+Version: 1.0.1
+Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl, utf8proc
Homepage: https://github.com/apache/arrow
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
Supports: x64
diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch
index 4116a1e5f5b1a8..65260b148a1aeb 100644
--- a/ports/arrow/all.patch
+++ b/ports/arrow/all.patch
@@ -26,7 +26,7 @@ index bf47915c4..053e605a0 100644
# Some systems (e.g. Fedora) don't fill Brotli_LIBRARY_DIRS, so add the other dirs here.
diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
-index 841091643..a196b251d 100644
+index 841091643..bb5a00a50 100644
--- a/cpp/cmake_modules/FindLz4.cmake
+++ b/cpp/cmake_modules/FindLz4.cmake
@@ -19,14 +19,16 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
@@ -49,7 +49,14 @@ index 841091643..a196b251d 100644
"${CMAKE_SHARED_LIBRARY_PREFIX}lz4_static${CMAKE_SHARED_LIBRARY_SUFFIX}"
PATHS ${LZ4_ROOT}
PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
-@@ -43,14 +45,14 @@ else()
+@@ -38,19 +40,19 @@ if(LZ4_ROOT)
+ PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
+
+ else()
+- pkg_check_modules(LZ4_PC liblz4)
+- if(LZ4_PC_FOUND)
++ #pkg_check_modules(LZ4_PC liblz4)
++ if(0) #if(LZ4_PC_FOUND) # Disabled as sometimes incompatible with vcpkg on Linux and OSX
set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}")
list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}")
@@ -102,65 +109,105 @@ index bb3eb5608..0b03d37d3 100644
find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include")
find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin")
diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
-index 8e47086e8..d87906a25 100644
+index 84d21d2b5..971a9dec3 100644
--- a/cpp/cmake_modules/FindZSTD.cmake
+++ b/cpp/cmake_modules/FindZSTD.cmake
-@@ -19,14 +19,18 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
+@@ -24,11 +24,11 @@ if(ARROW_ZSTD_USE_SHARED)
+ list(APPEND ZSTD_LIB_NAMES
+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ else()
+- if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX)
+- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
++ if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "DEBUG")
++ set(ZSTD_MSVC_DEBUG_LIB_SUFFIX d)
+ endif()
+ set(ZSTD_STATIC_LIB_SUFFIX
+- "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
++ "${ZSTD_MSVC_DEBUG_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+ set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
+ set(ZSTD_LIB_NAMES "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}")
endif()
-
--set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-+ set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
-+endif()
-+
-+set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
- set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
-
- # First, find via if specified ZTD_ROOT
- if(ZSTD_ROOT)
- message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
- find_library(ZSTD_LIB
-- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
- PATHS ${ZSTD_ROOT}
- PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
-@@ -39,19 +43,18 @@ if(ZSTD_ROOT)
-
+@@ -49,8 +49,8 @@ if(ZSTD_ROOT)
+
else()
# Second, find via pkg_check_modules
- pkg_check_modules(ZSTD_PC libzstd)
- if(ZSTD_PC_FOUND)
-+ if(0) # Disabled as incompatible with vcpkg
++ #pkg_check_modules(ZSTD_PC libzstd)
++ if(0) #(ZSTD_PC_FOUND) # Disabled as sometimes incompatible with vcpkg on Linux and OSX
set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
-
+
list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
-- find_library(ZSTD_LIB zstd
-+ find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
- PATHS ${ZSTD_PC_LIBRARY_DIRS}
- NO_DEFAULT_PATH
- PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
- # Third, check all other CMake paths
- else()
- find_library(ZSTD_LIB
-- NAMES zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+ NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${CMAKE_SHARED_LIBRARY_SUFFIX}"
- PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
- find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
-diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
-index 6110a5aa5..3270d74a9 100644
---- a/cpp/cmake_modules/SetupCxxFlags.cmake
-+++ b/cpp/cmake_modules/SetupCxxFlags.cmake
-@@ -163,7 +163,9 @@ macro(arrow_add_werror_if_debug)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
- # Treat all compiler warnings as errors
- if(MSVC)
-- set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /WX")
-+ if(MSVC_VERSION VERSION_LESS 1900)
-+ set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /WX")
-+ endif()
- else()
- set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Werror")
- endif()
+diff --git a/cpp/cmake_modules/DefineOptions.cmake b/cpp/cmake_modules/DefineOptions.cmake
+index 3b229846c..da2c6d551 100644
+--- a/cpp/cmake_modules/DefineOptions.cmake
++++ b/cpp/cmake_modules/DefineOptions.cmake
+@@ -297,6 +297,9 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ define_option(ARROW_PROTOBUF_USE_SHARED
+ "Rely on Protocol Buffers shared libraries where relevant" ON)
+
++ define_option(ARROW_UTF8PROC_USE_SHARED
++ "Rely on utf8proc shared libraries where relevant" ON)
++
+ define_option(ARROW_ZSTD_USE_SHARED "Rely on zstd shared libraries where relevant" ON)
+
+ define_option(ARROW_WITH_BACKTRACE "Build with backtrace support" ON)
+diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake
+index ab9ae9f98..d3063827a 100644
+--- a/cpp/cmake_modules/Findutf8proc.cmake
++++ b/cpp/cmake_modules/Findutf8proc.cmake
+@@ -15,11 +15,28 @@
+ # specific language governing permissions and limitations
+ # under the License.
+
++if(ARROW_UTF8PROC_USE_SHARED)
++ set(UTF8PROC_LIB_NAMES)
++ if(CMAKE_IMPORT_LIBRARY_SUFFIX)
++ list(APPEND UTF8PROC_LIB_NAMES
++ "${CMAKE_IMPORT_LIBRARY_PREFIX}utf8proc${CMAKE_IMPORT_LIBRARY_SUFFIX}")
++ endif()
++ list(APPEND UTF8PROC_LIB_NAMES
++ "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}")
++else()
++ if(MSVC AND NOT DEFINED UTF8PROC_MSVC_STATIC_LIB_SUFFIX)
++ set(UTF8PROC_MSVC_STATIC_LIB_SUFFIX "_static")
++ endif()
++ set(UTF8PROC_STATIC_LIB_SUFFIX
++ "${UTF8PROC_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
++ set(UTF8PROC_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}utf8proc${UTF8PROC_STATIC_LIB_SUFFIX})
++ set(UTF8PROC_LIB_NAMES "${UTF8PROC_STATIC_LIB_NAME}" "lib${UTF8PROC_STATIC_LIB_NAME}")
++endif()
++
+ if(utf8proc_ROOT)
+ find_library(
+ UTF8PROC_LIB
+- NAMES utf8proc
+- "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}"
++ NAMES ${UTF8PROC_LIB_NAMES}
+ PATHS ${utf8proc_ROOT}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES}
+ NO_DEFAULT_PATH)
+@@ -28,12 +45,10 @@ if(utf8proc_ROOT)
+ PATHS ${utf8proc_ROOT}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
+-
+ else()
+ find_library(
+ UTF8PROC_LIB
+- NAMES utf8proc
+- "${CMAKE_SHARED_LIBRARY_PREFIX}utf8proc${CMAKE_SHARED_LIBRARY_SUFFIX}"
++ NAMES ${UTF8PROC_LIB_NAMES}
+ PATH_SUFFIXES ${LIB_PATH_SUFFIXES})
+ find_path(UTF8PROC_INCLUDE_DIR NAMES utf8proc.h PATH_SUFFIXES ${INCLUDE_PATH_SUFFIXES})
+ endif()
+@@ -47,5 +62,8 @@ if(UTF8PROC_FOUND OR utf8proc_FOUND)
+ set_target_properties(utf8proc::utf8proc
+ PROPERTIES IMPORTED_LOCATION "${UTF8PROC_LIB}"
+ INTERFACE_INCLUDE_DIRECTORIES "${UTF8PROC_INCLUDE_DIR}")
++ if(NOT ARROW_UTF8PROC_USE_SHARED)
++ set_target_properties(utf8proc::utf8proc
++ PROPERTIES INTERFACE_COMPILER_DEFINITIONS "UTF8PROC_STATIC")
++ endif()
+ endif()
+-
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
index 42227dc9417c2c..5e2f87f0b72ed6 100644
--- a/ports/arrow/portfile.cmake
+++ b/ports/arrow/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/arrow
- REF apache-arrow-0.17.1
- SHA512 2a1a637d6df08e19d0c8313c51e1baf8902db677b072f8787c4f9faf8bdec94357ac8af839718d449377b508fe4f6e31b011cbdc6ccf029b6a66f567172569aa
+ REF apache-arrow-1.0.1
+ SHA512 46fedecaf7fa0ff0d8b4ac5f3d7bcbcb75ce4f65d272f775dedd61f091f975cf03fc55e91e46021df9872a82712ca9c9e4eb35414cf46c0f49a26f7a5a3dd50c
HEAD_REF master
PATCHES
all.patch
@@ -26,12 +26,15 @@ vcpkg_configure_cmake(
OPTIONS
-DARROW_DEPENDENCY_SOURCE=SYSTEM
-Duriparser_SOURCE=SYSTEM
- -DARROW_BUILD_TESTS=off
+ -DARROW_BUILD_TESTS=OFF
${FEATURE_OPTIONS}
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
- -DARROW_GFLAGS_USE_SHARED=off
- -DARROW_JEMALLOC=off
+ -DARROW_BROTLI_USE_SHARED=${ARROW_BUILD_SHARED}
+ -DARROW_GFLAGS_USE_SHARED=${ARROW_BUILD_SHARED}
+ -DARROW_UTF8PROC_USE_SHARED=${ARROW_BUILD_SHARED}
+ -DARROW_ZSTD_USE_SHARED=${ARROW_BUILD_SHARED}
+ -DARROW_JEMALLOC=OFF
-DARROW_BUILD_UTILITIES=OFF
-DARROW_WITH_BZ2=ON
-DARROW_WITH_ZLIB=ON
@@ -39,6 +42,7 @@ vcpkg_configure_cmake(
-DARROW_WITH_LZ4=ON
-DARROW_WITH_SNAPPY=ON
-DARROW_WITH_BROTLI=ON
+ -DARROW_WITH_UTF8PROC=ON
-DPARQUET_REQUIRE_ENCRYPTION=ON
)
diff --git a/ports/asiosdk/CONTROL b/ports/asiosdk/CONTROL
index 1a8c75628314a3..b97ebb689d4337 100644
--- a/ports/asiosdk/CONTROL
+++ b/ports/asiosdk/CONTROL
@@ -1,4 +1,4 @@
Source: asiosdk
-Version: 2.3.3
+Version: 2.3.3-1
Homepage: https://www.steinberg.net/en/company/developers.html
Description: ASIO is a low latency audio API from Steinberg.
diff --git a/ports/asiosdk/vcpkg-cmake-wrapper.cmake b/ports/asiosdk/vcpkg-cmake-wrapper.cmake
index 2fbe9725f536ec..df14d7c827e016 100644
--- a/ports/asiosdk/vcpkg-cmake-wrapper.cmake
+++ b/ports/asiosdk/vcpkg-cmake-wrapper.cmake
@@ -1,8 +1,6 @@
set(ASIOSDK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-if(NOT ASIOSDK_INCLUDE_DIR)
- _find_package(${ARGS})
-endif()
+_find_package(${ARGS})
set(CMAKE_MODULE_PATH ${ASIOSDK_PREV_MODULE_PATH})
diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL
index 5ec779ce70fb24..d4b46b6a5c4007 100644
--- a/ports/asmjit/CONTROL
+++ b/ports/asmjit/CONTROL
@@ -1,5 +1,5 @@
Source: asmjit
-Version: 2020-05-08
+Version: 2020-07-22
Homepage: https://github.com/asmjit/asmjit
Description: Complete x86/x64 JIT and Remote Assembler for C++
Supports: !arm
diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake
index d95645d7e21642..812083b6d919ca 100644
--- a/ports/asmjit/portfile.cmake
+++ b/ports/asmjit/portfile.cmake
@@ -3,23 +3,23 @@ vcpkg_fail_port_install(ON_ARCH "arm")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO asmjit/asmjit
- REF 80645e66a8ae85749937bda3b329388c8a76ea4c
- SHA512 8e7b0aed14e8ce05e6e6b2eed77be23a81b9548a146aef187ac6beced3bc2a6cba92835718adb901a1ab983fab32f3e9f18061b157b2276bb1451a71ca1195b8
+ REF 8474400e82c3ea65bd828761539e5d9b25f6bd83
+ SHA512 435be4ed22abbbbcdea3869b31bc2fc27aae969775773c24155d7490bca9591f51613fa3319cce54200c6d18dbe73a6be2d5449c49afb46934d93760501e98f6
HEAD_REF master
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS -DASMJIT_STATIC=1
- )
+ set(ASMJIT_STATIC 1)
else()
- vcpkg_configure_cmake(
+ set(ASMJIT_STATIC 0)
+endif()
+
+vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- )
-endif()
+ OPTIONS -DASMJIT_STATIC=${ASMJIT_STATIC}
+ )
+
vcpkg_install_cmake()
vcpkg_copy_pdbs()
diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL
index caf3abb43f09c0..8192383d888094 100644
--- a/ports/atkmm/CONTROL
+++ b/ports/atkmm/CONTROL
@@ -1,5 +1,7 @@
Source: atkmm
-Version: 2.24.2-2
+Version: 2.24.2
+Port-Version: 3
Homepage: https://www.gtkmm.org
Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
Build-Depends: glib, gettext, atk, glibmm
+Supports: !(linux | osx)
diff --git a/ports/atkmm/portfile.cmake b/ports/atkmm/portfile.cmake
index f8e9df2943cd2f..9795881ece1a6e 100644
--- a/ports/atkmm/portfile.cmake
+++ b/ports/atkmm/portfile.cmake
@@ -1,4 +1,4 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@@ -32,34 +32,19 @@ vcpkg_build_msbuild(
# Handle headers
file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(
- COPY
- ${SOURCE_PATH}/atk/atkmm
+file(COPY ${SOURCE_PATH}/atk/atkmm
DESTINATION ${CURRENT_PACKAGES_DIR}/include
- FILES_MATCHING PATTERN *.h
-)
+ FILES_MATCHING PATTERN *.h)
# Handle libraries
-file(
- COPY
- ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(
- COPY
- ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-file(
- COPY
- ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-)
-file(
- COPY
- ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
+file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
+ DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.lib
+ DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.dll
+ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
+ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
vcpkg_copy_pdbs()
diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt
index 9a6ad2377d9faa..ad8ce6a4669d32 100644
--- a/ports/aubio/CMakeLists.txt
+++ b/ports/aubio/CMakeLists.txt
@@ -24,33 +24,24 @@ set(CMAKE_DEBUG_POSTFIX d)
option(BUILD_TOOLS "Build and install tools" ON)
set(TOOLS_INSTALLDIR "bin" CACHE STRING "Target directory for installed tools")
-find_path(LIBSNDFILE_H sndfile.h)
-find_library(LIBSNDFILE_LIB NAMES libsndfile-1 libsndfile)
find_library(AVCODEC_LIB avcodec)
find_library(AVUTIL_LIB avutil)
find_library(AVDEVICE_LIB avdevice)
find_library(AVFILTER_LIB avfilter)
find_library(AVFORMAT_LIB avformat)
find_library(SWRESAMPLE_LIB swresample)
-find_library(OGG_LIB ogg)
-find_library(FLAC_LIB flac)
-find_library(VORBIS_LIB vorbis)
-find_library(VORBISENC_LIB vorbisenc)
find_package(BZip2 REQUIRED)
find_package(LibLZMA REQUIRED)
+find_package(SndFile REQUIRED)
-include_directories(src ${LIBSNDFILE_H} ${LIBLZMA_INCLUDE_DIRS})
+include_directories(src ${LIBLZMA_INCLUDE_DIRS})
file(GLOB_RECURSE SOURCES src/*.c)
set_source_files_properties(src/io/sink_wavwrite.c PROPERTIES COMPILE_FLAGS /FIWinsock2.h)
add_library(aubio ${SOURCES})
target_link_libraries(aubio PUBLIC
- ${LIBSNDFILE_LIB}
- ${OGG_LIB}
- ${FLAC_LIB}
- ${VORBIS_LIB}
- ${VORBISENC_LIB}
+ SndFile::sndfile
${AVCODEC_LIB}
${AVUTIL_LIB}
${AVDEVICE_LIB}
diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL
index 2c5a18e48ac8c9..f023b702e3ce97 100644
--- a/ports/aubio/CONTROL
+++ b/ports/aubio/CONTROL
@@ -1,5 +1,6 @@
Source: aubio
-Version: 0.4.9-1
+Version: 0.4.9
+Port-Version: 2
Homepage: https://github.com/aubio/aubio
Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake
new file mode 100644
index 00000000000000..49f9a67d279426
--- /dev/null
+++ b/ports/audiofile/portfile.cmake
@@ -0,0 +1,13 @@
+# header-only library
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO adamstark/AudioFile
+ REF ccb64bd86881099e65a329f104733679ae03f63e # 1.0.7
+ SHA512 f172f9df95a028c9c3da29cd530dd4b55acad76ee7503000f96ba10c5d014abd219fcd145cea4b7ca7a902c38d968518b39de285d25f7e3ccc56d1ba3769d7b8
+ HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/AudioFile.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json
new file mode 100644
index 00000000000000..d779642030d20b
--- /dev/null
+++ b/ports/audiofile/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "audiofile",
+ "version-string": "1.0.7",
+ "description": "A simple header-only C++ library for reading and writing audio files.",
+ "homepage": "https://github.com/adamstark/AudioFile",
+ "license": "GPL-3.0"
+}
diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake
index d18d548a060cec..467e8dd9174519 100644
--- a/ports/avisynthplus/portfile.cmake
+++ b/ports/avisynthplus/portfile.cmake
@@ -1,4 +1,4 @@
-vcpkg_fail_port_install(ON_TARGET "UWP" "arm" "arm64")
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_LIBRARY_LINKAGE "static" ON_TARGET "UWP" "OSX" "Linux")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
@@ -20,4 +20,4 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/avisynthplus RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/distrib/gpl.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
index 1af0142ea4d4bb..b6796ad53c1384 100644
--- a/ports/avisynthplus/vcpkg.json
+++ b/ports/avisynthplus/vcpkg.json
@@ -1,7 +1,8 @@
{
"name": "avisynthplus",
"version-string": "3.6.0",
- "homepage": "http://avs-plus.net/",
+ "port-version": 1,
"description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
- "supports": "!(uwp | arm | static)"
+ "homepage": "http://avs-plus.net/",
+ "supports": "windows & !arm & !uwp & !static"
}
diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL
new file mode 100644
index 00000000000000..0f75d7e24cdd2e
--- /dev/null
+++ b/ports/avro-cpp/CONTROL
@@ -0,0 +1,9 @@
+Source: avro-cpp
+Version: 1.9.2
+Homepage: https://github.com/apache/avro
+Description: Apache Avro is a data serialization system
+Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd
+
+Feature: snappy
+Build-Depends: snappy
+Description: Support Snappy for compression
diff --git a/ports/avro-cpp/install.patch b/ports/avro-cpp/install.patch
new file mode 100644
index 00000000000000..12ead28612157d
--- /dev/null
+++ b/ports/avro-cpp/install.patch
@@ -0,0 +1,100 @@
+diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
+index 30a5d66..f7f2b94 100644
+--- a/lang/c++/CMakeLists.txt
++++ b/lang/c++/CMakeLists.txt
+@@ -40,6 +40,8 @@ set (AVRO_VERSION_MINOR "0")
+ project (Avro-cpp)
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
+
++find_package(ZLIB REQUIRED)
++
+ if (WIN32 AND NOT CYGWIN AND NOT MSYS)
+ add_definitions (/EHa)
+ add_definitions (
+@@ -118,11 +120,11 @@ set_target_properties (avrocpp PROPERTIES
+ set_target_properties (avrocpp_s PROPERTIES
+ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR})
+
+-target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+
+ add_executable (precompile test/precompile.cc)
+
+-target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (precompile avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+
+ macro (gen file ns)
+ add_custom_command (OUTPUT ${file}.hh
+@@ -151,34 +153,40 @@ gen (crossref cr)
+ gen (primitivetypes pt)
+
+ add_executable (avrogencpp impl/avrogencpp.cc)
+-target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
++
+
+-enable_testing()
++if(BUILD_TESTING)
++ enable_testing()
++endif()
+
+ macro (unittest name)
+ add_executable (${name} test/${name}.cc)
+- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
++ target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB)
+ add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
+ endmacro (unittest)
+
+-unittest (buffertest)
+-unittest (unittest)
+-unittest (SchemaTests)
+-unittest (LargeSchemaTests)
+-unittest (CodecTests)
+-unittest (StreamTests)
+-unittest (SpecificTests)
+-unittest (DataFileTests)
+-unittest (JsonTests)
+-unittest (AvrogencppTests)
+-unittest (CompilerTests)
+-
+-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
+- tweet_hh
+- union_array_union_hh union_map_union_hh union_conflict_hh
+- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
+- primitivetypes_hh empty_record_hh)
++if(BUILD_TESTING)
++ unittest (buffertest)
++ unittest (unittest)
++ unittest (SchemaTests)
++ unittest (LargeSchemaTests)
++ unittest (CodecTests)
++ unittest (StreamTests)
++ unittest (SpecificTests)
++ unittest (DataFileTests)
++ unittest (JsonTests)
++ unittest (AvrogencppTests)
++ unittest (CompilerTests)
++
++ add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
++ tweet_hh
++ union_array_union_hh union_map_union_hh union_conflict_hh
++ recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
++ primitivetypes_hh empty_record_hh)
++
++endif()
+
+ include (InstallRequiredSystemLibraries)
+
+@@ -189,9 +197,9 @@ include (CPack)
+ install (TARGETS avrocpp avrocpp_s
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+- RUNTIME DESTINATION lib)
++ RUNTIME DESTINATION bin)
+
+-install (TARGETS avrogencpp RUNTIME DESTINATION bin)
++install (TARGETS avrogencpp RUNTIME DESTINATION tools/bin)
+
+ install (DIRECTORY api/ DESTINATION include/avro
+ FILES_MATCHING PATTERN *.hh)
diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake
new file mode 100644
index 00000000000000..49f0af20ce77b2
--- /dev/null
+++ b/ports/avro-cpp/portfile.cmake
@@ -0,0 +1,35 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO apache/avro
+ REF release-1.9.2
+ SHA512 6a6980901eea964c050eb3d61fadf28712e2f02c36985bf8e5176b668bba48985f6a666554a1964435448de29b18d790ab86b787d0288a22fd9cba00746a7846
+ HEAD_REF master
+ PATCHES
+ install.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ INVERTED_FEATURES
+ snappy CMAKE_DISABLE_FIND_PACKAGE_Snappy
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}/lang/c++
+ PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
+ OPTIONS
+ -DBUILD_TESTING=OFF
+ ${FEATURE_OPTIONS}
+ OPTIONS_DEBUG
+ -DAVRO_ADD_PROTECTOR_FLAGS=1
+)
+
+vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/lang/c++/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 253ed721c95d1b..6546575b1f0f68 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,5 +1,5 @@
Source: azure-c-shared-utility
-Version: 2020-06-17-1
+Version: 2020-07-19
Description: Azure C SDKs common code
Homepage: https://github.com/Azure/azure-c-shared-utility
Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
@@ -7,4 +7,4 @@ Supports: !uwp
Feature: public-preview
Description: Azure C SDKs common code (public preview)
-Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c[public-preview], umock-c[public-preview]
\ No newline at end of file
+Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c[public-preview], umock-c[public-preview]
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index b38a835ce0b550..ccc9b681d10e87 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -16,8 +16,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
- REF 30211c742f082082c127c0f284257119131a96ab
- SHA512 c46493a82a6879d501a0261ca61fb91594ac554928794ef96fd96570fed2ba5e0533a4e00a02e3826d7dfacc22bff3ac8e0a2696a7b46c766d317f29207ec062
+ REF 65c27eb4ab9a8bbe36b4d7c5a0e9ad305becb8b4
+ SHA512 48c65111b12e895f9c2087964d7291e6d1629242194fed9b33ead8ca438f16c803786cd55761eabdd12d47c9920542cff0e510bf16f16cac1d60049ba205df0e
HEAD_REF master
PATCHES
fix-utilityFunctions-conditions.patch
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index 0c6aef0a1ead6f..6344bdeabad213 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,5 +1,6 @@
Source: azure-iot-sdk-c
-Version: 2020-06-17-2
+Version: 2020-07-19
+Port-Version: 1
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services
Homepage: https://github.com/Azure/azure-iot-sdk-c
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 6d0bec58a192c7..db460aaecf7547 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -15,8 +15,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
- REF 989f1dc66c7de53cb14d29eb051003eec0de798e
- SHA512 876e846cdef699ee3635e5191a697c56c7c40b2110d2468cfbbe204cff59d42a0d930861fda7229dbba163a329de9d8f06276228bab516ef92c88feebfcfbc13
+ REF f464326f10cbba497b71c4aa263b6a22e1b375fe
+ SHA512 32dfb2ac697755af3646b07259298fc2f27007ab1a0a27da0be4f597c82dd2f8bbad6f07b4ed01dfbb62d86649d4be913c59e1e76b33efec112beaaba550d375
HEAD_REF master
PATCHES
improve-external-deps.patch
@@ -25,6 +25,7 @@ else()
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+ use-prov-client hsm_type_symm_key
use-prov-client use_prov_client
)
@@ -40,7 +41,6 @@ vcpkg_configure_cmake(
-Duse_default_uuid=ON
-Dbuild_as_dynamic=OFF
-Duse_edge_modules=ON
- -Dhsm_type_symm_key=${use_prov_client}
)
vcpkg_install_cmake()
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index c2a59448dad988..ddd6fe2da1bb8e 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,5 +1,5 @@
Source: azure-uamqp-c
-Version: 2020-06-17-1
+Version: 2020-07-19
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: AMQP library for C
Homepage: https://github.com/Azure/azure-uamqp-c
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index 39b45e8cd18819..e154414fc2d6b6 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -12,8 +12,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
- REF cd11c2591ada765f23669bce62dbfaf503b3108e
- SHA512 a2879afcc6417ebe81bae0ca12e0ebcae90749637446917168a3356bfdd8fa2f3d73fb1ce2def907b26f7d6c0fcc4f7bd72463ed9dba4d0f8a5a287f4307ae0c
+ REF 9e851bd6db08d6d2d08d1ef469d1e6fc4795382d
+ SHA512 efe0b9ed8a949af67e958b1516f499f57a0838a847e92d6c932058e931d2536038e7d49d63597e21de0a6f2af22bc179a6d99c8b8077451f906118b0b65e1417
HEAD_REF master
)
endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index 5f26022c4c7e60..b64573024fb0f7 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,5 +1,5 @@
Source: azure-uhttp-c
-Version: 2020-06-17-1
+Version: 2020-07-19
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: Azure HTTP Library written in C
Homepage: https://github.com/Azure/azure-uhttp-c
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index ff8c03e90f816d..1e05b1cfa93c54 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -12,8 +12,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uhttp-c
- REF 6bf59b9057f653aaa57e6539627085f41c2dfe33
- SHA512 96437df9f249e2a551e9890b4d476ae032384a067d845b86893013138380802592f70139e2b4f4c0d543c464ef98008d0b2f025ce6f0341181e431b53e311dc5
+ REF ef8ba1591b0f825315b78380331ff9290197db02
+ SHA512 3e0434272de684a43189d491c16ab7e20ffcfd08f8addb01f64caa446211faa67e45aa51c403520df6a105cc9ac50b85de1b9e0954510fd4232c0f19d01fea9c
HEAD_REF master
)
endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 9f8f637e23b9fd..755b0160e9bc3f 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,5 +1,5 @@
Source: azure-umqtt-c
-Version: 2020-06-17-1
+Version: 2020-07-19
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
Description: General purpose library for communication over the mqtt protocol
Homepage: https://github.com/Azure/azure-umqtt-c
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index 80779f03e55195..84fba09b62871a 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -12,8 +12,8 @@ else()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
- REF 349a2bffc1addfdc4b61d30f80adc1e15b336fbd
- SHA512 887ece4d9cbb32059c84d776d88ce05fa8474289afb1cd5873a672fc926024a416ac50a829c671fd2aae6b4eaa984f05196a3fff6a56011585d875f116a0a764
+ REF 165f6f52f8b2aec54a28ea5ede41736589726cd0
+ SHA512 af56db89ddbae1a8067d3b1c7f85ecf085fb6bf529d01f74dd301e6994b20e6f1a821fd7d5116b53d1a8911ccc463149a53a5611e650c3aeb63893012206ffb8
HEAD_REF master
)
endif()
diff --git a/ports/behaviortree-cpp/001_port_fixes.patch b/ports/behaviortree-cpp/001_port_fixes.patch
new file mode 100644
index 00000000000000..3cb4ac29ed32a8
--- /dev/null
+++ b/ports/behaviortree-cpp/001_port_fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75dea11..4eea781 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,7 +229,7 @@ if( ZMQ_FOUND )
+ endif()
+
+ if(MSVC)
+- target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /WX)
++ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE /W4 /wd4702)
+ else()
+ target_compile_options(${BEHAVIOR_TREE_LIBRARY} PRIVATE
+ -Wall -Wextra -Werror=return-type)
diff --git a/ports/behaviortree-cpp/002_fix_dependencies.patch b/ports/behaviortree-cpp/002_fix_dependencies.patch
new file mode 100644
index 00000000000000..76d7857dbf6388
--- /dev/null
+++ b/ports/behaviortree-cpp/002_fix_dependencies.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 75dea11..23053ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ if(MSVC)
+ endif()
+
+ #---- Include boost to add coroutines ----
+-find_package(Boost COMPONENTS coroutine QUIET)
++find_package(Boost REQUIRED) # coroutine2 is header-only
+ if(Boost_FOUND)
+ include_directories(${Boost_INCLUDE_DIRS})
+ string(REPLACE "." "0" Boost_VERSION_NODOT ${Boost_VERSION})
+@@ -45,18 +45,18 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+
+ #---- Find other packages ----
+ find_package(Threads)
+-find_package(ZMQ)
++find_package(cppzmq)
+
+ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${CMAKE_DL_LIBS}
+ ${Boost_LIBRARIES} )
+
+-if( ZMQ_FOUND )
++if( ZMQ_FOUND OR ON )
+ message(STATUS "ZeroMQ found.")
+ add_definitions( -DZMQ_FOUND )
+ list(APPEND BT_SOURCE src/loggers/bt_zmq_publisher.cpp)
+- list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES ${ZMQ_LIBRARIES})
++ list(APPEND BEHAVIOR_TREE_EXTERNAL_LIBRARIES cppzmq)
+ else()
+ message(WARNING "ZeroMQ NOT found. Skipping the build of [PublisherZMQ] and [bt_recorder].")
+ endif()
diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake
new file mode 100644
index 00000000000000..f67153766f9d1c
--- /dev/null
+++ b/ports/behaviortree-cpp/portfile.cmake
@@ -0,0 +1,42 @@
+vcpkg_fail_port_install(ON_TARGET "UWP")
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://github.com/BehaviorTree/BehaviorTree.CPP/archive/3.5.1.tar.gz"
+ FILENAME "BehaviorTree.CPP.3.5.1.tar.gz"
+ SHA512 66db43225e692fa0f9073e63bdff765c037440372478792a9b442103a8bed945f5c3ae1d66266b86cb41d0006404a8297708a799ec0c7286c2beec6f964a4ac6
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ PATCHES
+ 001_port_fixes.patch
+ 002_fix_dependencies.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCMAKE_DISABLE_FIND_PACKAGE_ament_cmake=1
+ -DCMAKE_DISABLE_FIND_PACKAGE_Curses=1
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_UNIT_TESTS=OFF
+ -DBUILD_TOOLS=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/BehaviorTreeV3/cmake TARGET_PATH share/behaviortreev3)
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/lib/BehaviorTreeV3"
+ "${CURRENT_PACKAGES_DIR}/debug/lib/BehaviorTreeV3"
+)
+
+vcpkg_test_cmake(PACKAGE_NAME BehaviorTreeV3)
diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json
new file mode 100644
index 00000000000000..783187faa3e850
--- /dev/null
+++ b/ports/behaviortree-cpp/vcpkg.json
@@ -0,0 +1,12 @@
+{
+ "name": "behaviortree-cpp",
+ "version-string": "3.5.1",
+ "port-version": 2,
+ "description": "Behavior Trees Library in C++.",
+ "homepage": "https://www.behaviortree.dev",
+ "supports": "!uwp & !osx",
+ "dependencies": [
+ "boost-coroutine2",
+ "cppzmq"
+ ]
+}
diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL
index 07ab3e306774da..91677a1f79150a 100644
--- a/ports/berkeleydb/CONTROL
+++ b/ports/berkeleydb/CONTROL
@@ -1,5 +1,6 @@
Source: berkeleydb
-Version: 4.8.30-4
+Version: 4.8.30
+Port-Version: 5
Homepage: https://download.oracle.com/
Description: BDB - A high-performance embedded database for key/value data.
Supports: !(uwp|linux|osx)
diff --git a/ports/berkeleydb/fix-conflict-macro.patch b/ports/berkeleydb/fix-conflict-macro.patch
new file mode 100644
index 00000000000000..c15d7edff9818f
--- /dev/null
+++ b/ports/berkeleydb/fix-conflict-macro.patch
@@ -0,0 +1,123 @@
+diff --git a/dbinc/atomic.h b/dbinc/atomic.h
+index 0034dcc..2dd5e03 100644
+--- a/dbinc/atomic.h
++++ b/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+ * These have no memory barriers; the caller must include them when necessary.
+ */
+ #define atomic_read(p) ((p)->value)
+-#define atomic_init(p, val) ((p)->value = (val))
++#define bdb_atomic_init(p, val) ((p)->value = (val))
+
+ #ifdef HAVE_ATOMIC_SUPPORT
+
+@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(
+ #define atomic_dec(env, p) (--(p)->value)
+ #define atomic_compare_exchange(env, p, oldval, newval) \
+ (DB_ASSERT(env, atomic_read(p) == (oldval)), \
+- atomic_init(p, (newval)), 1)
++ bdb_atomic_init(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p) __atomic_inc(env, p)
+ #define atomic_dec(env, p) __atomic_dec(env, p)
+diff --git a/mp/mp_fget.c b/mp/mp_fget.c
+index 5fdee5a..452ef17 100644
+--- a/mp/mp_fget.c
++++ b/mp/mp_fget.c
+@@ -617,7 +617,7 @@ alloc: /* Allocate a new buffer header and data space. */
+
+ /* Initialize enough so we can call __memp_bhfree. */
+ alloc_bhp->flags = 0;
+- atomic_init(&alloc_bhp->ref, 1);
++ bdb_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ __db_errx(env,
+@@ -911,7 +911,7 @@ alloc: /* Allocate a new buffer header and data space. */
+ MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
+ PROT_READ);
+
+- atomic_init(&alloc_bhp->ref, 1);
++ bdb_atomic_init(&alloc_bhp->ref, 1);
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ alloc_bhp->priority = bhp->priority;
+ alloc_bhp->pgno = bhp->pgno;
+diff --git a/mp/mp_mvcc.c b/mp/mp_mvcc.c
+index 34467d2..b604388 100644
+--- a/mp/mp_mvcc.c
++++ b/mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
+ #else
+ memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+- atomic_init(&frozen_bhp->ref, 0);
++ bdb_atomic_init(&frozen_bhp->ref, 0);
+ if (mutex != MUTEX_INVALID)
+ frozen_bhp->mtx_buf = mutex;
+ else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
+ #endif
+ alloc_bhp->mtx_buf = mutex;
+ MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+- atomic_init(&alloc_bhp->ref, 1);
++ bdb_atomic_init(&alloc_bhp->ref, 1);
+ F_CLR(alloc_bhp, BH_FROZEN);
+ }
+
+diff --git a/mp/mp_region.c b/mp/mp_region.c
+index e6cece9..e3e3382 100644
+--- a/mp/mp_region.c
++++ b/mp/mp_region.c
+@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+ MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ return (ret);
+ SH_TAILQ_INIT(&htab[i].hash_bucket);
+- atomic_init(&htab[i].hash_page_dirty, 0);
++ bdb_atomic_init(&htab[i].hash_page_dirty, 0);
+ }
+
+ /*
+@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+ hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
+ mtx_base + i;
+ SH_TAILQ_INIT(&hp->hash_bucket);
+- atomic_init(&hp->hash_page_dirty, 0);
++ bdb_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ hp->hash_io_wait = 0;
+ hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
+diff --git a/mutex/mut_method.c b/mutex/mut_method.c
+index 2588763..56b6723 100644
+--- a/mutex/mut_method.c
++++ b/mutex/mut_method.c
+@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, newval)
+ MUTEX_LOCK(env, mtx);
+ ret = atomic_read(v) == oldval;
+ if (ret)
+- atomic_init(v, newval);
++ bdb_atomic_init(v, newval);
+ MUTEX_UNLOCK(env, mtx);
+
+ return (ret);
+diff --git a/mutex/mut_tas.c b/mutex/mut_tas.c
+index f3922e0..934a654 100644
+--- a/mutex/mut_tas.c
++++ b/mutex/mut_tas.c
+@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags)
+
+ #ifdef HAVE_SHARED_LATCHES
+ if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+- atomic_init(&mutexp->sharecount, 0);
++ bdb_atomic_init(&mutexp->sharecount, 0);
+ else
+ #endif
+ if (MUTEX_INIT(&mutexp->tas)) {
+@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex)
+ F_CLR(mutexp, DB_MUTEX_LOCKED);
+ /* Flush flag update before zeroing count */
+ MEMBAR_EXIT();
+- atomic_init(&mutexp->sharecount, 0);
++ bdb_atomic_init(&mutexp->sharecount, 0);
+ } else {
+ DB_ASSERT(env, sharecount > 0);
+ MEMBAR_EXIT();
diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake
index 5d47b7a6fab11e..93d89fb3ebd8c2 100644
--- a/ports/berkeleydb/portfile.cmake
+++ b/ports/berkeleydb/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
+ PATCHES fix-conflict-macro.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/bfgroup-lyra/CONTROL b/ports/bfgroup-lyra/CONTROL
index 6a4d896f1fd483..ed2976f25aca3e 100644
--- a/ports/bfgroup-lyra/CONTROL
+++ b/ports/bfgroup-lyra/CONTROL
@@ -1,4 +1,4 @@
Source: bfgroup-lyra
-Version: 1.3
+Version: 1.5
Homepage: https://bfgroup.github.io/Lyra/
Description: A simple to use, composable, command line parser for C++ 11 and beyond
diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake
index edcbc939f1f922..cdb4662fe5770c 100644
--- a/ports/bfgroup-lyra/portfile.cmake
+++ b/ports/bfgroup-lyra/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO bfgroup/Lyra
- REF 9e31b213ffd8c66414623f0b26614326a5e12853 # 1.3
- SHA512 03ff1bfa19bd4dfb00cb864fac5275b075bc0b3c817d2598338b7b957d571799e531cd851cd451d2896ed920dc3037edd22dc14826b343ff6f76bfa2a7982589
+ REF 1.5
+ SHA512 1f8e505a487a9421a59afed0ee0c68894fb479117ac20c0bbb8d77ccf50ab938a68c93068f26871b9ddff0a21732d8bb1c6cc997b295a2a39c9363d32e320b3b
HEAD_REF master
)
diff --git a/ports/bigint/CMakeLists.txt b/ports/bigint/CMakeLists.txt
index e4cccbe12a4736..fffc9419278220 100644
--- a/ports/bigint/CMakeLists.txt
+++ b/ports/bigint/CMakeLists.txt
@@ -1,14 +1,11 @@
-cmake_minimum_required(VERSION 3.8.0)
-project(bigint)
+cmake_minimum_required(VERSION 3.14.0)
+project(bigint CXX)
if(MSVC)
- add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
+ add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS)
endif()
-include_directories(".")
-
-set(
- bigint_srcs
+set(BIGINT_SRCS
BigUnsigned.cc
BigInteger.cc
BigIntegerAlgorithms.cc
@@ -16,8 +13,7 @@ set(
BigIntegerUtils.cc
)
-set(
- bigint_hh
+set(BIGINT_HH
NumberlikeArray.hh
BigUnsigned.hh
BigInteger.hh
@@ -27,15 +23,20 @@ set(
BigIntegerUtils.hh
)
-add_library(bigint ${bigint_srcs})
+add_library(bigint ${BIGINT_SRCS})
+target_include_directories(bigint PUBLIC $ $)
+
+install(
+ TARGETS bigint
+ EXPORT bigint-config
+)
install(
- TARGETS bigint
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ EXPORT bigint-config
+ NAMESPACE bigint::
+ DESTINATION share/bigint
)
if(NOT DISABLE_INSTALL_HEADERS)
- install(FILES ${bigint_hh} DESTINATION include/bigint)
+ install(FILES ${BIGINT_HH} DESTINATION include/bigint)
endif()
diff --git a/ports/bigint/CONTROL b/ports/bigint/CONTROL
index b47401c79c100a..1f0d8f63b46e97 100644
--- a/ports/bigint/CONTROL
+++ b/ports/bigint/CONTROL
@@ -1,4 +1,5 @@
Source: bigint
-Version: 2010.04.30-4
+Version: 2010.04.30
+Port-Version: 6
Homepage: https://mattmccutchen.net/bigint
Description: C++ Big Integer Library
diff --git a/ports/bigint/fix-osx-usage.patch b/ports/bigint/fix-osx-usage.patch
new file mode 100644
index 00000000000000..f387d7b297b838
--- /dev/null
+++ b/ports/bigint/fix-osx-usage.patch
@@ -0,0 +1,39 @@
+diff --git a/BigUnsigned.hh b/BigUnsigned.hh
+index adf1c00..9228753 100644
+--- a/BigUnsigned.hh
++++ b/BigUnsigned.hh
+@@ -20,7 +20,7 @@ public:
+ typedef unsigned long Blk;
+
+ typedef NumberlikeArray::Index Index;
+- NumberlikeArray::N;
++ using NumberlikeArray::N;
+
+ protected:
+ // Creates a BigUnsigned with a capacity; for internal use.
+@@ -84,8 +84,8 @@ public:
+ // BIT/BLOCK ACCESSORS
+
+ // Expose these from NumberlikeArray directly.
+- NumberlikeArray::getCapacity;
+- NumberlikeArray::getLength;
++ using NumberlikeArray::getCapacity;
++ using NumberlikeArray::getLength;
+
+ /* Returns the requested block, or 0 if it is beyond the length (as if
+ * the number had 0s infinitely to the left). */
+diff --git a/BigUnsignedInABase.hh b/BigUnsignedInABase.hh
+index 8f9bdce..0ea89c6 100644
+--- a/BigUnsignedInABase.hh
++++ b/BigUnsignedInABase.hh
+@@ -100,8 +100,8 @@ public:
+ Base getBase() const { return base; }
+
+ // Expose these from NumberlikeArray directly.
+- NumberlikeArray::getCapacity;
+- NumberlikeArray::getLength;
++ using NumberlikeArray::getCapacity;
++ using NumberlikeArray::getLength;
+
+ /* Returns the requested digit, or 0 if it is beyond the length (as if
+ * the number had 0s infinitely to the left). */
diff --git a/ports/bigint/portfile.cmake b/ports/bigint/portfile.cmake
index 2a0a22adbe287e..7231697501a63d 100644
--- a/ports/bigint/portfile.cmake
+++ b/ports/bigint/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
@@ -11,6 +9,7 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
+ PATCHES fix-osx-usage.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -22,5 +21,6 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets()
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/bigint RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index d9198b970beb8b..94d148368f7bce 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,5 +1,6 @@
Source: blaze
-Version: 3.7
-Build-Depends: clapack (!osx), boost-exception
+Version: 3.8
+Port-Version: 1
+Build-Depends: lapack, boost-exception
Homepage: https://bitbucket.org/blaze-lib/blaze
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/blaze/fix-vm-build.patch b/ports/blaze/fix-vm-build.patch
new file mode 100644
index 00000000000000..3936299e0a7a26
--- /dev/null
+++ b/ports/blaze/fix-vm-build.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5ab1f460..a23c6dbf5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,12 +145,13 @@ if (${BLAZE_CACHE_SIZE_AUTO})
+ endif (flag EQUAL 0)
+ endif (APPLE)
+
+- if (flag)
++ string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp
++
++ if (flag OR NOT tmp)
+ message("Cache size not found automatically. Using default value as cache size.")
+ set(tmp ${BLAZE_CACHE_SIZE_DEFAULT})
+ endif (flag)
+
+- string(REGEX MATCH "([0-9][0-9]+)" tmp ${tmp}) # Get a number containing at least 2 digits in the string tmp
+ math(EXPR BLAZE_CACHE_SIZE ${tmp}*1024) # Convert to bytes (assuming that the value is given in kibibytes)
+
+ endif (${BLAZE_CACHE_SIZE_AUTO})
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index 96d1d165e21415..8ef5792fd1891b 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -1,9 +1,11 @@
vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
REPO blaze-lib/blaze
- REF e9724478a5fd29b9c2f8c45f0be95ad774ab4d4f
- SHA512 d1699fffe3013d571e34cf5444714647428be257cad90c4bc6cca8051702ff6d086eb731dca408faaf83b9311df4138f55187673235128fcd3c03029af337a75
+ REF 0380370f0626de2ad0ec7ea815803e22bbf6b42e
+ SHA512 47df2a291febf0565787ed9c4222ee1958d03c5b76c54923e4d8e44f75321c266e81d69ba4512a4ab07d7e431c065d025e01269cf9c1d5f0927f133885def4c7
HEAD_REF master
+ PATCHES
+ fix-vm-build.patch
)
vcpkg_configure_cmake(
diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake
index 8862ba28be0a7e..99edda698bbfdf 100644
--- a/ports/blend2d/portfile.cmake
+++ b/ports/blend2d/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_ARCH "wasm32" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO blend2d/blend2d
- REF 9e6686c0760135cc54dfd3e9e239ceac07cddb78
- SHA512 475a7fa4de4728e0c41d97e759d5c74fe5d66d28169614a9081a461fdc27e1f1c4db438d7e2a5cd9170489bbb7e352d73ec46d8bde45ff7c4a024c35fdb43e5f
+ REF 960fe2fa6c93b1026a10e3db15e06db77d6817a3
+ SHA512 232546d17de7f7f2f6a67ba2d88d1fca30ac6d9199216f98294e1bd0ec4e9dd33cc78a262f89da3ba1f433e9efbecded5866ddbc20f150c6a804c02687650270
HEAD_REF master
)
@@ -21,8 +21,8 @@ if(NOT BLEND2D_BUILD_NO_JIT)
vcpkg_from_github(
OUT_SOURCE_PATH ASMJIT_SOURCE_PATH
REPO asmjit/asmjit
- REF 2de7e742443e23b925b830c415268ce1470341ce
- SHA512 40ec1ec5540a20530e795c0e425322ed027d2e6e400f8f1ee1426e256ea0f3cf2e241972cdbda2f2d8e9fad06ba0ba12f0dcff9a09aa5da65cb3d01e19079966
+ REF 8f25116f2bea8f5e0604dae867be817e3f12bac1
+ SHA512 708ddb7bcd73e76e6485330f8935d64bbe27d526807fb877234303032247dc900751963c935d2a391fddb133eea6ae4300ade061d9202ed7f767e388e379abc8
HEAD_REF master
)
diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json
index e8940a0eeb5c1a..d61e3f4cec119b 100644
--- a/ports/blend2d/vcpkg.json
+++ b/ports/blend2d/vcpkg.json
@@ -1,10 +1,15 @@
{
"name": "blend2d",
- "version-string": "beta_2020-07-09",
- "port-version": 0,
+ "version-string": "beta_2020-08-24",
"description": "Beta 2D Vector Graphics Powered by a JIT Compiler",
"homepage": "https://github.com/blend2d/blend2d",
"documentation": "https://blend2d.com/doc/index.html",
+ "supports": "!(arm | uwp)",
+ "default-features": [
+ "jit",
+ "logging",
+ "tls"
+ ],
"features": [
{
"name": "jit",
@@ -18,11 +23,5 @@
"name": "tls",
"description": "Default feature. Enables use of thread_local feature. Disable for platforms where thread local storage is expensive or not supported."
}
- ],
- "default-features": [
- "jit",
- "logging",
- "tls"
- ],
- "supports": "!(arm|uwp)"
+ ]
}
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL
index eaf174e23e5962..94d5cd3f7a1284 100644
--- a/ports/bond/CONTROL
+++ b/ports/bond/CONTROL
@@ -1,5 +1,5 @@
Source: bond
-Version: 9.0.0
+Version: 9.0.2
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
diff --git a/ports/bond/fix-install-path.patch b/ports/bond/fix-install-path.patch
index e5fa270c192374..643e0cfbfbf0d3 100644
--- a/ports/bond/fix-install-path.patch
+++ b/ports/bond/fix-install-path.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f8eaa..1b0c01c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ set (BOND_FIND_RAPIDJSON
+@@ -23,7 +23,7 @@ set (BOND_FIND_RAPIDJSON
# settings so that we don't apply our settings to third-party code.
add_subdirectory (thirdparty)
@@ -11,7 +11,7 @@ index f2f8eaa..1b0c01c 100644
set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl)
set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc)
-@@ -80,6 +80,6 @@ if (BOND_GBC_PATH)
+@@ -85,6 +85,6 @@ if (BOND_GBC_PATH)
install (
FILES ${BOND_GBC_PATH}
@@ -35,7 +35,7 @@ index 1dff9d0..9a11575 100644
@@ -130,7 +130,7 @@ endif()
install (FILES ${output}
- PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+ PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION bin)
+ DESTINATION ${completion_dir})
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index 903ca0f462372a..9a1485baca272b 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -1,12 +1,12 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-set(BOND_VER 9.0.0)
+set(BOND_VER 9.0.2)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/bond
REF ${BOND_VER}
- SHA512 b6bed9be8b5dd2a7d50c6bd275b94c62050b83717907522a07279cccc50e209306792c6f3c7f206afcb3226aed21b43b115b63dccc806eff5d9cd4e12b355461
+ SHA512 ece636bc06e7bac4208d373610e689f19b394cae4eaa869f32b098924a6e7034e4d804d4831d7f6fd2540a619daf77f4ab43c49aa442a9cd26161b0a8a2db000
HEAD_REF master
PATCHES fix-install-path.patch skip-grpc-compilation.patch
)
@@ -15,7 +15,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_download_distfile(GBC_ARCHIVE
URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip"
FILENAME "gbc-${BOND_VER}-amd64.zip"
- SHA512 f4480a3eb7adedfd3da554ef3cdc64b6e7da5c699bde0ccd86b2dd6a159ccacbb1df2b84b6bc80bc8475f30b904cba98085609e42aad929b2b23258eaff52048
+ SHA512 661d63a82284d3ecbc7b50d5f4972dadeb607f96612108a4a0887c6684a418e8b265516354504ca3440a182d1e31f2eb5861531133b455d8b6c01aec45ade5d3
)
# Clear the generator to prevent it from updating
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL
index 641ca4aa91d2c5..63823d2a448593 100644
--- a/ports/boost-asio/CONTROL
+++ b/ports/boost-asio/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-asio
Version: 1.73.0
-Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
+Port-Version: 1
+Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!arm&!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
Homepage: https://github.com/boostorg/asio
Description: Boost asio module
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL
index 087970deab9dc7..036631336f6d9d 100644
--- a/ports/boost-build/CONTROL
+++ b/ports/boost-build/CONTROL
@@ -1,4 +1,6 @@
Source: boost-build
-Version: 1.73.0-1
+Version: 1.73.0
+Port-Version: 4
Homepage: https://github.com/boostorg/build
Description: Boost.Build
+Build-Depends: boost-uninstall
\ No newline at end of file
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake
index 7633f51aaa1fbf..bad139ac22728e 100644
--- a/ports/boost-build/portfile.cmake
+++ b/ports/boost-build/portfile.cmake
@@ -2,9 +2,7 @@ include(vcpkg_common_functions)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
- return()
-elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
+if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
return()
endif()
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL
index 2180441f3a062d..a6ba3fa04eb571 100644
--- a/ports/boost-context/CONTROL
+++ b/ports/boost-context/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-context
-Version: 1.73.0-1
+Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/context
Description: Boost context module
+Supports: !uwp
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL
index b8a67d5b823c18..95851da832e5f3 100644
--- a/ports/boost-coroutine/CONTROL
+++ b/ports/boost-coroutine/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-coroutine
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-range, boost-system, boost-thread, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/coroutine
Description: Boost coroutine module
+Supports: !arm&!uwp
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL
index 22acacfbe5fb5e..4db73b41e91174 100644
--- a/ports/boost-fiber/CONTROL
+++ b/ports/boost-fiber/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-fiber
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/fiber
Description: Boost fiber module
+Supports: !osx&!uwp&!arm
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL
index 09e2a8e6ce7299..3a2b3239089846 100644
--- a/ports/boost-filesystem/CONTROL
+++ b/ports/boost-filesystem/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-filesystem
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi
Homepage: https://github.com/boostorg/filesystem
Description: Boost filesystem module
+Supports: !uwp
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL
index d08ab59fb44772..cd05cb7de8d9f8 100644
--- a/ports/boost-graph-parallel/CONTROL
+++ b/ports/boost-graph-parallel/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-graph-parallel
Version: 1.73.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Port-Version: 1
+Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/graph_parallel
Description: Boost graph_parallel module
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL
index b62a07c060aa07..7f521ec3476d82 100644
--- a/ports/boost-iostreams/CONTROL
+++ b/ports/boost-iostreams/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-iostreams
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd
Homepage: https://github.com/boostorg/iostreams
Description: Boost iostreams module
+Supports: !uwp
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL
index d7c8d7c0fa7097..5260cea4c5aacd 100644
--- a/ports/boost-locale/CONTROL
+++ b/ports/boost-locale/CONTROL
@@ -1,9 +1,11 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-locale
-Version: 1.73.0-1
+Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
Homepage: https://github.com/boostorg/locale
Description: Boost locale module
+Supports: !uwp
Feature: icu
Build-Depends: icu
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL
index c4aa6be65d0b2f..33fc046e7b4c35 100644
--- a/ports/boost-log/CONTROL
+++ b/ports/boost-log/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-log
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-align, boost-array, boost-asio, boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive
Homepage: https://github.com/boostorg/log
Description: Boost log module
+Supports: !uwp
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index 05a1762a037b99..852430dc9b476a 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -35,6 +35,14 @@ else()
list(APPEND B2_OPTIONS address-model=32)
endif()
+if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x")
+ list(APPEND B2_OPTIONS architecture=s390x)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+ list(APPEND B2_OPTIONS architecture=arm)
+else()
+ list(APPEND B2_OPTIONS architecture=x86)
+endif()
+
if(APPLE)
list(APPEND B2_OPTIONS target-os=darwin toolset=clang)
elseif(WIN32)
@@ -91,7 +99,11 @@ if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)
endif()
endif()
if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
- set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ else()
+ set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ endif()
endif()
if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
@@ -158,7 +170,6 @@ add_custom_target(boost ALL
--hash
-q
- architecture=x86
threading=multi
debug-symbols=on
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 29c1d24c81f078..b39ec5f4221afc 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,3 +1,4 @@
Source: boost-modular-build-helper
Version: 1.73.0
-Port-Version: 2
+Port-Version: 5
+Build-Depends: boost-uninstall
\ No newline at end of file
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam
index 884284b499510b..8d7d1e35019cf5 100644
--- a/ports/boost-modular-build-helper/Jamroot.jam
+++ b/ports/boost-modular-build-helper/Jamroot.jam
@@ -36,8 +36,7 @@ if "@PORT@" != "boost-system"
{
use-project /boost/system : . ;
- lib boost_system : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_system : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_system : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_system ;
use-project /boost : . ;
@@ -48,8 +47,7 @@ if "@PORT@" != "boost-chrono"
{
use-project /boost/chrono : . ;
- lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_chrono ;
}
@@ -57,8 +55,7 @@ if "@PORT@" != "boost-regex"
{
use-project /boost/regex : . ;
- lib boost_regex : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_regex : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_regex : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_regex ;
}
@@ -66,8 +63,7 @@ if "@PORT@" != "boost-date-time"
{
use-project /boost/date_time : . ;
- lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_RELEASE_SUFFIX@" release -/boost/date_time//boost_date_time ;
- lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_DEBUG_SUFFIX@" debug -/boost/date_time//boost_date_time ;
+ lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_SUFFIX@" @VARIANT@ -/boost/date_time//boost_date_time ;
explicit boost_date_time ;
}
@@ -75,8 +71,7 @@ if "@PORT@" != "boost-thread"
{
use-project /boost/thread : . ;
- lib boost_thread : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/date_time//boost_date_time ;
- lib boost_thread : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/date_time//boost_date_time ;
+ lib boost_thread : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_SUFFIX@" @VARIANT@ : : /boost/date_time//boost_date_time ;
explicit boost_thread ;
}
@@ -84,8 +79,7 @@ if "@PORT@" != "boost-timer"
{
use-project /boost/timer : . ;
- lib boost_timer : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_timer : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_timer : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_timer ;
}
@@ -93,8 +87,7 @@ if "@PORT@" != "boost-filesystem"
{
use-project /boost/filesystem : . ;
- lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/system//boost_system ;
- lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/system//boost_system ;
+ lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_SUFFIX@" @VARIANT@ : : /boost/system//boost_system ;
explicit boost_filesystem ;
}
@@ -102,8 +95,7 @@ if "@PORT@" != "boost-atomic"
{
use-project /boost/atomic : . ;
- lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_atomic ;
}
@@ -114,8 +106,7 @@ if "@PORT@" != "boost-context"
use-project /boost/context : . ;
- lib boost_context : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_context : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_context : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_context ;
}
@@ -123,8 +114,7 @@ if "@PORT@" != "boost-test"
{
use-project /boost/test : . ;
- lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_unit_test_framework ;
}
@@ -132,8 +122,7 @@ if "@PORT@" != "boost-serialization"
{
use-project /boost/serialization : . ;
- lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@" release ;
- lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@" debug ;
+ lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_SUFFIX@" @VARIANT@ ;
explicit boost_serialization ;
}
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 1ce6ad1cc72da3..26784ed26f5ee4 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -4,7 +4,7 @@ function(boost_modular_build)
if(NOT DEFINED _bm_SOURCE_PATH)
message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.")
endif()
-
+
# Next CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT}
set(B2_OPTIONS)
set(B2_OPTIONS_DBG)
@@ -18,10 +18,16 @@ function(boost_modular_build)
# Todo: this serves too similar a purpose as vcpkg_find_acquire_program()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
- set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x64-linux/tools/boost-build")
+ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm64-linux/tools/boost-build")
+ else()
+ set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x64-linux/tools/boost-build")
+ endif()
+ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")
+ set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../arm-linux/tools/boost-build")
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
- elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+ elseif(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x")
get_filename_component(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/../x86-windows/tools/boost-build" ABSOLUTE)
else()
set(BOOST_BUILD_PATH "${CURRENT_INSTALLED_DIR}/tools/boost-build")
@@ -29,9 +35,17 @@ function(boost_modular_build)
if(NOT EXISTS "${BOOST_BUILD_PATH}")
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
- message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.")
+ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ message(FATAL_ERROR "The arm64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:arm64-linux`.")
+ else()
+ message(FATAL_ERROR "The x64 boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:x64-linux`.")
+ endif()
else()
- message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")
+ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "armv7l")
+ message(FATAL_ERROR "The arm boost-build tools must be installed to build arm64 for Linux. Please run `vcpkg install boost-build:arm-linux`.")
+ else()
+ message(FATAL_ERROR "The x86 boost-build tools must be installed to build for non-x86/x64 platforms. Please run `vcpkg install boost-build:x86-windows`.")
+ endif()
endif()
endif()
@@ -51,8 +65,13 @@ function(boost_modular_build)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(BOOST_LIB_PREFIX)
- set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib)
- set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib)
+ if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
+ set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib)
+ set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib)
+ elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib)
+ set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib)
+ endif()
else()
set(BOOST_LIB_PREFIX lib)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -81,15 +100,20 @@ function(boost_modular_build)
file(WRITE ${_bm_SOURCE_PATH}/build/Jamfile.v2 "${_contents}")
endif()
- configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
# if(EXISTS "${CURRENT_INSTALLED_DIR}/share/boost-config/checks")
# file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${_bm_SOURCE_PATH}/build/config")
# endif()
# if(EXISTS "${CURRENT_INSTALLED_DIR}/share/boost-predef/check")
# file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-predef/check" DESTINATION "${_bm_SOURCE_PATH}/build/predef")
# endif()
-
- if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+
+ function(unix_build BOOST_LIB_SUFFIX BUILD_TYPE BUILD_LIB_PATH)
+ message(STATUS "Building ${BUILD_TYPE}...")
+ set(BOOST_LIB_SUFFIX ${BOOST_LIB_SUFFIX})
+ set(VARIANT ${BUILD_TYPE})
+ set(BUILD_LIB_PATH ${BUILD_LIB_PATH})
+ configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
+
set(configure_option)
if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
@@ -107,6 +131,16 @@ function(boost_modular_build)
${configure_option}
)
vcpkg_install_cmake()
+ endfunction()
+
+ if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/")
+ endif()
+
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/")
+ endif()
if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib)
message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.")
@@ -184,7 +218,7 @@ function(boost_modular_build)
-sZSTD_BINARY=zstdd
"-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib"
)
-
+
set(B2_OPTIONS_REL
-sZLIB_BINARY=zlib
"-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib"
@@ -252,6 +286,8 @@ function(boost_modular_build)
list(APPEND B2_OPTIONS address-model=32 architecture=arm)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
list(APPEND B2_OPTIONS address-model=64 architecture=arm)
+ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x")
+ list(APPEND B2_OPTIONS address-model=64 architecture=s390x)
else()
list(APPEND B2_OPTIONS address-model=32 architecture=x86)
endif()
@@ -281,7 +317,9 @@ function(boost_modular_build)
configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
- list(APPEND B2_OPTIONS toolset=msvc)
+ list(APPEND _bm_OPTIONS toolset=msvc)
+ elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
+ list(APPEND _bm_OPTIONS toolset=msvc)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
list(APPEND B2_OPTIONS toolset=gcc)
else()
@@ -293,6 +331,10 @@ function(boost_modular_build)
######################
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
message(STATUS "Building ${TARGET_TRIPLET}-rel")
+ set(BOOST_LIB_SUFFIX ${BOOST_LIB_RELEASE_SUFFIX})
+ set(VARIANT "release")
+ set(BUILD_LIB_PATH "lib/")
+ configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
set(ENV{BOOST_BUILD_PATH} "${BOOST_BUILD_PATH}")
vcpkg_execute_required_process(
COMMAND "${B2_EXE}"
@@ -311,6 +353,10 @@ function(boost_modular_build)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
+ set(BOOST_LIB_SUFFIX ${BOOST_LIB_DEBUG_SUFFIX})
+ set(VARIANT debug)
+ set(BUILD_LIB_PATH "debug/lib/")
+ configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
set(ENV{BOOST_BUILD_PATH} "${BOOST_BUILD_PATH}")
vcpkg_execute_required_process(
COMMAND "${B2_EXE}"
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL
index e50c43848c4f46..afd55f519a2293 100644
--- a/ports/boost-mpi/CONTROL
+++ b/ports/boost-mpi/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-mpi
Version: 1.73.0
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi
+Port-Version: 1
+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-python (!uwp&!(arm&windows)), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi
Homepage: https://github.com/boostorg/mpi
Description: Boost mpi module
diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL
index 2b33da28798f84..cba56b9e662722 100644
--- a/ports/boost-parameter-python/CONTROL
+++ b/ports/boost-parameter-python/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-parameter-python
Version: 1.73.0
-Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python, boost-vcpkg-helpers
+Port-Version: 1
+Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (!uwp&!(arm&windows)), boost-vcpkg-helpers
Homepage: https://github.com/boostorg/parameter_python
Description: Boost parameter_python module
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL
index 9c98aae6cfa3ac..30d96babe6e14a 100644
--- a/ports/boost-poly-collection/CONTROL
+++ b/ports/boost-poly-collection/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-poly-collection
Version: 1.73.0
-Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure (!arm), boost-type-traits, boost-vcpkg-helpers
+Port-Version: 1
+Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure, boost-type-traits, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/poly_collection
Description: Boost poly_collection module
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL
index 011f68fcde437c..a8698deaaf6bca 100644
--- a/ports/boost-python/CONTROL
+++ b/ports/boost-python/CONTROL
@@ -1,9 +1,11 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
Homepage: https://github.com/boostorg/python
Description: Boost python module
+Supports: !uwp&!(arm&windows)
Feature: python2
Build-Depends: python2 (windows)
diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL
index ec3fb47d42f988..1cbd56ef8dccc1 100644
--- a/ports/boost-safe-numerics/CONTROL
+++ b/ports/boost-safe-numerics/CONTROL
@@ -1,6 +1,7 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-safe-numerics
Version: 1.73.0
-Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers
+Port-Version: 1
+Build-Depends: boost-concept-check, boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/safe_numerics
Description: Boost safe_numerics module
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL
index 6b726dbad7ff8c..17cd4eb40c8cdc 100644
--- a/ports/boost-stacktrace/CONTROL
+++ b/ports/boost-stacktrace/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-stacktrace
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
Homepage: https://github.com/boostorg/stacktrace
Description: Boost stacktrace module
+Supports: !uwp
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL
index e20a2c343015f0..8ef2c2b11236b6 100644
--- a/ports/boost-test/CONTROL
+++ b/ports/boost-test/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-test
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/test
Description: Boost test module
+Supports: !uwp
diff --git a/ports/boost-uninstall/CONTROL b/ports/boost-uninstall/CONTROL
new file mode 100644
index 00000000000000..8556583a3ee40b
--- /dev/null
+++ b/ports/boost-uninstall/CONTROL
@@ -0,0 +1,4 @@
+Source: boost-uninstall
+Version: 1.73.0
+Homepage: https://boost.org
+Description: boost uninstall port
\ No newline at end of file
diff --git a/ports/boost-uninstall/portfile.cmake b/ports/boost-uninstall/portfile.cmake
new file mode 100644
index 00000000000000..a06925e40896de
--- /dev/null
+++ b/ports/boost-uninstall/portfile.cmake
@@ -0,0 +1,4 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+message(STATUS "\nPlease use the following command when you need to remove all boost ports/components:\n\
+ \"./vcpkg remove boost-uninstall:${TARGET_TRIPLET} --recurse\"\n")
diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL
index 9069917a2f86d5..1b1642e17406b5 100644
--- a/ports/boost-vcpkg-helpers/CONTROL
+++ b/ports/boost-vcpkg-helpers/CONTROL
@@ -1,3 +1,5 @@
Source: boost-vcpkg-helpers
Version: 7
+Port-Version: 1
Description: a set of vcpkg-internal scripts used to modularize boost
+Build-Depends: boost-uninstall
\ No newline at end of file
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL
index 538e8772caee4f..7ed072e39b7179 100644
--- a/ports/boost-wave/CONTROL
+++ b/ports/boost-wave/CONTROL
@@ -1,6 +1,8 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-wave
Version: 1.73.0
+Port-Version: 1
Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/wave
Description: Boost wave module
+Supports: !uwp
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 5094237daa2e0c..8a77879f23ca3e 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,9 +1,11 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost
Version: 1.73.0
+Port-Version: 3
Homepage: https://boost.org
Description: Peer-reviewed portable C++ source libraries
-Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python, boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract, boost-conversion, boost-convert, boost-core, boost-coroutine (!arm&!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (!osx&!uwp&!arm), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-nowide, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python, boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (!uwp&!(arm&windows)), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-static-string, boost-system, boost-test (!uwp), boost-thread, boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure, boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-variant2, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
+
Feature: mpi
Description: Build with MPI support
diff --git a/ports/boringssl/0002-disable-waring-4065.patch b/ports/boringssl/0002-disable-waring-4065.patch
new file mode 100644
index 00000000000000..88ffffaf0bdaea
--- /dev/null
+++ b/ports/boringssl/0002-disable-waring-4065.patch
@@ -0,0 +1,15 @@
+diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
+index ef95a6b..0b52c05 100644
+--- a/decrepit/CMakeLists.txt
++++ b/decrepit/CMakeLists.txt
+@@ -40,6 +40,10 @@ add_executable(
+
+ add_dependencies(decrepit_test global_target)
+
++if(MSVC)
++ target_compile_options(decrepit PRIVATE /wd4065)
++endif()
++
+ target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit
+ crypto)
+ if(WIN32)
diff --git a/ports/boringssl/CONTROL b/ports/boringssl/CONTROL
index fb8d41ce7d532c..1c8c4dcbf6b9c2 100644
--- a/ports/boringssl/CONTROL
+++ b/ports/boringssl/CONTROL
@@ -1,5 +1,6 @@
Source: boringssl
Version: 2020-04-07
+Port-Version: 2
Homepage: https://boringssl.googlesource.com/boringssl
Description: BoringSSl is a fork of OpenSSL developed by Google
Supports: !uwp
diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake
index a4b5acbc49ea81..80068da8d05b96 100644
--- a/ports/boringssl/portfile.cmake
+++ b/ports/boringssl/portfile.cmake
@@ -1,9 +1,7 @@
vcpkg_fail_port_install(ON_TARGET "UWP")
if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
- message(WARNING "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL")
- set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
- return()
+ message(FATAL_ERROR "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL")
endif()
vcpkg_find_acquire_program(PERL)
@@ -30,6 +28,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
0001-vcpkg.patch
+ 0002-disable-waring-4065.patch
)
vcpkg_configure_cmake(
diff --git a/ports/box2d/CONTROL b/ports/box2d/CONTROL
index a7e4b7f1cee015..909dc4c1ab1b8e 100644
--- a/ports/box2d/CONTROL
+++ b/ports/box2d/CONTROL
@@ -1,4 +1,5 @@
Source: box2d
-Version: 2019-12-31
+Version: 2.4.0
Description: An open source C++ engine for simulating rigid bodies in 2D.
Homepage: https://box2d.org
+Supports: !uwp
diff --git a/ports/box2d/portfile.cmake b/ports/box2d/portfile.cmake
index c930f41b9b4d24..3b931cb3fa179f 100644
--- a/ports/box2d/portfile.cmake
+++ b/ports/box2d/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO erincatto/Box2D
- REF 37e2dc25f8da158abda10324d75cb4d1db009adf
- SHA512 c9021b6bbc8ee405e38418bdadc136814fb66d5f4928ffd06d2ed016751613ecc3e82e7f60851fdc7a2e13594f68c21e7b7adb06d35a5a02314235132556d174
+ REF 4d7757feedc9dd36f64393ae08acfd3b9600ac17 #v2.4.0
+ SHA512 197f701016c91fda944328e7d867f0a5baa152cce53fa35826986923456af593595bad884008944e041d9ac2e1d769a54eaad4142e19b42a3bb2a2010d814cc9
HEAD_REF master
PATCHES
export-targets.patch
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index ff152f83bd8274..7db9ffb6c56736 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,4 +1,5 @@
Source: brotli
-Version: 1.0.7-1
+Version: 1.0.7
+Port-Version: 3
Homepage: https://github.com/google/brotli
Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/pkgconfig.patch b/ports/brotli/pkgconfig.patch
new file mode 100644
index 00000000000000..8ceafe1b10125a
--- /dev/null
+++ b/ports/brotli/pkgconfig.patch
@@ -0,0 +1,73 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c4b757f9..eed560c1d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -351,7 +351,7 @@ function(generate_pkg_config_path outvar path)
+ set("${outvar}" "${${outvar}}" PARENT_SCOPE)
+ endfunction(generate_pkg_config_path)
+
+-function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
++function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION SHARED_TARGET STATIC_TARGET)
+ file(READ ${INPUT_FILE} TEXT)
+
+ set(PREFIX "${CMAKE_INSTALL_PREFIX}")
+@@ -366,14 +366,21 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+
+ string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
+
++ if(BUILD_SHARED_LIBS)
++ set(LIB_NAME "${SHARED_TARGET}")
++ else()
++ set(LIB_NAME "${STATIC_TARGET}")
++ endif()
++ string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT})
++
+ file(WRITE ${OUTPUT_FILE} ${TEXT})
+ endfunction()
+
+-transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}")
++transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}" brotlicommon brotlicommon-static)
+
+-transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}")
++transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}" brotlidec brotlidec-static)
+
+-transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
++transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static)
+
+ if(NOT BROTLI_BUNDLED_MODE)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc"
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 2a8cf7a35..464a21292 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lbrotlicommon
++Libs: -L${libdir} -l@lib_name@
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index 6f8ef2e41..f87d3f65f 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lbrotlidec
++Libs: -L${libdir} -l@lib_name@
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 2098afe2c..7b6371bcb 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lbrotlienc
++Libs: -L${libdir} -l@lib_name@
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index 6fa75937c1fce4..81960a9ee83ce7 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
install.patch
fix-arm-uwp.patch
+ pkgconfig.patch
)
vcpkg_configure_cmake(
@@ -21,6 +22,8 @@ vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
+vcpkg_fixup_pkgconfig()
+
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/brpc/CONTROL b/ports/brpc/CONTROL
new file mode 100644
index 00000000000000..39860698135c2b
--- /dev/null
+++ b/ports/brpc/CONTROL
@@ -0,0 +1,6 @@
+Source: brpc
+Version: 0.9.7
+Homepage: https://github.com/apache/incubator-brpc
+Description: Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called "baidu-rpc" inside Baidu.
+Build-Depends: leveldb, gflags, glog, protobuf[zlib], openssl, thrift
+Supports: !windows
diff --git a/ports/brpc/fix_boost_ptr.patch b/ports/brpc/fix_boost_ptr.patch
new file mode 100644
index 00000000000000..4ced79422bc7ce
--- /dev/null
+++ b/ports/brpc/fix_boost_ptr.patch
@@ -0,0 +1,14 @@
+diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp
+index eae081a0..39c92338 100755
+--- a/src/brpc/policy/thrift_protocol.cpp
++++ b/src/brpc/policy/thrift_protocol.cpp
+@@ -45,8 +45,7 @@
+ #if defined(_THRIFT_STDCXX_H_)
+ # define THRIFT_STDCXX apache::thrift::stdcxx
+ #else
+- # define THRIFT_STDCXX boost
+- # include
++ # define THRIFT_STDCXX std
+ #endif
+ #endif
+
diff --git a/ports/brpc/fix_thrift.patch b/ports/brpc/fix_thrift.patch
new file mode 100644
index 00000000000000..699f42fb0aa0b9
--- /dev/null
+++ b/ports/brpc/fix_thrift.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3deb7342..737f6a70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,8 +62,10 @@ if(WITH_DEBUG_SYMBOLS)
+ endif()
+
+ if(WITH_THRIFT)
++ find_package(Thrift CONFIG REQUIRED)
++ # target_link_libraries(main PRIVATE thrift::thrift thriftz::thriftz thriftnb::thriftnb)
+ set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL")
+- set(THRIFT_LIB "thrift")
++ set(THRIFT_LIB "thrift::thrift")
+ endif()
+
+ include(GNUInstallDirs)
+@@ -196,9 +198,10 @@ set(DYNAMIC_LIB
+ ${LEVELDB_LIB}
+ ${PROTOC_LIB}
+ ${CMAKE_THREAD_LIBS_INIT}
++ ${OPENSSL_CRYPTO_LIBRARY}
++ ${OPENSSL_SSL_LIBRARY}
+ ${THRIFT_LIB}
+ ${THRIFTNB_LIB}
+- ${OPENSSL_CRYPTO_LIBRARY}
+ dl
+ z)
+
diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake
new file mode 100644
index 00000000000000..3a1c1dce73eb00
--- /dev/null
+++ b/ports/brpc/portfile.cmake
@@ -0,0 +1,31 @@
+vcpkg_fail_port_install(ON_TARGET "windows")
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO apache/incubator-brpc
+ REF 1d6510aa50075cade5ed539ee09a11a1b8d7f990 # 0.9.7
+ SHA512 9c9dbe2a202e58586010c56634bd371f6a9e3ff0d8c5341abbabd1f1dd204a3aec5e89061fa326b4fc8ae7202f9fc33f93a5acd845d18dab3915a3e2b81cbaf3
+ HEAD_REF master
+ PATCHES
+ fix_boost_ptr.patch
+ fix_thrift.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DWITH_THRIFT=ON
+ -DWITH_MESALINK=OFF
+ -DWITH_GLOG=ON
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfasthash")
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL
deleted file mode 100644
index 695925c073b7c5..00000000000000
--- a/ports/bzip2/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: bzip2
-Version: 1.0.6-5
-Homepage: http://www.bzip.org/
-Description: High-quality data compressor.
diff --git a/ports/bzip2/bzip2.pc.in b/ports/bzip2/bzip2.pc.in
new file mode 100644
index 00000000000000..91153c13b532be
--- /dev/null
+++ b/ports/bzip2/bzip2.pc.in
@@ -0,0 +1,11 @@
+prefix=@BZIP2_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: bzip2
+Description: bzip2
+Version: 1.0.6
+Requires:
+Libs: -L${libdir} -l@bzname@
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/ports/bzip2/fix-windows-include.patch b/ports/bzip2/fix-windows-include.patch
deleted file mode 100644
index 11797ad2f8eed5..00000000000000
--- a/ports/bzip2/fix-windows-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN bzip2-1.0.6-orig/bzip2.c bzip2-1.0.6/bzip2.c
---- bzip2-1.0.6-orig/bzip2.c 2010-09-11 02:04:53.000000000 +0300
-+++ bzip2-1.0.6/bzip2.c 2019-11-04 11:40:52.230652175 +0200
-@@ -128,7 +128,7 @@
- #if BZ_LCCWIN32
- # include
- # include
--# include
-+# include
-
- # define NORETURN /**/
- # define PATH_SEP '\\'
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 0462d53eb6f809..19314eb0ee6446 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,43 +1,46 @@
-include(vcpkg_common_functions)
-set(BZIP2_VERSION 1.0.6)
-vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
- FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
- SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
-
-vcpkg_extract_source_archive_ex(
- OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
- REF ${BZIP2_VERSION}
- PATCHES
- fix-import-export-macros.patch
- fix-windows-include.patch
-)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS_DEBUG
- -DBZIP2_SKIP_HEADERS=ON
- -DBZIP2_SKIP_TOOLS=ON
-)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-file(READ ${CURRENT_PACKAGES_DIR}/include/bzlib.h BZLIB_H)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")
-else()
- string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")
-endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")
-
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
-vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)
+vcpkg_from_git(
+ OUT_SOURCE_PATH SOURCE_PATH
+ URL https://sourceware.org/git/bzip2.git
+ REF 75a94bea3918e612b879d6a11ca64b8689526147 # REFERENCE BZIP2 VERSION 1.0.8
+ SHA512 4611105f9090477b5f6f6dbd303a282099df71644e04d8a998ef81de487f6c8cac4c0ec1283ad737f6767c51f1e3b4e24e2ee021c6dd085925617d9ed145b2ba
+ PATCHES
+ fix-import-export-macros.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS_DEBUG
+ -DBZIP2_SKIP_HEADERS=ON
+ -DBZIP2_SKIP_TOOLS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ string(REPLACE "defined(BZ_IMPORT)" "0" BZLIB_H "${BZLIB_H}")
+else()
+ string(REPLACE "defined(BZ_IMPORT)" "1" BZLIB_H "${BZLIB_H}")
+endif()
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/bzlib.h" "${BZLIB_H}")
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}")
+ set(bzname bz2)
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/bzip2.pc" @ONLY)
+endif()
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ set(BZIP2_PREFIX "${CURRENT_INSTALLED_DIR}/debug")
+ set(bzname bz2d)
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/bzip2.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/bzip2.pc" @ONLY)
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json
new file mode 100644
index 00000000000000..8c7520de83e597
--- /dev/null
+++ b/ports/bzip2/vcpkg.json
@@ -0,0 +1,8 @@
+{
+ "name": "bzip2",
+ "version-string": "1.0.8",
+ "port-version": 1,
+ "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
+ "homepage": "https://sourceware.org/bzip2/",
+ "documentation": "https://sourceware.org/bzip2/docs.html"
+}
diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL
index 69e9c1ae450d6a..1e0ca3624ee1d4 100644
--- a/ports/caf/CONTROL
+++ b/ports/caf/CONTROL
@@ -1,5 +1,5 @@
Source: caf
-Version: 0.17.3
+Version: 0.17.6
Homepage: https://github.com/actor-framework/actor-framework
Build-Depends: openssl
Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/fix-arm.patch b/ports/caf/fix-arm.patch
deleted file mode 100644
index 1c14287cc8b1e9..00000000000000
--- a/ports/caf/fix-arm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index da58790..d79a1ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,11 +99,13 @@ endfunction(pretty_yes)
-
- add_executable(caf-generate-enum-strings cmake/caf-generate-enum-strings.cpp)
-
-+install(TARGETS caf-generate-enum-strings DESTINATION tools)
-+
- function(enum_to_string relative_input_file relative_output_file)
- set(input "${CMAKE_CURRENT_SOURCE_DIR}/${relative_input_file}")
- set(output "${CMAKE_CURRENT_BINARY_DIR}/${relative_output_file}")
- add_custom_command(OUTPUT "${output}"
-- COMMAND caf-generate-enum-strings "${input}" "${output}"
-+ COMMAND ${CAF_TOOL_PATH}caf-generate-enum-strings "${input}" "${output}"
- DEPENDS caf-generate-enum-strings "${input}")
- endfunction()
-
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index c8ead37b41589f..2cd515007db978 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -18,12 +18,11 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO actor-framework/actor-framework
- REF b05a4b7b2a6f59b0508db84ea68e5ada2224f904 # 0.17.3
- SHA512 02b1598f5090674bc2ce4fdbcd70a4669c8c0710e98d910dbd77338c088cc87db4e0eeb3dd89100772ff4f74bdf09a7f70b8975d79c816e422dc34a356f8ba4e
+ REF f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6
+ SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65
HEAD_REF master
PATCHES
openssl-version-override.patch
- fix-arm.patch
)
vcpkg_configure_cmake(
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index 6470d8d09d5ab8..e333f304d23ce6 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -210,7 +210,7 @@ add_library(cairo ${SOURCES})
if (WITH_X11)
target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1)
endif()
-
+target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS})
target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig)
if(WIN32)
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 0eda86fac3f26b..6c26c77a250d5f 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,5 +1,6 @@
Source: cairo
-Version: 1.16.0-6
+Version: 1.16.0
+Port-Version: 7
Homepage: https://cairographics.org
Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
Build-Depends: zlib, libpng, pixman, freetype, fontconfig
diff --git a/ports/cairomm/CMakeLists.txt b/ports/cairomm/CMakeLists.txt
index 1274a643167533..1cc02978601678 100644
--- a/ports/cairomm/CMakeLists.txt
+++ b/ports/cairomm/CMakeLists.txt
@@ -15,6 +15,7 @@ string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" CAIROMM_MICRO_VERSION ${
message(STATUS "Ciaromm version: ${CAIROMM_MAJOR_VERSION}.${CAIROMM_MINOR_VERSION}.${CAIROMM_MICRO_VERSION}")
find_package(Cairo REQUIRED)
+find_package(Freetype REQUIRED)
find_package(SigC++ REQUIRED)
#configure
@@ -87,7 +88,7 @@ set(cairomm_rc
${CMAKE_BINARY_DIR}/cairomm.rc)
add_library(cairomm-1.0 ${cairomm_cc} ${cairomm_rc})
-target_link_libraries(cairomm-1.0 ${CAIRO_LIBRARY} ${SIGC++_LIBRARY} )
+target_link_libraries(cairomm-1.0 ${CAIRO_LIBRARY} ${SIGC++_LIBRARY} Freetype::Freetype)
target_include_directories(cairomm-1.0 PRIVATE
${CAIRO_INCLUDE_DIR}
${SIGC++_INCLUDE_DIR}
diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL
index e9d9d9b5fd1a7c..7a89c9ec1de468 100644
--- a/ports/cairomm/CONTROL
+++ b/ports/cairomm/CONTROL
@@ -1,5 +1,6 @@
Source: cairomm
-Version: 1.15.3-4
+Version: 1.15.3
+Port-Version: 5
Homepage: https://www.cairographics.org
Description: A C++ wrapper for the cairo graphics library
Build-Depends: cairo, libsigcpp
diff --git a/ports/ceres/0001_cmakelists_fixes.patch b/ports/ceres/0001_cmakelists_fixes.patch
index f269f05eefd852..87a3785d5fe2b1 100644
--- a/ports/ceres/0001_cmakelists_fixes.patch
+++ b/ports/ceres/0001_cmakelists_fixes.patch
@@ -31,19 +31,10 @@ index 02c72b5..62d8c59 100644
endif (MINIGLOG)
if (NOT SCHUR_SPECIALIZATIONS)
-@@ -582,7 +562,7 @@ include_directories(
- # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
- # used by clients after find_package(Ceres) does not identify Eigen as
- # as system headers.
--include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
-+include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
-
- if (SUITESPARSE)
- include_directories(${SUITESPARSE_INCLUDE_DIRS})
-@@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
+@@ -917,8 +897,5 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
- "${Ceres_SOURCE_DIR}/cmake/FindEigen.cmake"
+- "${Ceres_SOURCE_DIR}/cmake/FindEigen.cmake"
- "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake"
- "${Ceres_SOURCE_DIR}/cmake/FindGflags.cmake"
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch
index 071ad0ad1fb591..9b02e99633a7df 100644
--- a/ports/ceres/0003_fix_exported_ceres_config.patch
+++ b/ports/ceres/0003_fix_exported_ceres_config.patch
@@ -89,7 +89,7 @@ index d0380de..55760a8 100644
-endif (CERES_USES_MINIGLOG)
+#SuiteSparse
+if (@SUITESPARSE@)
-+ find_dependency(suitesparse CONFIG REQUIRED)
++ find_dependency(suitesparse CONFIG)
+endif()
# Import exported Ceres targets, if they have not already been imported.
diff --git a/ports/ceres/0004_blas_linux_fix.patch b/ports/ceres/0004_blas_linux_fix.patch
deleted file mode 100644
index 5fffee5e231cf4..00000000000000
--- a/ports/ceres/0004_blas_linux_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/internal/ceres/blas.cc b/internal/ceres/blas.cc
-index 3ba63bb..071a26e 100644
---- a/internal/ceres/blas.cc
-+++ b/internal/ceres/blas.cc
-@@ -33,7 +33,7 @@
- #include "glog/logging.h"
-
- #ifndef CERES_NO_LAPACK
--extern "C" void dsyrk_(char* uplo,
-+extern "C" void dsyrk(char* uplo,
- char* trans,
- int* n,
- int* k,
-@@ -64,7 +64,7 @@ void BLAS::SymmetricRankKUpdate(int num_rows,
- int k = transpose ? num_rows : num_cols;
- int lda = k;
- int ldc = n;
-- dsyrk_(&uplo,
-+ dsyrk(&uplo,
- &trans,
- &n,
- &k,
diff --git a/ports/ceres/0004_fix_find_eigen.patch b/ports/ceres/0004_fix_find_eigen.patch
new file mode 100644
index 00000000000000..ad92228c0bc896
--- /dev/null
+++ b/ports/ceres/0004_fix_find_eigen.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7033de0..5235baa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -209,40 +209,40 @@ endif (IOS)
+ unset(CERES_COMPILE_OPTIONS)
+
+ # Eigen.
+-find_package(Eigen REQUIRED)
+-if (EIGEN_FOUND)
+- message("-- Found Eigen version ${EIGEN_VERSION}: ${EIGEN_INCLUDE_DIRS}")
+- if (EIGEN_VERSION VERSION_LESS 3.1.0)
++find_package(Eigen3 REQUIRED)
++if (EIGEN3_FOUND)
++ message(STATUS "Found Eigen version ${EIGEN3_VERSION_STRING}: ${EIGEN3_INCLUDE_DIRS}")
++ if (EIGEN3_VERSION_STRING VERSION_LESS 3.1.0)
+ message(FATAL_ERROR "-- Ceres requires Eigen version >= 3.1.0 in order "
+ "that Eigen/SparseCore be available, detected version of Eigen is: "
+- "${EIGEN_VERSION}")
+- endif (EIGEN_VERSION VERSION_LESS 3.1.0)
++ "${EIGEN3_VERSION_STRING}")
++ endif (EIGEN3_VERSION_STRING VERSION_LESS 3.1.0)
+
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" AND
+- EIGEN_VERSION VERSION_LESS 3.3.4)
++ EIGEN3_VERSION_STRING VERSION_LESS 3.3.4)
+ # As per issue #289: https://github.com/ceres-solver/ceres-solver/issues/289
+ # the bundle_adjustment_test will fail for Eigen < 3.3.4 on aarch64.
+ message(FATAL_ERROR "-- Ceres requires Eigen version >= 3.3.4 on aarch64. "
+- "Detected version of Eigen is: ${EIGEN_VERSION}.")
++ "Detected version of Eigen is: ${EIGEN3_VERSION_STRING}.")
+ endif()
+
+ if (EIGENSPARSE)
+- message("-- Enabling use of Eigen as a sparse linear algebra library.")
++ message(STATUS "Enabling use of Eigen as a sparse linear algebra library.")
+ list(APPEND CERES_COMPILE_OPTIONS CERES_USE_EIGEN_SPARSE)
+- if (EIGEN_VERSION VERSION_LESS 3.2.2)
++ if (EIGEN3_VERSION_STRING VERSION_LESS 3.2.2)
+ message(" WARNING:")
+ message("")
+- message(" Your version of Eigen (${EIGEN_VERSION}) is older than ")
++ message(" Your version of Eigen (${EIGEN3_VERSION_STRING}) is older than ")
+ message(" version 3.2.2. The performance of SPARSE_NORMAL_CHOLESKY ")
+ message(" and SPARSE_SCHUR linear solvers will suffer.")
+- endif (EIGEN_VERSION VERSION_LESS 3.2.2)
++ endif (EIGEN3_VERSION_STRING VERSION_LESS 3.2.2)
+ else (EIGENSPARSE)
+ message("-- Disabling use of Eigen as a sparse linear algebra library.")
+ message(" This does not affect the covariance estimation algorithm ")
+ message(" which can still use the EIGEN_SPARSE_QR algorithm.")
+ add_definitions(-DEIGEN_MPL2_ONLY)
+ endif (EIGENSPARSE)
+-endif (EIGEN_FOUND)
++endif (EIGEN3_FOUND)
+
+ if (LAPACK)
+ find_package(LAPACK QUIET)
+@@ -562,7 +562,7 @@ include_directories(
+ # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
+ # used by clients after find_package(Ceres) does not identify Eigen as
+ # as system headers.
+-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
++include_directories(${EIGEN3_INCLUDE_DIRS})
+
+ if (SUITESPARSE)
+ include_directories(${SUITESPARSE_INCLUDE_DIRS})
+diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
+index c4ed71f..b3d6a17 100644
+--- a/cmake/CeresConfig.cmake.in
++++ b/cmake/CeresConfig.cmake.in
+@@ -202,39 +202,39 @@ set(CERES_VERSION @CERES_VERSION@ )
+
+ # Eigen.
+ # Flag set during configuration and build of Ceres.
+-set(CERES_EIGEN_VERSION @EIGEN_VERSION@)
++set(CERES_EIGEN_VERSION @EIGEN3_VERSION_STRING@)
+ set(EIGEN_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_EIGEN_CMAKE_CONFIGURATION@)
+ # Append the locations of Eigen when Ceres was built to the search path hints.
+ if (EIGEN_WAS_BUILT_WITH_CMAKE)
+ set(Eigen3_DIR @Eigen3_DIR@)
+ set(EIGEN_PREFER_EXPORTED_EIGEN_CMAKE_CONFIGURATION TRUE)
+ else()
+- list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN_INCLUDE_DIR@)
++ list(APPEND EIGEN_INCLUDE_DIR_HINTS @EIGEN3_INCLUDE_DIR@)
+ endif()
+ # Search quietly to control the timing of the error message if not found. The
+ # search should be for an exact match, but for usability reasons do a soft
+ # match and reject with an explanation below.
+-find_package(Eigen ${CERES_EIGEN_VERSION} QUIET)
+-if (EIGEN_FOUND)
+- if (NOT EIGEN_VERSION VERSION_EQUAL CERES_EIGEN_VERSION)
++find_package(Eigen3 ${CERES_EIGEN_VERSION} QUIET)
++if (EIGEN3_FOUND)
++ if (NOT EIGEN3_VERSION_STRING VERSION_EQUAL CERES_EIGEN_VERSION)
+ # CMake's VERSION check in FIND_PACKAGE() will accept any version >= the
+ # specified version. However, only version = is supported. Improve
+ # usability by explaining why we don't accept non-exact version matching.
+ ceres_report_not_found("Found Eigen dependency, but the version of Eigen "
+- "found (${EIGEN_VERSION}) does not exactly match the version of Eigen "
++ "found (${EIGEN3_VERSION_STRING}) does not exactly match the version of Eigen "
+ "Ceres was compiled with (${CERES_EIGEN_VERSION}). This can cause subtle "
+ "bugs by triggering violations of the One Definition Rule. See the "
+ "Wikipedia article http://en.wikipedia.org/wiki/One_Definition_Rule "
+ "for more details")
+ endif ()
+ message(STATUS "Found required Ceres dependency: "
+- "Eigen version ${CERES_EIGEN_VERSION} in ${EIGEN_INCLUDE_DIRS}")
+-else (EIGEN_FOUND)
++ "Eigen version ${CERES_EIGEN_VERSION} in ${EIGEN3_INCLUDE_DIRS}")
++else (EIGEN3_FOUND)
+ ceres_report_not_found("Missing required Ceres "
+ "dependency: Eigen version ${CERES_EIGEN_VERSION}, please set "
+- "EIGEN_INCLUDE_DIR.")
+-endif (EIGEN_FOUND)
+-list(APPEND CERES_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
++ "EIGEN3_INCLUDE_DIR.")
++endif (EIGEN3_FOUND)
++list(APPEND CERES_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS})
+
+ # Glog.
+ include (CMakeFindDependencyMacro)
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL
index a0a7a72e02faf8..5fb8186add93ee 100644
--- a/ports/ceres/CONTROL
+++ b/ports/ceres/CONTROL
@@ -1,11 +1,12 @@
Source: ceres
-Version: 1.14.0-7
+Version: 1.14.0
+Port-Version: 10
Build-Depends: glog, eigen3
Homepage: https://github.com/ceres-solver/ceres-solver
Description: non-linear optimization package
Feature: lapack
-Build-Depends: clapack (!osx)
+Build-Depends: lapack
Description: Use Lapack in Ceres
Feature: suitesparse
diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake
index d2d781b594341b..e7c455c562097f 100644
--- a/ports/ceres/portfile.cmake
+++ b/ports/ceres/portfile.cmake
@@ -6,10 +6,6 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static")
set(MSVC_USE_STATIC_CRT_VALUE ON)
endif()
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
- set(ADDITIONAL_PATCH "0004_blas_linux_fix.patch")
-endif()
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ceres-solver/ceres-solver
@@ -20,15 +16,14 @@ vcpkg_from_github(
0001_cmakelists_fixes.patch
0002_use_glog_target.patch
0003_fix_exported_ceres_config.patch
- ${ADDITIONAL_PATCH}
+ 0004_fix_find_eigen.patch
)
+file(REMOVE ${SOURCE_PATH}/cmake/FindCXSparse.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake)
-#file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake)
file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake)
-#file(REMOVE ${SOURCE_PATH}/cmake/FindTBB.cmake)
-
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"suitesparse" SUITESPARSE
@@ -52,7 +47,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
else()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres)
@@ -61,7 +56,7 @@ endif()
vcpkg_copy_pdbs()
# Changes target search path
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
file(READ ${CURRENT_PACKAGES_DIR}/share/ceres/CeresConfig.cmake CERES_TARGETS)
string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../"
"get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${CERES_CURRENT_CONFIG_DIR}/../../" CERES_TARGETS "${CERES_TARGETS}")
@@ -77,6 +72,4 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-# Handle copyright of suitesparse and metis
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ceres)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ceres/LICENSE ${CURRENT_PACKAGES_DIR}/share/ceres/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index 60452db0f2dd46..1cb5e38bc9854d 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,5 +1,5 @@
Source: cgal
-Version: 5.0.2-2
+Version: 5.0.3
Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
Homepage: https://github.com/CGAL/cgal
Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index 04e3271361d729..a7106503876ed5 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
- REF releases/CGAL-5.0.2
- SHA512 108f1d6f68674e123fd90143049f30a7e7965827468828f75ba7ae0b7ba174690520bafdf0648853c1b28895d6a9a0c7349c03e678c13395a84ffe7397c97e99
+ REF releases/CGAL-5.0.3
+ SHA512 e163276264d8aeb3a546392f87d898bcbc59a4e2f10c23327f0c8e3d41f0d3d8200f872230da3f077d3a564acfa4b3fa4c6a101db0b3cd8d4a4028fffa8110df
HEAD_REF master
)
diff --git a/ports/chromium-base/CONTROL b/ports/chromium-base/CONTROL
new file mode 100644
index 00000000000000..91b0590181f5af
--- /dev/null
+++ b/ports/chromium-base/CONTROL
@@ -0,0 +1,5 @@
+Source: chromium-base
+Version: 86.0.4199.1
+Homepage: https://chromium.googlesource.com/chromium/src
+Description: Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
+Supports: x64 & (osx|windows|linux) & !uwp
\ No newline at end of file
diff --git a/ports/chromium-base/chromium-baseConfig.cmake.in b/ports/chromium-base/chromium-baseConfig.cmake.in
new file mode 100644
index 00000000000000..95ce316c655f04
--- /dev/null
+++ b/ports/chromium-base/chromium-baseConfig.cmake.in
@@ -0,0 +1,81 @@
+if(TARGET chromium-base)
+ return()
+endif()
+
+set(DEFINITIONS_DBG @DEFINITIONS_DBG@)
+set(DEFINITIONS_REL @DEFINITIONS_DBG@)
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+ set(_IMPORT_PREFIX "")
+endif()
+
+add_library(chromium-base INTERFACE IMPORTED GLOBAL)
+add_library(chromium-base::chromium-base ALIAS chromium-base)
+
+set(LIBRARIES_ chromium_base chromium_base_static dynamic_annotations double_conversion)
+
+if(WIN32)
+ list(APPEND LIBRARIES_
+ cfgmgr32
+ powrprof
+ propsys
+ setupapi
+ userenv
+ wbemuuid
+ winmm
+ advapi32
+ comdlg32
+ dbghelp
+ dnsapi
+ gdi32
+ msimg32
+ odbc32
+ odbccp32
+ oleaut32
+ shell32
+ shlwapi
+ user32
+ usp10
+ uuid
+ version
+ wininet
+ winspool
+ ws2_32
+ delayimp
+ kernel32
+ ole32)
+elseif(APPLE)
+ list(APPEND LIBRARIES_
+ ApplicationServices
+ AppKit
+ CoreFoundation
+ IOKit
+ OpenDirectory
+ Security
+ bsm
+ pmenergy
+ pmsample)
+endif()
+
+foreach(LIB_NAME ${LIBRARIES_})
+ find_library(_LIB NAMES ${LIB_NAME} ${LIB_NAME}.dll)
+ target_link_libraries(chromium-base INTERFACE ${_LIB})
+ unset(_LIB CACHE)
+endforeach()
+
+if(UNIX AND NOT APPLE)
+ target_link_libraries(chromium-base INTERFACE -ldl -latomic -lpthread)
+endif()
+
+target_include_directories(chromium-base
+ INTERFACE ${_IMPORT_PREFIX}/include/chromium-base)
+
+target_compile_definitions(chromium-base INTERFACE
+ $<$:${DEFINITIONS_DBG}>
+ $<$:${DEFINITIONS_REL}>)
+
+target_compile_features(chromium-base INTERFACE cxx_std_14)
diff --git a/ports/chromium-base/portfile.cmake b/ports/chromium-base/portfile.cmake
new file mode 100644
index 00000000000000..409c2d589eaa06
--- /dev/null
+++ b/ports/chromium-base/portfile.cmake
@@ -0,0 +1,155 @@
+vcpkg_fail_port_install(
+ ON_ARCH "x86" "arm" "arm64"
+ ON_TARGET "UWP")
+
+# Patches may be provided at the end
+function(checkout_in_path PATH URL REF)
+ if(EXISTS "${PATH}")
+ file(GLOB FILES "${PATH}")
+ list(LENGTH FILES COUNT)
+ if(COUNT GREATER 0)
+ return()
+ endif()
+ file(REMOVE_RECURSE "${PATH}")
+ endif()
+
+ vcpkg_from_git(
+ OUT_SOURCE_PATH DEP_SOURCE_PATH
+ URL "${URL}"
+ REF "${REF}"
+ PATCHES "${ARGN}"
+ )
+ file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
+ file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
+endfunction()
+
+# Commits are based on https://chromium.googlesource.com/chromium/src/+/refs/tags/86.0.4199.1
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/25ce732")
+file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party")
+
+set(CHROMIUM_GIT "https://chromium.googlesource.com/chromium/src")
+checkout_in_path(
+ "${SOURCE_PATH}/base"
+ "${CHROMIUM_GIT}/base"
+ "25ce73258703a5ac018da0e203fb3d4a98c2136e"
+ res/0001-base.patch)
+checkout_in_path(
+ "${SOURCE_PATH}/build"
+ "${CHROMIUM_GIT}/build"
+ "312532ee66abdacbe58afb5df7ddf05e3a6399f9"
+ res/0002-build.patch)
+checkout_in_path(
+ "${SOURCE_PATH}/third_party/apple_apsl"
+ "${CHROMIUM_GIT}/third_party/apple_apsl"
+ "4cc25bbf65194f6726f7f10da0a885818e35d53e")
+checkout_in_path(
+ "${SOURCE_PATH}/third_party/ced"
+ "${CHROMIUM_GIT}/third_party/ced"
+ "4cd87a44674edd9fe1f01c4cb5f1b73907ce4236")
+checkout_in_path(
+ "${SOURCE_PATH}/third_party/modp_b64"
+ "${CHROMIUM_GIT}/third_party/modp_b64"
+ "509f005fa65e652dc4a6f636da6fa1002b6dce16")
+
+set(RES "${CMAKE_CURRENT_LIST_DIR}/res")
+file(COPY "${RES}/.gn" DESTINATION "${SOURCE_PATH}")
+file(COPY "${RES}/BUILD.gn" DESTINATION "${SOURCE_PATH}")
+file(COPY "${RES}/build_overrides" DESTINATION "${SOURCE_PATH}")
+file(COPY "${RES}/testing" DESTINATION "${SOURCE_PATH}")
+file(COPY "${RES}/tools" DESTINATION "${SOURCE_PATH}")
+file(COPY "${RES}/gclient_args.gni" DESTINATION "${SOURCE_PATH}/build/config")
+file(COPY "${RES}/LASTCHANGE.committime" DESTINATION "${SOURCE_PATH}/build/util")
+file(COPY "${RES}/icu" DESTINATION "${SOURCE_PATH}/third_party")
+file(COPY "${RES}/libxml" DESTINATION "${SOURCE_PATH}/third_party")
+file(COPY "${RES}/protobuf" DESTINATION "${SOURCE_PATH}/third_party")
+file(COPY "${RES}/fontconfig" DESTINATION "${SOURCE_PATH}/third_party")
+file(COPY "${RES}/test_fonts" DESTINATION "${SOURCE_PATH}/third_party")
+
+set(OPTIONS "\
+ use_custom_libcxx=false \
+ clang_use_chrome_plugins=false \
+ forbid_non_component_debug_builds=false")
+set(DEFINITIONS "")
+
+if(WIN32)
+ # Windows 10 SDK >= (10.0.19041.0) is required
+ # https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
+ SET(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled)
+ set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0)
+ set(OPTIONS "${OPTIONS} treat_warnings_as_errors=false use_lld=false")
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux)
+ set(OPTIONS "${OPTIONS} use_allocator=\"none\" use_sysroot=false use_glib=false")
+endif()
+
+# Find the directory that contains "bin/clang"
+# Note: Only clang-cl is supported on Windows, see https://crbug.com/988071
+vcpkg_find_acquire_program(CLANG)
+if(CLANG MATCHES "-NOTFOUND")
+ message(FATAL_ERROR "Clang is required.")
+endif()
+get_filename_component(CLANG "${CLANG}" DIRECTORY)
+get_filename_component(CLANG "${CLANG}" DIRECTORY)
+if((WIN32 AND NOT EXISTS "${CLANG}/bin/clang-cl.exe") OR
+ (APPLE AND NOT EXISTS "${CLANG}/bin/clang"))
+ message(FATAL_ERROR "Clang needs to be inside a bin directory.")
+endif()
+set(OPTIONS "${OPTIONS} clang_base_path=\"${CLANG}\"")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ set(OPTIONS "${OPTIONS} is_component_build=true")
+ list(APPEND DEFINITIONS COMPONENT_BUILD)
+else()
+ set(OPTIONS "${OPTIONS} is_component_build=false")
+endif()
+
+if(APPLE)
+ set(OPTIONS "${OPTIONS} enable_dsyms=true")
+endif()
+
+set(OPTIONS_DBG "${OPTIONS} is_debug=true symbol_level=2")
+set(OPTIONS_REL "${OPTIONS} is_debug=false symbol_level=0")
+set(DEFINITIONS_DBG ${DEFINITIONS})
+set(DEFINITIONS_REL ${DEFINITIONS})
+
+vcpkg_configure_gn(
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS_DEBUG "${OPTIONS_DBG}"
+ OPTIONS_RELEASE "${OPTIONS_REL}"
+)
+
+# Prevent a ninja re-config loop
+set(NINJA_REBUILD "build build.ninja: gn\n generator = 1\n depfile = build.ninja.d")
+vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja" "${NINJA_REBUILD}" "")
+vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja" "${NINJA_REBUILD}" "")
+
+set(TARGETS
+ base base:base_static
+ base/third_party/dynamic_annotations
+ base/third_party/double_conversion)
+
+if(WIN32)
+ list(APPEND TARGETS base/win:pe_image)
+endif()
+
+vcpkg_install_gn(
+ SOURCE_PATH "${SOURCE_PATH}"
+ TARGETS ${TARGETS}
+)
+
+# Install includes
+set(PACKAGES_INCLUDE_DIR "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+file(GLOB_RECURSE INCLUDE_FILES LIST_DIRECTORIES false RELATIVE "${SOURCE_PATH}" "${SOURCE_PATH}/*.h")
+foreach(file_ ${INCLUDE_FILES})
+ configure_file("${SOURCE_PATH}/${file_}" "${PACKAGES_INCLUDE_DIR}/${file_}" COPYONLY)
+endforeach()
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/chromium-baseConfig.cmake.in"
+ "${CURRENT_PACKAGES_DIR}/share/${PORT}/chromium-baseConfig.cmake" @ONLY)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/third_party/ced/LICENSE"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
+ RENAME copyright)
diff --git a/ports/chromium-base/res/.gn b/ports/chromium-base/res/.gn
new file mode 100644
index 00000000000000..4fcb7c405ff334
--- /dev/null
+++ b/ports/chromium-base/res/.gn
@@ -0,0 +1 @@
+buildconfig = "//build/config/BUILDCONFIG.gn"
\ No newline at end of file
diff --git a/ports/chromium-base/res/0001-base.patch b/ports/chromium-base/res/0001-base.patch
new file mode 100644
index 00000000000000..ca8c059756d80f
--- /dev/null
+++ b/ports/chromium-base/res/0001-base.patch
@@ -0,0 +1,101 @@
+diff --git a/BUILD.gn b/BUILD.gn
+index 7b7cd51..2961688 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -155,6 +155,7 @@ if (is_android) {
+ # test code (test support and anything in the test directory) which should use
+ # source_set as is recommended for GN targets).
+ jumbo_component("base") {
++ output_name = "chromium_base"
+ if (is_nacl || is_ios) {
+ # Link errors related to malloc functions if libbase for nacl is
+ # compiled with jumbo: https://crbug.com/775959.
+@@ -162,6 +163,11 @@ jumbo_component("base") {
+ never_build_jumbo = true
+ }
+
++ if (!is_component_build) {
++ complete_static_lib = true
++ configs -= [ "//build/config/compiler:thin_archive" ]
++ }
++
+ sources = [
+ "allocator/allocator_check.cc",
+ "allocator/allocator_check.h",
+@@ -1638,7 +1644,7 @@ jumbo_component("base") {
+ "hash/md5_constexpr_internal.h",
+ "hash/sha1.h",
+ ]
+- if (is_nacl) {
++ if (true) {
+ sources += [
+ "hash/md5_nacl.cc",
+ "hash/md5_nacl.h",
+@@ -2298,6 +2304,7 @@ buildflag_header("tracing_buildflags") {
+ # library. Note that this library cannot depend on base because base depends on
+ # base_static.
+ static_library("base_static") {
++ output_name = "chromium_base_static"
+ sources = [
+ "base_switches.cc",
+ "base_switches.h",
+@@ -2325,7 +2332,7 @@ static_library("base_static") {
+ }
+
+ component("i18n") {
+- output_name = "base_i18n"
++ output_name = "chromium_base_i18n"
+ sources = [
+ "i18n/base_i18n_export.h",
+ "i18n/base_i18n_switches.cc",
+diff --git a/gtest_prod_util.h b/gtest_prod_util.h
+index 2ca267e..0a0b6df 100644
+--- a/gtest_prod_util.h
++++ b/gtest_prod_util.h
+@@ -5,7 +5,8 @@
+ #ifndef BASE_GTEST_PROD_UTIL_H_
+ #define BASE_GTEST_PROD_UTIL_H_
+
+-#include "testing/gtest/include/gtest/gtest_prod.h" // nogncheck
++#define FRIEND_TEST(test_case_name, test_name)\
++friend class test_case_name##_##test_name##_Test
+
+ // This is a wrapper for gtest's FRIEND_TEST macro that friends
+ // test with all possible prefixes. This is very helpful when changing the test
+diff --git a/hash/md5.h b/hash/md5.h
+index 8a49f08..24acdab 100644
+--- a/hash/md5.h
++++ b/hash/md5.h
+@@ -11,7 +11,7 @@
+ #include "base/strings/string_piece.h"
+ #include "build/build_config.h"
+
+-#if defined(OS_NACL)
++#if true
+ #include "base/hash/md5_nacl.h"
+ #else
+ #include "base/hash/md5_boringssl.h"
+diff --git a/hash/md5_nacl.cc b/hash/md5_nacl.cc
+index 827bbbd..4b22c59 100644
+--- a/hash/md5_nacl.cc
++++ b/hash/md5_nacl.cc
+@@ -22,6 +22,7 @@
+ */
+
+ #include
++#include
+
+ #include "base/hash/md5.h"
+
+diff --git a/profiler/stack_copier_signal.cc b/profiler/stack_copier_signal.cc
+index 5a7d8b9..f959f2f 100644
+--- a/profiler/stack_copier_signal.cc
++++ b/profiler/stack_copier_signal.cc
+@@ -6,6 +6,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+
diff --git a/ports/chromium-base/res/0002-build.patch b/ports/chromium-base/res/0002-build.patch
new file mode 100644
index 00000000000000..94568d1690e317
--- /dev/null
+++ b/ports/chromium-base/res/0002-build.patch
@@ -0,0 +1,144 @@
+diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
+index 4cc6bfc..9ea83a9 100644
+--- a/config/BUILDCONFIG.gn
++++ b/config/BUILDCONFIG.gn
+@@ -657,6 +657,7 @@ template("component") {
+ # See http://crbug.com/594610
+ forward_variables_from(invoker, [ "visibility" ])
+ forward_variables_from(invoker, "*", [ "visibility" ])
++ not_needed("*")
+ }
+ }
+
+diff --git a/config/clang/BUILD.gn b/config/clang/BUILD.gn
+index 960726e..87886dc 100644
+--- a/config/clang/BUILD.gn
++++ b/config/clang/BUILD.gn
+@@ -38,5 +38,7 @@ config("extra_warnings") {
+ "-Wstring-conversion",
+
+ "-Wtautological-overlap-compare",
++ "-Wno-unknown-warning-option",
++ "-Wno-unknown-pragmas"
+ ]
+ }
+diff --git a/config/mac/sdk_info.py b/config/mac/sdk_info.py
+index 1ad11d3..99b21f9 100644
+--- a/config/mac/sdk_info.py
++++ b/config/mac/sdk_info.py
+@@ -61,10 +61,15 @@ def FillXcodeVersion(settings, developer_dir):
+ settings['xcode_build'] = version_plist['ProductBuildVersion']
+ return
+
+- lines = subprocess.check_output(['xcodebuild', '-version']).splitlines()
+- settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
+- settings['xcode_version_int'] = int(settings['xcode_version'], 10)
+- settings['xcode_build'] = lines[-1].split()[-1]
++ try:
++ lines = subprocess.check_output(['xcodebuild', '-version']).splitlines()
++ settings['xcode_version'] = FormatVersion(lines[0].split()[-1])
++ settings['xcode_version_int'] = int(settings['xcode_version'], 10)
++ settings['xcode_build'] = lines[-1].split()[-1]
++ except:
++ settings['xcode_version'] = ""
++ settings['xcode_version_int'] = 0
++ settings['xcode_build'] = ""
+
+
+ def FillMachineOSBuild(settings):
+diff --git a/mac/find_sdk.py b/mac/find_sdk.py
+index 58362bf..a6069b6 100755
+--- a/mac/find_sdk.py
++++ b/mac/find_sdk.py
+@@ -68,6 +68,8 @@ def main():
+ dev_dir = out.rstrip()
+ sdk_dir = os.path.join(
+ dev_dir, 'Platforms/MacOSX.platform/Developer/SDKs')
++ if not os.path.isdir(sdk_dir):
++ sdk_dir = os.path.join(dev_dir, 'SDKs')
+
+ if not os.path.isdir(sdk_dir):
+ raise SdkError('Install Xcode, launch it, accept the license ' +
+@@ -87,7 +89,10 @@ def main():
+
+ if options.print_bin_path:
+ bin_path = 'Toolchains/XcodeDefault.xctoolchain/usr/bin/'
+- print(os.path.join(dev_dir, bin_path))
++ if os.path.isdir(os.path.join(dev_dir, bin_path)):
++ print(os.path.join(dev_dir, bin_path))
++ else:
++ print(os.path.join(dev_dir, 'usr/bin/'))
+
+ return best_sdk
+
+diff --git a/toolchain/mac/BUILD.gn b/toolchain/mac/BUILD.gn
+index 8fdada0..8d5e6b7 100644
+--- a/toolchain/mac/BUILD.gn
++++ b/toolchain/mac/BUILD.gn
+@@ -184,9 +184,9 @@ template("mac_toolchain") {
+ # If dSYMs are enabled, this flag will be added to the link tools.
+ if (_enable_dsyms) {
+ dsym_switch = " -Wcrl,dsym,{{root_out_dir}} "
+- dsym_switch += "-Wcrl,dsymutilpath," +
+- rebase_path("//tools/clang/dsymutil/bin/dsymutil",
+- root_build_dir) + " "
++ # dsym_switch += "-Wcrl,dsymutilpath," +
++ # rebase_path("//tools/clang/dsymutil/bin/dsymutil",
++ # root_build_dir) + " "
+
+ dsym_output_dir =
+ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM"
+diff --git a/toolchain/win/BUILD.gn b/toolchain/win/BUILD.gn
+index be08930..04fb374 100644
+--- a/toolchain/win/BUILD.gn
++++ b/toolchain/win/BUILD.gn
+@@ -98,7 +98,7 @@ template("msvc_toolchain") {
+ } else {
+ lld_link = "lld-link"
+ }
+- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++ prefix = "$clang_base_path/bin"
+
+ # lld-link includes a replacement for lib.exe that can produce thin
+ # archives and understands bitcode (for lto builds).
+@@ -190,7 +190,7 @@ template("msvc_toolchain") {
+ # amount of data to parse and store in .ninja_deps. We do this on non-Windows too,
+ # and already make sure rebuilds after win sdk / libc++ / clang header updates happen via
+ # changing commandline flags.
+- show_includes = "/showIncludes:user"
++ show_includes = ""
+ } else {
+ show_includes = "/showIncludes"
+ }
+@@ -235,7 +235,7 @@ template("msvc_toolchain") {
+
+ if (toolchain_args.current_cpu == "arm64") {
+ if (is_clang) {
+- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++ prefix = "$clang_base_path/bin"
+ ml = "${clang_prefix}${prefix}/${clang_cl} --target=arm64-windows"
+ if (host_os == "win") {
+ # Flip the slashes so that copy/paste of the command works.
+@@ -444,11 +444,9 @@ template("win_toolchains") {
+
+ msvc_toolchain("win_clang_" + target_name) {
+ environment = "environment." + toolchain_arch
+- prefix = rebase_path("$clang_base_path/bin", root_build_dir)
++ prefix = "$clang_base_path/bin"
+ cl = "${clang_prefix}$prefix/${clang_cl}"
+- _clang_lib_dir =
+- rebase_path("$clang_base_path/lib/clang/$clang_version/lib/windows",
+- root_build_dir)
++ _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib/windows"
+ if (host_os == "win") {
+ # Flip the slashes so that copy/paste of the command works.
+ cl = string_replace(cl, "/", "\\")
+@@ -459,7 +457,7 @@ template("win_toolchains") {
+
+ sys_include_flags = "${win_toolchain_data.include_flags_imsvc}"
+ sys_lib_flags =
+- "-libpath:$_clang_lib_dir ${win_toolchain_data.libpath_flags}"
++ "-libpath:\"$_clang_lib_dir\" ${win_toolchain_data.libpath_flags}"
+
+ toolchain_args = {
+ if (defined(invoker.toolchain_args)) {
diff --git a/ports/chromium-base/res/BUILD.gn b/ports/chromium-base/res/BUILD.gn
new file mode 100644
index 00000000000000..01d935ba02527f
--- /dev/null
+++ b/ports/chromium-base/res/BUILD.gn
@@ -0,0 +1,5 @@
+static_library("chromium-base") {
+ deps = [
+ "//base",
+ ]
+}
diff --git a/ports/chromium-base/res/LASTCHANGE.committime b/ports/chromium-base/res/LASTCHANGE.committime
new file mode 100644
index 00000000000000..6acbbf6910963e
--- /dev/null
+++ b/ports/chromium-base/res/LASTCHANGE.committime
@@ -0,0 +1 @@
+1594430814
\ No newline at end of file
diff --git a/ports/chromium-base/res/build_overrides/build.gni b/ports/chromium-base/res/build_overrides/build.gni
new file mode 100644
index 00000000000000..47ac036443fb64
--- /dev/null
+++ b/ports/chromium-base/res/build_overrides/build.gni
@@ -0,0 +1,16 @@
+import("//build/config/gclient_args.gni")
+
+# Some non-Chromium builds don't support building java targets.
+enable_java_templates = true
+
+# Don't use Chromium's third_party/binutils.
+linux_use_bundled_binutils_override = false
+
+# Tracing requires //third_party/perfetto.
+enable_base_tracing = false
+
+# Skip assertions about 4GiB file size limit. See https://crbug.com/648948.
+ignore_elf32_limitations = false
+
+# Use the system install of Xcode for tools like ibtool, libtool, etc.
+use_system_xcode = true
diff --git a/ports/chromium-base/res/fontconfig/BUILD.gn b/ports/chromium-base/res/fontconfig/BUILD.gn
new file mode 100644
index 00000000000000..5c26eaf19c3ed9
--- /dev/null
+++ b/ports/chromium-base/res/fontconfig/BUILD.gn
@@ -0,0 +1 @@
+component("fontconfig") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/gclient_args.gni b/ports/chromium-base/res/gclient_args.gni
new file mode 100644
index 00000000000000..bd1145a79d5413
--- /dev/null
+++ b/ports/chromium-base/res/gclient_args.gni
@@ -0,0 +1,7 @@
+build_with_chromium = true
+checkout_android = false
+checkout_android_native_support = false
+checkout_ios_webkit = false
+checkout_nacl = false
+checkout_oculus_sdk = false
+checkout_openxr = false
\ No newline at end of file
diff --git a/ports/chromium-base/res/icu/BUILD.gn b/ports/chromium-base/res/icu/BUILD.gn
new file mode 100644
index 00000000000000..22356981f3b55b
--- /dev/null
+++ b/ports/chromium-base/res/icu/BUILD.gn
@@ -0,0 +1,2 @@
+component("icuuc") {}
+component("icu") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/icu/config.gni b/ports/chromium-base/res/icu/config.gni
new file mode 100644
index 00000000000000..4e9ad6a5ee9f93
--- /dev/null
+++ b/ports/chromium-base/res/icu/config.gni
@@ -0,0 +1,3 @@
+declare_args() {
+ icu_use_data_file = false
+}
\ No newline at end of file
diff --git a/ports/chromium-base/res/libxml/BUILD.gn b/ports/chromium-base/res/libxml/BUILD.gn
new file mode 100644
index 00000000000000..b48056ab882c4f
--- /dev/null
+++ b/ports/chromium-base/res/libxml/BUILD.gn
@@ -0,0 +1,2 @@
+component("libxml_utils") {}
+component("xml_reader") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/protobuf/proto_library.gni b/ports/chromium-base/res/protobuf/proto_library.gni
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/ports/chromium-base/res/test_fonts/BUILD.gn b/ports/chromium-base/res/test_fonts/BUILD.gn
new file mode 100644
index 00000000000000..b95c104e1f372a
--- /dev/null
+++ b/ports/chromium-base/res/test_fonts/BUILD.gn
@@ -0,0 +1 @@
+component("test_fonts") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/testing/gmock/BUILD.gn b/ports/chromium-base/res/testing/gmock/BUILD.gn
new file mode 100644
index 00000000000000..acd0ec30c0963d
--- /dev/null
+++ b/ports/chromium-base/res/testing/gmock/BUILD.gn
@@ -0,0 +1 @@
+component("gmock") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/testing/gtest/BUILD.gn b/ports/chromium-base/res/testing/gtest/BUILD.gn
new file mode 100644
index 00000000000000..2463cc7c0d82d3
--- /dev/null
+++ b/ports/chromium-base/res/testing/gtest/BUILD.gn
@@ -0,0 +1 @@
+component("gtest") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni b/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni
new file mode 100644
index 00000000000000..6e2a4c20fea4e1
--- /dev/null
+++ b/ports/chromium-base/res/testing/libfuzzer/fuzzer_test.gni
@@ -0,0 +1 @@
+import("//testing/test.gni")
\ No newline at end of file
diff --git a/ports/chromium-base/res/testing/test.gni b/ports/chromium-base/res/testing/test.gni
new file mode 100644
index 00000000000000..2d6f8c10352558
--- /dev/null
+++ b/ports/chromium-base/res/testing/test.gni
@@ -0,0 +1,20 @@
+template("test") {
+ not_needed(invoker, "*")
+ not_needed("*")
+}
+
+set_defaults("test") {
+ configs = [
+ "//build/config/compiler:chromium_code"
+ ]
+}
+
+template("fuzzer_test") {
+ not_needed(invoker, "*")
+ not_needed("*")
+}
+
+template("protoc_convert") {
+ not_needed(invoker, "*")
+ not_needed("*")
+}
\ No newline at end of file
diff --git a/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn b/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn
new file mode 100644
index 00000000000000..5c2c1f68e14e66
--- /dev/null
+++ b/ports/chromium-base/res/tools/win/DebugVisualizers/BUILD.gn
@@ -0,0 +1 @@
+config("chrome") {}
\ No newline at end of file
diff --git a/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis b/ports/chromium-base/res/tools/win/DebugVisualizers/chrome.natvis
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL
index ce3610044aeff6..0dac115073e94a 100644
--- a/ports/clapack/CONTROL
+++ b/ports/clapack/CONTROL
@@ -1,5 +1,6 @@
Source: clapack
-Version: 3.2.1-13
+Version: 3.2.1
+Port-Version: 15
Homepage: https://www.netlib.org/clapack
Description: CLAPACK (f2c'ed version of LAPACK)
Build-Depends: openblas (!osx)
diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake
index 0b5924ff4a4280..eff9bae705479e 100644
--- a/ports/clapack/FindLAPACK.cmake
+++ b/ports/clapack/FindLAPACK.cmake
@@ -1,468 +1,233 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindLAPACK
-----------
-
-Find LAPACK library
-
-This module finds an installed fortran library that implements the
-LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
-
-The approach follows that taken for the autoconf macro file,
-acx_lapack.m4 (distributed at
-http://ac-archive.sourceforge.net/ac-archive/acx_lapack.html).
-
-Input Variables
-^^^^^^^^^^^^^^^
-
-The following variables may be set to influence this module's behavior:
-
-``BLA_STATIC``
- if ``ON`` use static linkage
-
-``BLA_VENDOR``
- If set, checks only the specified vendor, if not set checks all the
- possibilities. List of vendors valid in this module:
-
- * ``Intel10_32`` (intel mkl v10 32 bit)
- * ``Intel10_64lp`` (intel mkl v10+ 64 bit, threaded code, lp64 model)
- * ``Intel10_64lp_seq`` (intel mkl v10+ 64 bit, sequential code, lp64 model)
- * ``Intel10_64ilp`` (intel mkl v10+ 64 bit, threaded code, ilp64 model)
- * ``Intel10_64ilp_seq`` (intel mkl v10+ 64 bit, sequential code, ilp64 model)
- * ``Intel`` (obsolete versions of mkl 32 and 64 bit)
- * ``OpenBLAS``
- * ``FLAME``
- * ``ACML``
- * ``Apple``
- * ``NAS``
- * ``Generic``
-
-``BLA_F95``
- if ``ON`` tries to find BLAS95/LAPACK95
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module defines the following variables:
-
-``LAPACK_FOUND``
- library implementing the LAPACK interface is found
-``LAPACK_LINKER_FLAGS``
- uncached list of required linker flags (excluding -l and -L).
-``LAPACK_LIBRARIES``
- uncached list of libraries (using full path name) to link against
- to use LAPACK
-``LAPACK95_LIBRARIES``
- uncached list of libraries (using full path name) to link against
- to use LAPACK95
-``LAPACK95_FOUND``
- library implementing the LAPACK95 interface is found
-
-.. note::
-
- C or CXX must be enabled to use Intel MKL
-
- For example, to use Intel MKL libraries and/or Intel compiler:
-
- .. code-block:: cmake
-
- set(BLA_VENDOR Intel10_64lp)
- find_package(LAPACK)
-#]=======================================================================]
-
-set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
-# Check the language being used
-if( NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_COMPILER_LOADED) )
- if(LAPACK_FIND_REQUIRED)
- message(FATAL_ERROR "FindLAPACK requires Fortran, C, or C++ to be enabled.")
- else()
- message(STATUS "Looking for LAPACK... - NOT found (Unsupported languages)")
- return()
- endif()
-endif()
-
-if (CMAKE_Fortran_COMPILER_LOADED)
-include(${CMAKE_ROOT}/Modules/CheckFortranFunctionExists.cmake)
-else ()
-include(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-endif ()
-include(${CMAKE_ROOT}/Modules/CMakePushCheckState.cmake)
-include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
-
-cmake_push_check_state()
-set(CMAKE_REQUIRED_QUIET ${LAPACK_FIND_QUIETLY})
-
-set(LAPACK_FOUND FALSE)
-set(LAPACK95_FOUND FALSE)
-
-# TODO: move this stuff to separate module
-
-macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas _threads)
-# This macro checks for the existence of the combination of fortran libraries
-# given by _list. If the combination is found, this macro checks (using the
-# Check_Fortran_Function_Exists macro) whether can link against that library
-# combination using the name of a routine given by _name using the linker
-# flags given by _flags. If the combination of libraries is found and passes
-# the link test, LIBRARIES is set to the list of complete library paths that
-# have been found. Otherwise, LIBRARIES is set to FALSE.
-
-# N.B. _prefix is the prefix applied to the names of all cached variables that
-# are generated internally and marked advanced by this macro.
-
-set(_libraries_work TRUE)
-set(${LIBRARIES})
-set(${LIBRARIES}_RELEASE)
-set(_combined_name)
-if (NOT _libdir)
- if (WIN32)
- set(_libdir ENV LIB)
- elseif (APPLE)
- set(_libdir ENV DYLD_LIBRARY_PATH)
- else ()
- set(_libdir ENV LD_LIBRARY_PATH)
- endif ()
-endif ()
-
-list(APPEND _libdir "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}")
-
-foreach(_library ${_list})
- set(_combined_name ${_combined_name}_${_library})
-
- if(_libraries_work)
- if (BLA_STATIC)
- if (WIN32)
- set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
- endif ()
- if (APPLE)
- set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES})
- else ()
- set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
- endif ()
- else ()
- if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
- # for ubuntu's libblas3gf and liblapack3gf packages
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .so.3gf)
- endif ()
- endif ()
- find_library(${_prefix}_${_library}_LIBRARY_RELEASE
- NAMES ${_library}
- PATHS ${_libdir}
- )
- mark_as_advanced(${_prefix}_${_library}_LIBRARY_RELEASE)
- find_library(${_prefix}_${_library}_LIBRARY_DEBUG
- NAMES ${_library}d
- PATHS ${_libdir}
- )
- mark_as_advanced(${_prefix}_${_library}_LIBRARY_DEBUG)
- select_library_configurations(${_prefix}_${_library})
- if(NOT ${_prefix}_${_library}_LIBRARY_RELEASE MATCHES "NOTFOUND")
- set(${LIBRARIES}_RELEASE ${${LIBRARIES}_RELEASE} ${${_prefix}_${_library}_LIBRARY_RELEASE})
- endif()
- set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
- set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
- endif()
-endforeach()
-
-if(_libraries_work)
- # Test this combination of libraries.
- if(NOT "${_blas}" STREQUAL "")
- string(GENEX_STRIP "${_blas}" _test_blas)
- endif()
- if(UNIX AND BLA_STATIC)
- set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group" ${${LIBRARIES}_RELEASE} ${_test_blas} "-Wl,--end-group" ${_threads})
- else()
- set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}_RELEASE} ${_test_blas} ${_threads})
- endif()
- #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
- #message("DEBUG: _test_blas = ${_test_blas} former ${_blas}")
- if (NOT CMAKE_Fortran_COMPILER_LOADED)
- check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
- else ()
- check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
- endif ()
- set(CMAKE_REQUIRED_LIBRARIES)
- set(_test_blas)
- set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
-# message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
-endif()
-
- if(_libraries_work)
- set(${LIBRARIES} ${${LIBRARIES}} "${_blas}" ${_threads})
- else()
- set(${LIBRARIES} FALSE)
- endif()
-
-endmacro()
-
-
-set(LAPACK_LINKER_FLAGS)
-set(LAPACK_LIBRARIES)
-set(LAPACK95_LIBRARIES)
-
-
-if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
- find_package(BLAS)
-else()
- find_package(BLAS REQUIRED)
-endif()
-
-
-if(BLAS_FOUND)
- set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
- if (NOT $ENV{BLA_VENDOR} STREQUAL "")
- set(BLA_VENDOR $ENV{BLA_VENDOR})
- else ()
- if(NOT BLA_VENDOR)
- set(BLA_VENDOR "All")
- endif()
- endif ()
-
-#intel lapack
-if (BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
- if (NOT WIN32)
- set(LAPACK_mkl_LM "-lm")
- set(LAPACK_mkl_LDL "-ldl")
- endif ()
- if (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED)
- if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
- find_PACKAGE(Threads)
- else()
- find_package(Threads REQUIRED)
- endif()
-
- if (BLA_VENDOR MATCHES "_64ilp")
- set(LAPACK_mkl_ILP_MODE "ilp64")
- else ()
- set(LAPACK_mkl_ILP_MODE "lp64")
- endif ()
-
- set(LAPACK_SEARCH_LIBS "")
-
- if (BLA_F95)
- set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")
- set(_LIBRARIES LAPACK95_LIBRARIES)
- set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
-
- # old
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack95")
- # new >= 10.3
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_intel_c")
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack95_${LAPACK_mkl_ILP_MODE}")
- else()
- set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
- set(_LIBRARIES LAPACK_LIBRARIES)
- set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
-
- # old
- list(APPEND LAPACK_SEARCH_LIBS
- "mkl_lapack")
- endif()
-
- # First try empty lapack libs
- if (NOT ${_LIBRARIES})
- check_lapack_libraries(
- ${_LIBRARIES}
- LAPACK
- ${LAPACK_mkl_SEARCH_SYMBOL}
- ""
- ""
- "${_BLAS_LIBRARIES}"
- ""
- )
- endif ()
- # Then try the search libs
- foreach (IT ${LAPACK_SEARCH_LIBS})
- if (NOT ${_LIBRARIES})
- check_lapack_libraries(
- ${_LIBRARIES}
- LAPACK
- ${LAPACK_mkl_SEARCH_SYMBOL}
- ""
- "${IT}"
- "${_BLAS_LIBRARIES}"
- "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}"
- )
- endif ()
- endforeach ()
-
- unset(LAPACK_mkl_ILP_MODE)
- unset(LAPACK_mkl_SEARCH_SYMBOL)
- unset(LAPACK_mkl_LM)
- unset(LAPACK_mkl_LDL)
- endif ()
-endif()
-
-if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "goto2"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif()
-endif ()
-
-if (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "openblas"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif()
-endif ()
-
-if (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "flame"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif()
-endif ()
-
-#acml lapack
- if (BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All")
- if (BLAS_LIBRARIES MATCHES ".+acml.+")
- set (LAPACK_LIBRARIES ${BLAS_LIBRARIES})
- endif ()
- endif ()
-
-# Apple LAPACK library?
-if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
- if(NOT LAPACK_LIBRARIES)
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "Accelerate"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif()
-endif ()
-if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
- if ( NOT LAPACK_LIBRARIES )
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "vecLib"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif ()
-endif ()
-# Generic LAPACK library?
-if (BLA_VENDOR STREQUAL "Generic" OR
- BLA_VENDOR STREQUAL "ATLAS" OR
- BLA_VENDOR STREQUAL "All")
- if ( NOT LAPACK_LIBRARIES )
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "lapack"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif ()
- if ( NOT LAPACK_LIBRARIES )
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "lapack;libf2c"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif ()
- if ( NOT LAPACK_LIBRARIES )
- check_lapack_libraries(
- LAPACK_LIBRARIES
- LAPACK
- cheev
- ""
- "lapack;f2c"
- "${BLAS_LIBRARIES}"
- ""
- )
- endif ()
-endif ()
-
-else()
- message(STATUS "LAPACK requires BLAS")
-endif()
-
-if(BLA_F95)
- if(LAPACK95_LIBRARIES)
- set(LAPACK95_FOUND TRUE)
- else()
- set(LAPACK95_FOUND FALSE)
- endif()
- if(NOT LAPACK_FIND_QUIETLY)
- if(LAPACK95_FOUND)
- message(STATUS "A library with LAPACK95 API found.")
- else()
- if(LAPACK_FIND_REQUIRED)
- message(FATAL_ERROR
- "A required library with LAPACK95 API not found. Please specify library location."
- )
- else()
- message(STATUS
- "A library with LAPACK95 API not found. Please specify library location."
- )
- endif()
- endif()
- endif()
- set(LAPACK_FOUND "${LAPACK95_FOUND}")
- set(LAPACK_LIBRARIES "${LAPACK95_LIBRARIES}")
-else()
- if(LAPACK_LIBRARIES)
- set(LAPACK_FOUND TRUE)
- else()
- set(LAPACK_FOUND FALSE)
- endif()
-
- if(NOT LAPACK_FIND_QUIETLY)
- if(LAPACK_FOUND)
- message(STATUS "A library with LAPACK API found.")
- else()
- if(LAPACK_FIND_REQUIRED)
- message(FATAL_ERROR
- "A required library with LAPACK API not found. Please specify library location."
- )
- else()
- message(STATUS
- "A library with LAPACK API not found. Please specify library location."
- )
- endif()
- endif()
- endif()
-endif()
-
-cmake_pop_check_state()
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+#.rst:
+# clapack config for vcpkg
+# ------------
+#
+# Find the clapack includes and library.
+#
+# Result Variables
+# ^^^^^^^^^^^^^^^^
+#
+# This script defines the following variables:
+#
+# ``CLAPACK_FOUND``
+# True if clapack library found
+#
+# ``CLAPACK_VERSION``
+# Containing the clapack version tag (manually defined)
+#
+# ``CLAPACK_INCLUDE_DIR``
+# Location of clapack headers
+#
+# ``CLAPACK_LIBRARY``
+# List of libraries to link with when using clapack
+#
+# Result Targets
+# ^^^^^^^^^^^^^^
+#
+# This script defines the following targets:
+#
+# ``clapack::clapack``
+# Target to use clapack
+#
+# Compatibility Variables
+# ^^^^^^^^^^^^^^^^^^^^^^^
+#
+# This script defines the following variables for compatibility reasons:
+#
+# ``F2C_FOUND``
+# True if f2c (fortran-to-c wrap layer) library found
+#
+# ``F2C_INCLUDE_DIR``
+# Location of clapack headers
+#
+# ``F2C_LIBRARY``
+# Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used
+#
+# ``LAPACK_FOUND``
+# True if clapack library found
+#
+# ``LAPACK_VERSION``
+# Containing the clapack version tag (manually defined)
+#
+# ``LAPACK_INCLUDE_DIR``
+# Location of clapack headers
+#
+# ``LAPACK_LIBRARY``
+# List of libraries to link with when using clapack
+#
+# Compatibility Targets
+# ^^^^^^^^^^^^^^
+#
+# This script defines the following targets for compatibility reasons:
+#
+# ``lapack``
+# Target to use lapack
+
+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake)
+
+set(CLAPACK_VERSION "3.2.1")
+
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+find_dependency(Threads)
+
+if(UNIX)
+ find_library(ADDITIONAL_LAPACK_LIBRARY m)
+ set(PTHREAD_LINK_NAME "-pthread")
+endif()
+
+if(NOT F2C_LIBRARY)
+ find_library(F2C_LIBRARY_RELEASE NAMES f2c libf2c)
+ find_library(F2C_LIBRARY_DEBUG NAMES f2cd libf2cd)
+ select_library_configurations(F2C)
+
+ #keep a list of "pure" f2c libs, without dependencies
+ set(oF2C_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE})
+ set(oF2C_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG})
+ set(oF2C_LIBRARY ${F2C_LIBRARY})
+
+ list(APPEND F2C_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY})
+endif()
+
+if(NOT LAPACK_LIBRARY)
+ find_library(LAPACK_LIBRARY_RELEASE NAMES lapack)
+ find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd)
+
+ #keep a list of "pure" lapack libs, without dependencies
+ set(oLAPACK_LIBRARY_RELEASE ${LAPACK_LIBRARY_RELEASE})
+ set(oLAPACK_LIBRARY_DEBUG ${LAPACK_LIBRARY_DEBUG})
+ select_library_configurations(oLAPACK)
+
+ list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE})
+ list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG})
+
+ find_dependency(OpenBLAS)
+ get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE)
+ if(NOT _loc)
+ get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE)
+ endif()
+ set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc})
+ get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG)
+ if(NOT _loc)
+ get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG)
+ endif()
+ set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc})
+ select_library_configurations(LAPACK_BLAS)
+ list(APPEND LAPACK_LIBRARY_RELEASE ${LAPACK_BLAS_LIBRARY_RELEASE})
+ list(APPEND LAPACK_LIBRARY_DEBUG ${LAPACK_BLAS_LIBRARY_DEBUG})
+
+ select_library_configurations(LAPACK)
+ if(UNIX)
+ list(APPEND LAPACK_LIBRARY ${PTHREAD_LINK_NAME})
+ endif()
+endif()
+
+if(NOT F2C_INCLUDE_DIR)
+ find_path(F2C_INCLUDE_DIR NAMES f2c.h)
+endif()
+
+if(NOT LAPACK_INCLUDE_DIR)
+ find_path(LAPACK_INCLUDE_DIR NAMES clapack.h)
+endif()
+
+list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR})
+set(LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE)
+set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE)
+
+set(LAPACK_DLL_DIR ${LAPACK_INCLUDE_DIR})
+list(TRANSFORM LAPACK_DLL_DIR APPEND "/../bin")
+message(STATUS "LAPACK_DLL_DIR: ${LAPACK_DLL_DIR}")
+
+if(WIN32)
+ find_file(LAPACK_LIBRARY_RELEASE_DLL NAMES lapack.dll PATHS ${LAPACK_DLL_DIR})
+ find_file(LAPACK_LIBRARY_DEBUG_FOLDER NAMES lapackd.dll PATHS ${LAPACK_DLL_DIR})
+ find_file(F2C_LIBRARY_RELEASE_DLL NAMES f2c.dll libf2c.dll PATHS ${LAPACK_DLL_DIR})
+ find_file(F2C_LIBRARY_DEBUG_DLL NAMES f2cd.dll libf2cd.dll PATHS ${LAPACK_DLL_DIR})
+endif()
+
+set(LAPACK_BLAS_LIBRARY "${LAPACK_BLAS_LIBRARY}" CACHE STRING "" FORCE)
+set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE)
+set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE)
+set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+
+set(LAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE)
+set(F2C_LIBRARY "${F2C_LIBRARY}" CACHE STRING "" FORCE)
+set(LAPACK_LIBRARY_RELEASE "${LAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(LAPACK_LIBRARY_DEBUG "${LAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+set(F2C_LIBRARY_RELEASE "${F2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE)
+set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE)
+
+find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR)
+mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY)
+
+#TARGETS
+if(CLAPACK_FOUND AND NOT TARGET clapack::clapack)
+ if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}")
+ add_library(clapack::clapack SHARED IMPORTED)
+ set_target_properties(clapack::clapack PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}"
+ IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}"
+ INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$"
+ IMPORTED_CONFIGURATIONS Release
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+ if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}")
+ set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
+ set_target_properties(clapack::clapack PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}"
+ IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}")
+ endif()
+ else()
+ add_library(clapack::clapack UNKNOWN IMPORTED)
+ set_target_properties(clapack::clapack PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}"
+ INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$"
+ IMPORTED_CONFIGURATIONS Release
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+ if(EXISTS "${LAPACK_LIBRARY_DEBUG}")
+ set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
+ set_target_properties(clapack::clapack PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}")
+ endif()
+ endif()
+endif()
+
+if(CLAPACK_FOUND AND NOT TARGET lapack)
+ if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}")
+ add_library(lapack SHARED IMPORTED)
+ set_target_properties(lapack PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}"
+ IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}"
+ INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$"
+ IMPORTED_CONFIGURATIONS Release
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+ if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}")
+ set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
+ set_target_properties(lapack PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}"
+ IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}")
+ endif()
+ else()
+ add_library(lapack UNKNOWN IMPORTED)
+ set_target_properties(lapack PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}"
+ INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}"
+ IMPORTED_CONFIGURATIONS Release
+ INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$"
+ IMPORTED_LINK_INTERFACE_LANGUAGES "C")
+ if(EXISTS "${LAPACK_LIBRARY_DEBUG}")
+ set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug)
+ set_target_properties(lapack PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}")
+ endif()
+ endif()
+endif()
diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake
index 1de30b1093869a..35638748877253 100644
--- a/ports/clapack/portfile.cmake
+++ b/ports/clapack/portfile.cmake
@@ -1,3 +1,7 @@
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/lapack-reference/copyright")
+ message(FATAL_ERROR "Can't build ${PORT} if lapack-reference is installed. Please remove lapack-reference:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
+endif()
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
@@ -11,7 +15,7 @@ vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
PATCHES
remove_internal_blas.patch
- fix-ConfigFile.patch
+ fix-ConfigFile.patch
fix-install.patch
support-uwp.patch
)
@@ -37,11 +41,10 @@ vcpkg_copy_pdbs()
#TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/clapack)
-#we install a cmake wrapper since the official FindLAPACK module in cmake does find clapack easily, unfortunately...
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+# Install clapack wrappers.
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/clapack/vcpkg-cmake-wrapper.cmake b/ports/clapack/vcpkg-cmake-wrapper.cmake
index 26a0a1624b854d..cb2e08fdfad6d6 100644
--- a/ports/clapack/vcpkg-cmake-wrapper.cmake
+++ b/ports/clapack/vcpkg-cmake-wrapper.cmake
@@ -1,2 +1,11 @@
-include(${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake)
+message(STATUS "Using VCPKG FindLAPACK from package 'clapack'")
+set(LAPACK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+list(REMOVE_ITEM ARGS "NO_MODULE")
+list(REMOVE_ITEM ARGS "CONFIG")
+list(REMOVE_ITEM ARGS "MODULE")
+
+_find_package(${ARGS})
+
+set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH})
diff --git a/ports/cli/CONTROL b/ports/cli/CONTROL
index b84813e2ff34c6..8cda2750e5957e 100644
--- a/ports/cli/CONTROL
+++ b/ports/cli/CONTROL
@@ -1,5 +1,5 @@
Source: cli
-Version: 1.2.0
+Version: 1.2.1
Homepage: https://github.com/daniele77/cli
Description: A library for interactive command line interfaces in modern C++
Build-Depends: boost-asio
diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake
index 77813db666b97b..134c718293bff1 100644
--- a/ports/cli/portfile.cmake
+++ b/ports/cli/portfile.cmake
@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO daniele77/cli
- REF v1.2.0
- SHA512 ff548cbc1a77ded32f67d0ff4740d2abb31226cb6f0d9d431e1a35dcdfcaf68a2b9e16e926fc88f19aa17f5c6f5f8e2aead83ff65d7557c192bdd7d4ce2a2d3e
+ REF v1.2.1
+ SHA512 fc834608ac2ca6c3f330711c80897cc581eb1ed8da7a0d56a07efe6650d871f5317c777a6a029fdc0177684f08479bd129cc0ce748354bac3dbe6af79a390d14
HEAD_REF master
)
@@ -17,4 +15,4 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL
index 1f0f0c551e9ce5..e9e64abc69ae0e 100644
--- a/ports/cli11/CONTROL
+++ b/ports/cli11/CONTROL
@@ -1,4 +1,4 @@
Source: cli11
-Version: 1.9.0
+Version: 1.9.1
Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.
Homepage: https://github.com/CLIUtils/CLI11
diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake
index aef2cf0d5d0bc6..69f0a26fe6c2d7 100644
--- a/ports/cli11/portfile.cmake
+++ b/ports/cli11/portfile.cmake
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CLIUtils/CLI11
- REF dd0d8e4fe729e5b1110232c7a5c9566dad884686 #version 1.9.0
- SHA512 dccee89de994d17537b31db717d0f42cae8827a192067718641a6e9e3188f468047a86ce329781142b9c7a1216d5eedcfe975fdbd001f40005a8ab50e08470d9
+ REF 2b059cbdbe844450e1675a5dda3cb8acb1147631 #version 1.9.1
+ SHA512 8b7999ae3692ccb7b324bef033ad4cedccbf720b904aa3aa8d07d1cbc8f09f4ecbd9701d2a50a6266f81fe877e30a63a3b6e07d746fa738291b07476405e866d
HEAD_REF master
)
diff --git a/ports/cmocka/CONTROL b/ports/cmocka/CONTROL
deleted file mode 100644
index 090b8ca799a435..00000000000000
--- a/ports/cmocka/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: cmocka
-Version: 1.1.5
-Port-Version: 3
-Description: An elegant unit testing framework for C with support for mock objects
diff --git a/ports/cmocka/fix-uwp.patch b/ports/cmocka/fix-uwp.patch
deleted file mode 100644
index cb3828b1c2cd47..00000000000000
--- a/ports/cmocka/fix-uwp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cmocka.c b/src/cmocka.c
-index 6bfc831..4c1c04b 100644
---- a/src/cmocka.c
-+++ b/src/cmocka.c
-@@ -3356,7 +3356,7 @@ int _run_tests(const UnitTest * const tests, const size_t number_of_tests) {
- int _run_group_tests(const UnitTest * const tests, const size_t number_of_tests)
- {
- UnitTestFunction setup = NULL;
-- const char *setup_name;
-+ const char *setup_name = NULL;
- size_t num_setups = 0;
- UnitTestFunction teardown = NULL;
- const char *teardown_name = NULL;
diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake
index a448d3a70c58a8..220868ebb3ec26 100644
--- a/ports/cmocka/portfile.cmake
+++ b/ports/cmocka/portfile.cmake
@@ -1,28 +1,20 @@
-include(vcpkg_common_functions)
-
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.com
OUT_SOURCE_PATH SOURCE_PATH
REPO cmocka/cmocka
- REF cmocka-1.1.5
- SHA512 4e305e500f448676be5503972c49089c51f38b47d8129add2205608ed73f9de8b911aee83c00da4ef52c0179a5b5ba0e3386f3bca839f18e7ab21787184d9990
+ REF 672c5cee79eb412025c3dd8b034e611c1f119055
+ SHA512 e02ffe780698ce3930aceb1b927f7d48c932c6bb251a32b1f4ab44ecb4ff6bfe5c2a6b9e2dfede49cd4cc1d68a8bb903ef1d26c28536abf3581a9d803287aa0a
HEAD_REF master
- PATCHES
- shared-lib.patch
- static-lib.patch
- fix-uwp.patch
)
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
+ -DWITH_CMOCKERY_SUPPORT=ON
-DUNIT_TESTING=OFF
-DWITH_EXAMPLES=OFF
- -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB}
- -DWITH_STATIC_LIB=${BUILD_STATIC_LIB}
+ -DPICKY_DEVELOPER=OFF
)
vcpkg_install_cmake()
@@ -31,18 +23,6 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
-file(COPY
- ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
- DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
-)
-
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# Handle copyright
-configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# Install usage
-configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
-
-# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cmocka/shared-lib.patch b/ports/cmocka/shared-lib.patch
deleted file mode 100644
index 8c2f76277bd66f..00000000000000
--- a/ports/cmocka/shared-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5684685..8555169 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -30,7 +30,7 @@ if (WIN32)
- cmocka.def
- )
- endif (WIN32)
--
-+if (BUILD_SHARED_LIBS)
- add_library(${CMOCKA_SHARED_LIBRARY} SHARED ${cmocka_SRCS})
-
- target_include_directories(${CMOCKA_SHARED_LIBRARY}
-@@ -82,7 +82,7 @@ install(TARGETS
- ${CMAKE_INSTALL_BINDIR}
- COMPONENT
- ${PROJECT_NAME})
--
-+endif (BUILD_SHARED_LIBS)
- if (BUILD_STATIC_LIB)
- add_library(${CMOCKA_STATIC_LIBRARY} STATIC ${cmocka_SRCS})
-
diff --git a/ports/cmocka/static-lib.patch b/ports/cmocka/static-lib.patch
deleted file mode 100644
index f879fe25bd1f75..00000000000000
--- a/ports/cmocka/static-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 00e568e..6e3489a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,9 +77,17 @@ install(
-
- # cmake config files
- if (WIN32)
-+ if (BUILD_SHARED_LIBS)
- set(CMOCKA_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
-+ else()
-+ set(CMOCKA_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${CMOCKA_STATIC_LIBRARY}${CMAKE_IMPORT_LIBRARY_SUFFIX})
-+ endif()
- else()
-+ if (BUILD_SHARED_LIBS)
- set(CMOCKA_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-+ else()
-+ set(CMOCKA_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}${CMOCKA_STATIC_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX})
-+ endif()
- endif()
-
- set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE INTERNAL "")
diff --git a/ports/cmocka/usage b/ports/cmocka/usage
deleted file mode 100644
index 59f2a5da8b63b4..00000000000000
--- a/ports/cmocka/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
-
- find_package(@PORT@ CONFIG REQUIRED)
- target_include_directories(main PRIVATE ${CMOCKA_INCLUDE_DIR})
- target_link_libraries(main PRIVATE ${CMOCKA_LIBRARIES})
diff --git a/ports/cmocka/vcpkg-cmake-wrapper.cmake b/ports/cmocka/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 49b486ff83b493..00000000000000
--- a/ports/cmocka/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-_find_package(${ARGS})
-
-get_filename_component(_cmocka_lib_name ${CMOCKA_LIBRARY} NAME)
-
-set(CMOCKA_LIBRARY
- debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_cmocka_lib_name}
- optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_cmocka_lib_name}
-)
-
-set(CMOCKA_LIBRARIES ${CMOCKA_LIBRARY})
diff --git a/ports/cmocka/vcpkg.json b/ports/cmocka/vcpkg.json
new file mode 100644
index 00000000000000..d7bcbcf49635a2
--- /dev/null
+++ b/ports/cmocka/vcpkg.json
@@ -0,0 +1,7 @@
+{
+ "name": "cmocka",
+ "version-string": "2020-08-01",
+ "description": "An elegant unit testing framework for C with support for mock objects",
+ "homepage": "https://cmocka.org/",
+ "license": "Apache-2.0"
+}
diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake
new file mode 100644
index 00000000000000..6b9bf3284c4af2
--- /dev/null
+++ b/ports/colmap/portfile.cmake
@@ -0,0 +1,89 @@
+set(COLMAP_REF "3.6")
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO colmap/colmap
+ REF ${COLMAP_REF}
+ SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632
+ HEAD_REF dev
+)
+
+if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
+ message(FATAL_ERROR "Feature cuda and cuda-redist require x64 triplet.")
+endif()
+
+# set GIT_COMMIT_ID and GIT_COMMIT_DATE
+if(DEFINED VCPKG_HEAD_VERSION)
+ set(GIT_COMMIT_ID "${VCPKG_HEAD_VERSION}")
+else()
+ set(GIT_COMMIT_ID "${COLMAP_REF}")
+endif()
+
+string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d")
+
+set(CUDA_ENABLED OFF)
+set(TESTS_ENABLED OFF)
+
+if("cuda" IN_LIST FEATURES)
+ set(CUDA_ENABLED ON)
+endif()
+
+if("cuda-redist" IN_LIST FEATURES)
+ set(CUDA_ENABLED ON)
+ set(CUDA_ARCHS "Common")
+endif()
+
+if("tests" IN_LIST FEATURES)
+ set(TESTS_ENABLED ON)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCUDA_ENABLED=${CUDA_ENABLED}
+ -DCUDA_ARCHS=${CUDA_ARCHS}
+ -DTESTS_ENABLED=${TESTS_ENABLED}
+ -DGIT_COMMIT_ID=${GIT_COMMIT_ID}
+ -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets()
+
+file(GLOB TOOL_FILENAMES "${CURRENT_PACKAGES_DIR}/bin/*")
+foreach(TOOL_FILENAME ${TOOL_FILENAMES})
+ get_filename_component(TEST_TOOL_NAME ${TOOL_FILENAME} NAME_WLE)
+ list(APPEND COLMAP_TOOL_NAMES "${TEST_TOOL_NAME}")
+endforeach()
+
+vcpkg_copy_tools(TOOL_NAMES ${COLMAP_TOOL_NAMES} AUTO_CLEAN)
+
+# remove empty folders and unused files
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share
+ ${CURRENT_PACKAGES_DIR}/debug/include/colmap/exe
+ ${CURRENT_PACKAGES_DIR}/debug/include/colmap/lib/Graclus/multilevelLib
+ ${CURRENT_PACKAGES_DIR}/debug/include/colmap/tools
+ ${CURRENT_PACKAGES_DIR}/debug/include/colmap/ui/media
+ ${CURRENT_PACKAGES_DIR}/debug/include/colmap/ui/shaders
+ ${CURRENT_PACKAGES_DIR}/include/colmap/exe
+ ${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib
+ ${CURRENT_PACKAGES_DIR}/include/colmap/tools
+ ${CURRENT_PACKAGES_DIR}/include/colmap/ui/media
+ ${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders
+ ${CURRENT_PACKAGES_DIR}/COLMAP.bat
+ ${CURRENT_PACKAGES_DIR}/RUN_TESTS.bat
+ ${CURRENT_PACKAGES_DIR}/debug/COLMAP.bat
+ ${CURRENT_PACKAGES_DIR}/debug/RUN_TESTS.bat
+ ${CURRENT_PACKAGES_DIR}/debug/bin
+)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYING.txt
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+ RENAME copyright
+)
diff --git a/ports/colmap/usage b/ports/colmap/usage
new file mode 100644
index 00000000000000..b71316b3cf81a3
--- /dev/null
+++ b/ports/colmap/usage
@@ -0,0 +1,10 @@
+For example, under Windows, execute COLMAP as:
+
+ \packages\colmap_\tools\colmap\colmap.exe gui
+ \packages\colmap_\tools\colmap\colmap.exe mapper
+ \packages\colmap_\tools\colmap\colmap.exe ...
+
+The package colmap provides CMake integration:
+
+ find_package(COLMAP REQUIRED)
+ target_link_libraries(main ${COLMAP_LIBRARIES})
diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json
new file mode 100644
index 00000000000000..565e945baba8e5
--- /dev/null
+++ b/ports/colmap/vcpkg.json
@@ -0,0 +1,55 @@
+{
+ "name": "colmap",
+ "version-string": "3.6",
+ "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
+ "homepage": "https://colmap.github.io/",
+ "license": "BSD-3-Clause",
+ "dependencies": [
+ "boost-filesystem",
+ "boost-graph",
+ "boost-program-options",
+ "boost-regex",
+ "boost-system",
+ "boost-test",
+ {
+ "name": "ceres",
+ "features": [
+ "lapack",
+ "suitesparse"
+ ]
+ },
+ {
+ "name": "cgal",
+ "features": [
+ "qt"
+ ]
+ },
+ "eigen3",
+ "freeimage",
+ "gflags",
+ "glew",
+ "glog",
+ "qt5-base",
+ "suitesparse"
+ ],
+ "features": [
+ {
+ "name": "cuda",
+ "description": "CUDA support for current compute architecture of this machine.",
+ "dependencies": [
+ "cuda"
+ ]
+ },
+ {
+ "name": "cuda-redist",
+ "description": "Redistributable CUDA support for common supported compute architectures.",
+ "dependencies": [
+ "cuda"
+ ]
+ },
+ {
+ "name": "tests",
+ "description": "Enable TESTS."
+ }
+ ]
+}
diff --git a/ports/constexpr-contracts/CONTROL b/ports/constexpr-contracts/CONTROL
new file mode 100644
index 00000000000000..515b9b2b56907f
--- /dev/null
+++ b/ports/constexpr-contracts/CONTROL
@@ -0,0 +1,4 @@
+Source: constexpr-contracts
+Version: 2020-08-09
+Homepage: https://github.com/cjdb/constexpr-contracts
+Description: A constexpr-friendly, optimisation-friendly contracts library.
diff --git a/ports/constexpr-contracts/portfile.cmake b/ports/constexpr-contracts/portfile.cmake
new file mode 100644
index 00000000000000..d189ba43d9e5a1
--- /dev/null
+++ b/ports/constexpr-contracts/portfile.cmake
@@ -0,0 +1,20 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO cjdb/constexpr-contracts
+ REF 58154e9010cb80aad4e95ef6f1835ebd7db3780a # commit 2020-05-25
+ SHA512 b634267a4044cd712c8e52f65cd305f437864cab591f2b22104581f70b305ba52889dd46724e6047386463a010ee78fdd951411ea3691b5725d52d13f7adda76
+ HEAD_REF main
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/constexpr-contracts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib
+ ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/coroutine/CONTROL b/ports/coroutine/CONTROL
deleted file mode 100644
index 13fa58ab2a58f2..00000000000000
--- a/ports/coroutine/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: coroutine
-Homepage: https://github.com/luncliff/coroutine
-Version: 1.5.0
-Build-Depends: ms-gsl
-Description: C++ 20 Coroutines helper/example library
-Supports: !uwp
diff --git a/ports/coroutine/fix-errorC7651.patch b/ports/coroutine/fix-errorC7651.patch
new file mode 100644
index 00000000000000..42c4291a500006
--- /dev/null
+++ b/ports/coroutine/fix-errorC7651.patch
@@ -0,0 +1,68 @@
+diff --git a/modules/portable/frame.cpp b/modules/portable/frame.cpp
+index 2cedf81..f413f28 100644
+--- a/modules/portable/frame.cpp
++++ b/modules/portable/frame.cpp
+@@ -77,13 +77,31 @@ size_t _coro_done(void*);
+ //
+ // intrinsic: Clang/GCC
+ //
+-extern "C" {
+-bool __builtin_coro_done(void*);
+-void __builtin_coro_resume(void*);
+-void __builtin_coro_destroy(void*);
+-// void* __builtin_coro_promise(void* ptr, int align, bool p);
++//extern "C" {
++template
++void resume_wrapper(void *p)
++{
++ if constexpr (B)
++ __builtin_coro_resume(p);
++}
++
++template
++void destroy_wrapper(void *p)
++{
++ if constexpr(B)
++ __builtin_coro_destroy(p);
+ }
+
++template
++bool done_wrapper(void *p)
++{
++ if constexpr(B)
++ return __builtin_coro_done(p);
++ return false;
++}
++// void* __builtin_coro_promise(void* ptr, int align, bool p);
++//}
++
+ bool _coro_finished(portable_coro_prefix* _Handle);
+
+ #if defined(__clang__)
+@@ -124,7 +142,7 @@ bool portable_coro_done(portable_coro_prefix* _Handle) {
+ if constexpr (is_msvc) {
+ return _coro_finished(_Handle);
+ } else if constexpr (is_clang) {
+- return __builtin_coro_done(_Handle);
++ return done_wrapper(_Handle);
+ }
+ return false; // follow `noop_coroutine`
+ }
+@@ -133,7 +151,7 @@ void portable_coro_resume(portable_coro_prefix* _Handle) {
+ if constexpr (is_msvc) {
+ _coro_resume(_Handle);
+ } else if constexpr (is_clang) {
+- __builtin_coro_resume(_Handle);
++ resume_wrapper(_Handle);
+ }
+ }
+
+@@ -141,7 +159,7 @@ void portable_coro_destroy(portable_coro_prefix* _Handle) {
+ if constexpr (is_msvc) {
+ _coro_destroy(_Handle);
+ } else if constexpr (is_clang) {
+- __builtin_coro_destroy(_Handle);
++ destroy_wrapper(_Handle);
+ }
+ }
+
diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake
index 26abb7bf7a3ffe..3c5f27b72caaab 100644
--- a/ports/coroutine/portfile.cmake
+++ b/ports/coroutine/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
REF 1.5.0
SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594
HEAD_REF master
+ PATCHES fix-errorC7651.patch
)
vcpkg_configure_cmake(
diff --git a/ports/coroutine/vcpkg.json b/ports/coroutine/vcpkg.json
new file mode 100644
index 00000000000000..4e71341284ef76
--- /dev/null
+++ b/ports/coroutine/vcpkg.json
@@ -0,0 +1,11 @@
+{
+ "name": "coroutine",
+ "version-string": "1.5.0",
+ "port-version": 1,
+ "description": "C++ 20 Coroutines helper/example library",
+ "homepage": "https://github.com/luncliff/coroutine",
+ "supports": "!uwp",
+ "dependencies": [
+ "ms-gsl"
+ ]
+}
diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL
index ee3e33ed041cb1..72ef86c8ec1f0f 100644
--- a/ports/cpp-taskflow/CONTROL
+++ b/ports/cpp-taskflow/CONTROL
@@ -1,4 +1,4 @@
Source: cpp-taskflow
-Version: 2.2.0-1
+Version: 2.5.0
Description: Fast Parallel Tasking Programming Library using Modern C++.
Homepage: https://github.com/taskflow/taskflow
diff --git a/ports/cpp-taskflow/fix-compiler-error.patch b/ports/cpp-taskflow/fix-compiler-error.patch
new file mode 100644
index 00000000000000..1bcdcd41f8eb0e
--- /dev/null
+++ b/ports/cpp-taskflow/fix-compiler-error.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9beec931..6782f1d5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,7 +89,7 @@ target_compile_options(
+ $<$:-Wall -Wextra -Wfatal-errors>
+ $<$,$>:-Wall -Wextra -Wfatal-errors>
+ $<$,$>:-Wall -Wextra -Wfatal-errors>
+- $<$,$>:/W3 /permissive->
++ $<$,$>:/bigobj /W3 /permissive->
+ #$<$:-Xcompiler=-Wall,-Wextra,-Wfatal-errors>
+ #$<$:-Wall -Wextra -Wfatal-errors>
+ #$<$:-Wall -Wextra -Wfatal-errors>
+@@ -219,6 +219,8 @@ target_include_directories(${PROJECT_NAME} INTERFACE
+ # Example program
+ # -----------------------------------------------------------------------------
+
++if(BUILD_TEST)
++
+ message(STATUS "Building examples ...")
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TF_EXAMPLE_DIR})
+
+@@ -617,6 +619,8 @@ add_test(cuda_kmeans.1000.16C16G ${TF_UTEST_CUDA_KMEANS} -tc=kmeans.1000.16C16G)
+
+ endif(CMAKE_CUDA_COMPILER)
+
++endif()
++
+ # -----------------------------------------------------------------------------
+ # Benchmarking (enabled by TF_BUILD_BENCHMARKS)
+ # -----------------------------------------------------------------------------
diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake
index 8e2964337e79a9..735a08d47bfcf0 100644
--- a/ports/cpp-taskflow/portfile.cmake
+++ b/ports/cpp-taskflow/portfile.cmake
@@ -2,9 +2,10 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taskflow/taskflow
- REF v2.2.0
- SHA512 1aa4e9d7324f56eb33cd4986d721035f0abf12e022da956bafc0b16cf6cb82d152334ae58edc4581ab2f6d44989ca21cdd590ad560d6f1a4f905710fe08d0091
+ REF v2.5.0
+ SHA512 49f38a14a207db085a2e3581b3698cdb3be4fa65c11194db454bd2fb65da2d744347c6a10a7a903b04cc2dd5cac65ef389d400c66d2a23521c3bbe2283357890
HEAD_REF master
+ PATCHES fix-compiler-error.patch
)
vcpkg_configure_cmake(
@@ -12,8 +13,9 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DTF_BUILD_EXAMPLES=OFF
- -DTF_BUILD_TESTS=OFF
+ -DBUILD_TESTING=OFF
-DTF_BUILD_BENCHMARKS=OFF
+ -DCMAKE_CUDA_COMPILER=OFF
)
vcpkg_install_cmake()
@@ -23,4 +25,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
\ No newline at end of file
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cppad/CONTROL b/ports/cppad/CONTROL
new file mode 100644
index 00000000000000..f38cfd121b4da8
--- /dev/null
+++ b/ports/cppad/CONTROL
@@ -0,0 +1,5 @@
+Source: cppad
+Version: 20200000.3
+Homepage: https://github.com/coin-or/CppAD
+Description: CppAD: A Package for Differentiation of C++ Algorithms
+Supports: !(arm|uwp)
diff --git a/ports/cppad/pkgconfig-fix.patch b/ports/cppad/pkgconfig-fix.patch
new file mode 100644
index 00000000000000..6688fc9d7f90f1
--- /dev/null
+++ b/ports/cppad/pkgconfig-fix.patch
@@ -0,0 +1,63 @@
+diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
+index db8b65902..b1224a01d 100644
+--- a/pkgconfig/CMakeLists.txt
++++ b/pkgconfig/CMakeLists.txt
+@@ -42,8 +42,9 @@ ENDIF( cppad_has_ipopt )
+ # cppad_pkgconfig_cflags
+ # cppad_pkgconfig_cflags_uninstalled
+ #
+-SET(cppad_pkgconfig_cflags "-I${cppad_abs_includedir}" )
+-SET(cppad_pkgconfig_cflags_uninstalled "-I${cppad_SOURCE_DIR}" )
++SET(cppad_pkgconfig_includedir "${cmake_install_includedirs}" )
++SET(cppad_pkgconfig_cflags_uninstalled "-I${cppad_SOURCE_DIR}" )
++SET(cppad_pkgconfig_libdir "${cmake_install_libdirs}" )
+ # ----------------------------------------------------------------------------
+ # cppad_pkgconfig_libs
+ # cppad_pkgconfig_libs_uninstalled
+@@ -74,7 +75,7 @@ IF( "${libs}" STREQUAL "" )
+ SET(cppad_pkgconfig_libs "")
+ SET(cppad_pkgconfig_libs_uninstalled "")
+ ELSE( "${libs}" STREQUAL "" )
+- SET(cppad_pkgconfig_libs "-L${cppad_abs_libdir} ${libs}")
++ SET(cppad_pkgconfig_libs "-L\${libdir} ${libs}")
+ SET(cppad_pkgconfig_libs_uninstalled "${uninstalled} ${libs}")
+ ENDIF( "${libs}" STREQUAL "" )
+ #
+@@ -84,10 +85,12 @@ ENDIF( "${libs}" STREQUAL "" )
+ CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppad.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
++ @ONLY
+ )
+ CONFIGURE_FILE(
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppad-uninstalled.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/cppad-uninstalled.pc
++ @ONLY
+ )
+ # During install copy cppad.pc to datadir and libdir
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc
+diff --git a/pkgconfig/cppad.pc.in b/pkgconfig/cppad.pc.in
+index a202e3fb3..1c34c1e08 100644
+--- a/pkgconfig/cppad.pc.in
++++ b/pkgconfig/cppad.pc.in
+@@ -12,12 +12,19 @@
+ # This file is used with pkg-config to include CppAD after it is installed
+ #
+ # Entries set by top source directory CMakeLists.txt file
++
++prefix=${pcfiledir}/../..
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@cppad_pkgconfig_libdir@
++includedir=${prefix}/@cppad_pkgconfig_includedir@
++
+ Name: cppad
+ Description: @cppad_description@
+ Version: @cppad_version@
+ URL: @cppad_url@
++
+ #
+ # Entries set by pkgconfig/CMakeLists.txt file
+-Cflags: @cppad_pkgconfig_cflags@
++Cflags: -I${includedir}
+ Libs: @cppad_pkgconfig_libs@
+ Requires: @cppad_pkgconfig_requires@
diff --git a/ports/cppad/portfile.cmake b/ports/cppad/portfile.cmake
new file mode 100644
index 00000000000000..1c9fc8ddf4e45e
--- /dev/null
+++ b/ports/cppad/portfile.cmake
@@ -0,0 +1,42 @@
+# the compilation fails on arm and uwp. Please check the related issue:
+# https://github.com/microsoft/vcpkg/pull/12560#issuecomment-668412073
+vcpkg_fail_port_install(ON_TARGET "uwp" and "arm")
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO coin-or/CppAD
+ REF 20200000.3
+ SHA512 4e980665a21c76cf355d1c5597c65fbfba7ac3e15c43a88ccfe3ba0267b85b4e9aa7c6e8a0ed7a728f8cf2c6e1424625d5cbcdd295a6c0a08b47b4b121572d13
+ HEAD_REF master
+ PATCHES
+ windows-fix.patch
+ pkgconfig-fix.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
+ OPTIONS
+ -Dcppad_prefix=${CURRENT_PACKAGES_DIR}
+ OPTIONS_RELEASE
+ -Dcmake_install_libdirs=lib
+ -Dcppad_debug_which:STRING=debug_none
+ OPTIONS_DEBUG
+ -Dcmake_install_libdirs=debug/lib
+)
+
+vcpkg_install_cmake()
+
+# Install the pkgconfig file
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+endif()
+
+vcpkg_fixup_pkgconfig()
+
+# Add the copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cppad/windows-fix.patch b/ports/cppad/windows-fix.patch
new file mode 100644
index 00000000000000..50c38ca12307e6
--- /dev/null
+++ b/ports/cppad/windows-fix.patch
@@ -0,0 +1,105 @@
+diff --git a/cppad_lib/cppad_colpack.cpp b/cppad_lib/cppad_colpack.cpp
+index dc3327053..739363292 100644
+--- a/cppad_lib/cppad_colpack.cpp
++++ b/cppad_lib/cppad_colpack.cpp
+@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
+
+ # if CPPAD_HAS_COLPACK == 0
+ namespace CppAD { namespace local {
+- CPPAD_LIB_EXPORT void this_routine_should_never_get_called(void)
++ void this_routine_should_never_get_called(void)
+ { CPPAD_ASSERT_UNKNOWN(false); }
+ } }
+ # else // CPPAD_HAS_COLPACK
+@@ -52,7 +52,7 @@ the entry with index (i, adolc_pattern[i][k]) is a non-zero
+ in the sparsity pattern for the matrix.
+ */
+ // ----------------------------------------------------------------------
+-CPPAD_LIB_EXPORT void cppad_colpack_general(
++void cppad_colpack_general(
+ CppAD::vector& color ,
+ size_t m ,
+ size_t n ,
+@@ -164,7 +164,7 @@ For i = 0 , ... , m-1, and for k = 1, ... ,adolc_pattern[i][0],
+ the entry with index (i, adolc_pattern[i][k]) is
+ in the sparsity pattern for the symmetric matrix.
+ */
+-CPPAD_LIB_EXPORT void cppad_colpack_symmetric(
++void cppad_colpack_symmetric(
+ CppAD::vector& color ,
+ size_t m ,
+ const CppAD::vector& adolc_pattern )
+diff --git a/cppad_lib/json_parser.cpp b/cppad_lib/json_parser.cpp
+index fac417d9f..ac0910cee 100644
+--- a/cppad_lib/json_parser.cpp
++++ b/cppad_lib/json_parser.cpp
+@@ -20,7 +20,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
+ // documentation for this routine is in the file below
+ # include
+
+-CPPAD_LIB_EXPORT void CppAD::local::graph::json_parser(
++void CppAD::local::graph::json_parser(
+ const std::string& json ,
+ cpp_graph& graph_obj )
+ { using std::string;
+diff --git a/cppad_lib/json_writer.cpp b/cppad_lib/json_writer.cpp
+index 250345c6e..add4b20a9 100644
+--- a/cppad_lib/json_writer.cpp
++++ b/cppad_lib/json_writer.cpp
+@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
+ // documentation for this routine is in the file below
+ # include
+
+-CPPAD_LIB_EXPORT void CppAD::local::graph::json_writer(
++void CppAD::local::graph::json_writer(
+ std::string& json ,
+ const cpp_graph& graph_obj )
+ { using std::string;
+diff --git a/include/cppad/local/cppad_colpack.hpp b/include/cppad/local/cppad_colpack.hpp
+index ee96ab5fe..6dd022180 100644
+--- a/include/cppad/local/cppad_colpack.hpp
++++ b/include/cppad/local/cppad_colpack.hpp
+@@ -59,7 +59,7 @@ it is not the case that both
+ This routine tries to minimize, with respect to the choice of colors,
+ the number of colors.
+ */
+-extern void cppad_colpack_general(
++CPPAD_LIB_EXPORT void cppad_colpack_general(
+ CppAD::vector& color ,
+ size_t m ,
+ size_t n ,
+@@ -91,7 +91,7 @@ The properties of this coloring have not yet been determined; see
+ Efficient Computation of Sparse Hessians Using Coloring
+ and Automatic Differentiation (pdf/ad/gebemedhin14.pdf)
+ */
+-extern void cppad_colpack_symmetric(
++CPPAD_LIB_EXPORT void cppad_colpack_symmetric(
+ CppAD::vector& color ,
+ size_t n ,
+ const CppAD::vector& adolc_pattern
+diff --git a/include/cppad/local/graph/json_parser.hpp b/include/cppad/local/graph/json_parser.hpp
+index 17bcc7c7e..a28d2c045 100644
+--- a/include/cppad/local/graph/json_parser.hpp
++++ b/include/cppad/local/graph/json_parser.hpp
+@@ -42,7 +42,7 @@ Upon return it is a $cref cpp_ad_graph$$ representation of this function.
+ $head Prototype$$
+ $srccode%hpp% */
+ namespace CppAD { namespace local { namespace graph {
+- void json_parser(
++ CPPAD_LIB_EXPORT void json_parser(
+ const std::string& json ,
+ cpp_graph& graph_obj
+ );
+diff --git a/include/cppad/local/graph/json_writer.hpp b/include/cppad/local/graph/json_writer.hpp
+index 36a4cb39f..299c56cc0 100644
+--- a/include/cppad/local/graph/json_writer.hpp
++++ b/include/cppad/local/graph/json_writer.hpp
+@@ -41,7 +41,7 @@ This is a $code cpp_graph$$ object.
+ $head Prototype$$
+ $srccode%hpp% */
+ namespace CppAD { namespace local { namespace graph {
+- void json_writer(
++ CPPAD_LIB_EXPORT void json_writer(
+ std::string& json ,
+ const cpp_graph& graph_obj
+ );
diff --git a/ports/cpu-features/portfile.cmake b/ports/cpu-features/portfile.cmake
new file mode 100644
index 00000000000000..e50d5ef1405046
--- /dev/null
+++ b/ports/cpu-features/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO google/cpu_features
+ REF b9593c8b395318bb2bc42683a94f962564cc4664 # 0.4.1
+ SHA512 8c12b50741e2979a32b69c788934bee0d00811b7662006c8b493e98d5efeada67ed59460be40c234b2d3bafd85671cb1a1d7c1a6ee535a7fc1cc6ac56a754576
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CpuFeatures TARGET_PATH share/CpuFeatures)
+
+if("tools" IN_LIST FEATURES)
+ vcpkg_copy_tools(TOOL_NAMES list_cpu_features)
+endif()
+vcpkg_clean_executables_in_bin(FILE_NAMES list_cpu_features)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cpu-features/vcpkg.json b/ports/cpu-features/vcpkg.json
new file mode 100644
index 00000000000000..f773cf60b4414e
--- /dev/null
+++ b/ports/cpu-features/vcpkg.json
@@ -0,0 +1,14 @@
+{
+ "name": "cpu-features",
+ "version-string": "0.4.1",
+ "description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime",
+ "homepage": "https://github.com/google/cpu_features",
+ "license": "Apache-2.0",
+ "supports": "!(arm | uwp)",
+ "features": [
+ {
+ "name": "tools",
+ "description": "list_cpu_features command line tool"
+ }
+ ]
+}
diff --git a/ports/crashrpt/001-add-install-target-and-find-deps.patch b/ports/crashrpt/001-add-install-target-and-find-deps.patch
new file mode 100644
index 00000000000000..2d983800d4a58a
--- /dev/null
+++ b/ports/crashrpt/001-add-install-target-and-find-deps.patch
@@ -0,0 +1,809 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 44d7df0..ed9e3d3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,6 +17,9 @@ set (CRASHRPT_VER 1403)
+ # Build options
+ option(CRASHRPT_BUILD_SHARED_LIBS "If set (default), CrashRpt modules are built as dynamic-link libraries, otherwise as static libs." ON)
+ option(CRASHRPT_LINK_CRT_AS_DLL "If set (default), CrashRpt modules link C run-time (CRT) as multi-threaded dynamic libraries, otherwise as multi-threaded static libs." ON)
++option(CRASHRPT_BUILD_PROBE "If set (default), CrashRpt builds the CrashRptProbe project." ON)
++option(CRASHRPT_BUILD_DEMOS "If set (default), CrashRpt builds the demo projects." ON)
++option(CRASHRPT_BUILD_TESTS "If set (default), CrashRpt builds the test projects." ON)
+
+ # Set output directory for executable files
+ if(CMAKE_CL_64)
+@@ -94,19 +97,65 @@ macro(fix_default_compiler_settings_)
+
+ endmacro()
+
++find_package(ZLIB REQUIRED)
++find_package(PNG REQUIRED)
++find_package(Ogg REQUIRED)
++find_package(JPEG REQUIRED)
++
++find_library(THEORA_LIBRARY theora)
++if(NOT THEORA_LIBRARY)
++ message(FATAL_ERROR "theora library not found")
++endif()
++
++find_path(THEORA_INCLUDE_DIR theora/theora.h)
++if(NOT THEORA_INCLUDE_DIR)
++ message(FATAL_ERROR "theora include dir not found")
++endif()
++
++find_library(TINYXML_LIBRARY NAMES tinyxml)
++if(NOT TINYXML_LIBRARY)
++ message(FATAL_ERROR "tinyxml library not found")
++endif()
++
++find_path(TINYXML_INCLUDE_DIR tinyxml.h)
++if(NOT TINYXML_INCLUDE_DIR)
++ message(FATAL_ERROR "tinyxml include dir not found")
++endif()
++
++find_path(WTL_INCLUDE_DIR wtl/atlapp.h)
++if(NOT WTL_INCLUDE_DIR)
++ message(FATAL_ERROR "WTL include dir not found")
++endif()
++
++find_library(DBGHELP_LIBRARY dbghelp)
++if(NOT DBGHELP_LIBRARY)
++ message(FATAL_ERROR "dbghelp library not found")
++endif()
++
++find_path(DBGHELP_INCLUDE_DIR dbghelp.h)
++if(NOT DBGHELP_INCLUDE_DIR)
++ message(FATAL_ERROR "dbghelp include dir not found")
++endif()
++
+ # Other CMakeLists are located in project subdirectories
+
++if(CRASHRPT_BUILD_DEMOS)
+ add_subdirectory("demos/ConsoleDemo")
+ add_subdirectory("demos/WTLDemo")
+ add_subdirectory("demos/MFCDemo")
++endif()
+
+ add_subdirectory("reporting/crashrpt")
+ add_subdirectory("reporting/crashsender")
+
++if(CRASHRPT_BUILD_PROBE)
+ add_subdirectory("processing/crashrptprobe")
+ add_subdirectory("processing/crprober")
++endif()
+
++if(CRASHRPT_BUILD_TESTS)
+ add_subdirectory("tests")
++endif()
+
+ # Set output directory for LIB files
+ if(CMAKE_CL_64)
+@@ -117,13 +166,13 @@ else(CMAKE_CL_64)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/thirdparty/lib)
+ endif(CMAKE_CL_64)
+
+-add_subdirectory("thirdparty/tinyxml")
+-add_subdirectory("thirdparty/jpeg")
+-add_subdirectory("thirdparty/libpng")
++#add_subdirectory("thirdparty/tinyxml")
++#add_subdirectory("thirdparty/jpeg")
++#add_subdirectory("thirdparty/libpng")
+ add_subdirectory("thirdparty/minizip")
+-add_subdirectory("thirdparty/zlib")
+-add_subdirectory("thirdparty/libogg")
+-add_subdirectory("thirdparty/libtheora")
++#add_subdirectory("thirdparty/zlib")
++#add_subdirectory("thirdparty/libogg")
++#add_subdirectory("thirdparty/libtheora")
+
+
+
+diff --git a/demos/ConsoleDemo/CMakeLists.txt b/demos/ConsoleDemo/CMakeLists.txt
+index e47ef4c..4df7b12 100644
+--- a/demos/ConsoleDemo/CMakeLists.txt
++++ b/demos/ConsoleDemo/CMakeLists.txt
+@@ -12,12 +12,12 @@ fix_default_compiler_settings_()
+ # Add include dir
+ include_directories(${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/reporting/CrashRpt
+- ${CMAKE_SOURCE_DIR}/thirdparty/wtl
+- ${CMAKE_SOURCE_DIR}/thirdparty/zlib
++ ${WTL_INCLUDE_DIR}
++ ${ZLIB_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/thirdparty/minizip
+- ${CMAKE_SOURCE_DIR}/thirdparty/jpeg
+- ${CMAKE_SOURCE_DIR}/thirdparty/libpng
+- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml )
++ ${JPEG_INCLUDE_DIR}
++ ${PNG_INCLUDE_DIRS}
++ ${TINYXML_INCLUDE_DIR} )
+
+ # Add executable build target
+ add_executable(ConsoleDemo ${source_files} ${header_files})
+@@ -26,3 +26,7 @@ add_executable(ConsoleDemo ${source_files} ${header_files})
+ target_link_libraries(ConsoleDemo CrashRpt)
+
+ set_target_properties(ConsoleDemo PROPERTIES DEBUG_POSTFIX d )
++
++install(TARGETS ConsoleDemo
++ RUNTIME DESTINATION tools/crashrpt
++)
+diff --git a/demos/MFCDemo/CMakeLists.txt b/demos/MFCDemo/CMakeLists.txt
+index a250ecc..ade93cb 100644
+--- a/demos/MFCDemo/CMakeLists.txt
++++ b/demos/MFCDemo/CMakeLists.txt
+@@ -44,7 +44,7 @@ if(CMAKE_CL_64)
+ ADD_CUSTOM_COMMAND(
+ TARGET WTLDemo
+ POST_BUILD
+- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\""
+@@ -53,9 +53,13 @@ else(CMAKE_CL_64)
+ ADD_CUSTOM_COMMAND(
+ TARGET WTLDemo
+ POST_BUILD
+- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\""
+ )
+-endif(CMAKE_CL_64)
+\ No newline at end of file
++endif(CMAKE_CL_64)
++
++install(TARGETS MFCDemo
++ RUNTIME DESTINATION tools/crashrpt
++)
+diff --git a/demos/WTLDemo/AboutDlg.h b/demos/WTLDemo/AboutDlg.h
+index 83eaac0..e96d1c2 100644
+--- a/demos/WTLDemo/AboutDlg.h
++++ b/demos/WTLDemo/AboutDlg.h
+@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #pragma once
+ #include "stdafx.h"
+ #include
+-#include
++#include
+ #include "CrashRpt.h"
+
+ class CAboutDlg : public CDialogImpl
+diff --git a/demos/WTLDemo/CMakeLists.txt b/demos/WTLDemo/CMakeLists.txt
+index 40aaefb..42c0f5a 100644
+--- a/demos/WTLDemo/CMakeLists.txt
++++ b/demos/WTLDemo/CMakeLists.txt
+@@ -19,7 +19,7 @@ fix_default_compiler_settings_()
+
+ # Add include dir
+ include_directories(${CMAKE_SOURCE_DIR}/include
+- ${CMAKE_SOURCE_DIR}/thirdparty/wtl)
++ ${WTL_INCLUDE_DIR})
+
+ # Add executable build target
+ add_executable(WTLDemo WIN32 ${source_files} ${header_files})
+@@ -36,7 +36,7 @@ if(CMAKE_CL_64)
+ ADD_CUSTOM_COMMAND(
+ TARGET WTLDemo
+ POST_BUILD
+- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\""
+@@ -45,9 +45,13 @@ else(CMAKE_CL_64)
+ ADD_CUSTOM_COMMAND(
+ TARGET WTLDemo
+ POST_BUILD
+- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
++ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\""
+ COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\""
+ )
+-endif(CMAKE_CL_64)
+\ No newline at end of file
++endif(CMAKE_CL_64)
++
++install(TARGETS WTLDemo
++ RUNTIME DESTINATION tools/crashrpt
++)
+diff --git a/demos/WTLDemo/DocumentDlg.h b/demos/WTLDemo/DocumentDlg.h
+index afce8fe..9b47728 100644
+--- a/demos/WTLDemo/DocumentDlg.h
++++ b/demos/WTLDemo/DocumentDlg.h
+@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #pragma once
+ #include "stdafx.h"
+ #include
+-#include
++#include
+ #include "CrashRpt.h"
+
+ class CDocumentDlg : public CDialogImpl
+diff --git a/demos/WTLDemo/WTLDemo.rc b/demos/WTLDemo/WTLDemo.rc
+index c651841..71f4b39 100644
+--- a/demos/WTLDemo/WTLDemo.rc
++++ b/demos/WTLDemo/WTLDemo.rc
+@@ -7,7 +7,7 @@
+ //
+ // Generated from the TEXTINCLUDE 2 resource.
+ //
+-#include "atlres.h"
++#include "wtl/atlres.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+ #undef APSTUDIO_READONLY_SYMBOLS
+@@ -32,7 +32,7 @@ END
+
+ 2 TEXTINCLUDE
+ BEGIN
+- "#include ""atlres.h""\r\n"
++ "#include ""wtl/atlres.h""\r\n"
+ "\0"
+ END
+
+diff --git a/demos/WTLDemo/stdafx.h b/demos/WTLDemo/stdafx.h
+index a601446..658d9e5 100644
+--- a/demos/WTLDemo/stdafx.h
++++ b/demos/WTLDemo/stdafx.h
+@@ -16,10 +16,10 @@ be found in the Authors.txt file in the root of the source tree.
+ #pragma once
+
+ // Change these values to use different versions
+-#define WINVER 0x0500
++#define WINVER 0x0501
+ #define _WIN32_WINNT 0x0501
+-#define _WIN32_IE 0x0501
+-#define _RICHEDIT_VER 0x0200
++#define _WIN32_IE 0x0600
++#define _RICHEDIT_VER 0x0300
+
+ #include
+ #if ( _ATL_VER < 0x0800 )
+@@ -52,18 +52,18 @@ namespace ATL
+ };
+ #endif // _WTL_SUPPORT_SDK_ATL3
+
+-#include
++#include
+
+ extern CAppModule _Module;
+
+ #include
+
+-#include
+-#include
+-#include
++#include
++#include
++#include
+
+ #define _WTL_USE_CSTRING
+-#include
++#include
+
+ #if _MSC_VER>=1400
+ #if defined _M_IX86
+diff --git a/processing/crashrptprobe/CMakeLists.txt b/processing/crashrptprobe/CMakeLists.txt
+index a6c692a..c513c6d 100644
+--- a/processing/crashrptprobe/CMakeLists.txt
++++ b/processing/crashrptprobe/CMakeLists.txt
+@@ -21,11 +21,11 @@ fix_default_compiler_settings_()
+ include_directories( ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/reporting/crashrpt
+ ${CMAKE_SOURCE_DIR}/reporting/crashsender
+- ${CMAKE_SOURCE_DIR}/thirdparty/wtl
+- ${CMAKE_SOURCE_DIR}/thirdparty/zlib
++ ${WTL_INCLUDE_DIR}
++ ${ZLIB_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/thirdparty/minizip
+- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml
+- ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/include)
++ ${TINYXML_INCLUDE_DIR}
++ ${DBGHELP_INCLUDE_DIR})
+
+ # Add library build target
+ if(CRASHRPT_BUILD_SHARED_LIBS)
+@@ -34,15 +34,15 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
+ add_library(CrashRptProbe STATIC ${source_files} ${header_files})
+ endif(CRASHRPT_BUILD_SHARED_LIBS)
+
+-if(CMAKE_CL_64)
+- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
+- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib)
+-else(CMAKE_CL_64)
+- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
+- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib)
+-endif(CMAKE_CL_64)
++#if(CMAKE_CL_64)
++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
++# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib)
++#else(CMAKE_CL_64)
++# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
++# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib)
++#endif(CMAKE_CL_64)
+
+-target_link_libraries(CrashRptProbe zlib minizip tinyxml Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib)
++target_link_libraries(CrashRptProbe ZLIB::ZLIB minizip ${TINYXML_LIBRARY} ${DBGHELP_LIBRARY} Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib)
+
+ if(CRASHRPT_BUILD_SHARED_LIBS)
+
+@@ -58,4 +58,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
+
+ endif(CRASHRPT_BUILD_SHARED_LIBS)
+
++set_target_properties(CrashRptProbe PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRptProbe.h)
+
++INSTALL(TARGETS CrashRptProbe
++ PUBLIC_HEADER DESTINATION include/crashrpt
++ LIBRARY
++ ARCHIVE
++ RUNTIME
++)
+diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc
+index a08f63e..e12b8e9 100644
+--- a/processing/crashrptprobe/CrashRptProbe.rc
++++ b/processing/crashrptprobe/CrashRptProbe.rc
+@@ -7,7 +7,7 @@
+ //
+ // Generated from the TEXTINCLUDE 2 resource.
+ //
+-#include "atlres.h"
++#include "wtl/atlres.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+ #undef APSTUDIO_READONLY_SYMBOLS
+@@ -32,7 +32,7 @@ END
+
+ 2 TEXTINCLUDE
+ BEGIN
+- "#include ""atlres.h""\r\n"
++ "#include ""wtl/atlres.h""\r\n"
+ "\0"
+ END
+
+diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h
+index 2b027b2..0b60659 100644
+--- a/processing/crashrptprobe/stdafx.h
++++ b/processing/crashrptprobe/stdafx.h
+@@ -70,13 +70,13 @@ namespace ATL
+ };
+ #endif // _WTL_SUPPORT_SDK_ATL3
+
+-#include
++#include
+ extern CAppModule _Module;
+ #include
+
+ // CString-related includes
+ #define _WTL_USE_CSTRING
+-#include
++#include
+
+ #if _MSC_VER<1400
+ #define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count)
+diff --git a/processing/crprober/CMakeLists.txt b/processing/crprober/CMakeLists.txt
+index 046ba57..255e200 100644
+--- a/processing/crprober/CMakeLists.txt
++++ b/processing/crprober/CMakeLists.txt
+@@ -18,4 +18,8 @@ add_executable(crprober ${source_files} ${header_files})
+ # Add input link libraries
+ target_link_libraries(crprober CrashRptProbe)
+
+-set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d )
+\ No newline at end of file
++set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d )
++
++install(TARGETS crprober
++ RUNTIME DESTINATION tools/crashrpt
++)
+diff --git a/reporting/crashrpt/CMakeLists.txt b/reporting/crashrpt/CMakeLists.txt
+index 42d40e2..c7e4fd6 100644
+--- a/reporting/crashrpt/CMakeLists.txt
++++ b/reporting/crashrpt/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE)
+ fix_default_compiler_settings_()
+
+ # Add include dir
+-include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/thirdparty/wtl)
++include_directories( ${CMAKE_SOURCE_DIR}/include ${WTL_INCLUDE_DIR})
+
+ # Add library build target
+ if(CRASHRPT_BUILD_SHARED_LIBS)
+@@ -55,3 +55,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
+ RELEASE_POSTFIX LIB )
+ endif(CRASHRPT_BUILD_SHARED_LIBS)
+
++set_target_properties(CrashRpt PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRpt.h)
++
++INSTALL(TARGETS CrashRpt
++ PUBLIC_HEADER DESTINATION include/crashrpt
++ LIBRARY
++ ARCHIVE
++ RUNTIME
++)
+diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc
+index 95e7502..a8c821b 100644
+--- a/reporting/crashrpt/CrashRpt.rc
++++ b/reporting/crashrpt/CrashRpt.rc
+@@ -7,7 +7,7 @@
+ //
+ // Generated from the TEXTINCLUDE 2 resource.
+ //
+-#include "atlres.h"
++#include "wtl/atlres.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+ #undef APSTUDIO_READONLY_SYMBOLS
+@@ -32,7 +32,7 @@ END
+
+ 2 TEXTINCLUDE
+ BEGIN
+- "#include ""atlres.h""\r\n"
++ "#include ""wtl/atlres.h""\r\n"
+ "\0"
+ END
+
+diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h
+index 77d8c36..13bbe50 100644
+--- a/reporting/crashrpt/StdAfx.h
++++ b/reporting/crashrpt/StdAfx.h
+@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree.
+ #define WINVER 0x0501
+ #define _WIN32_WINNT 0x0501
+ #define _WIN32_IE 0x0600
+-#define _RICHEDIT_VER 0x0200
++#define _RICHEDIT_VER 0x0300
+
+ #include
+ #include
+@@ -54,12 +54,12 @@ namespace ATL
+ };
+ #endif // _WTL_SUPPORT_SDK_ATL3
+
+-#include
++#include
+ extern CAppModule _Module;
+ #include
+ // CString-related includes
+ #define _WTL_USE_CSTRING
+-#include
++#include
+ #include
+ #include