Merge branch 'master' into dev/jack/update_osx_baseline

CHANGELOG.md

@@ -1,3 +1,312 @@
+vcpkg (2019.12.31)
+---
+#### Total port count: 1268
+#### Total port count per triplet (tested):
+|triplet|ports available|
+|---|---|
+|**x64-windows**|1181|
+|x86-windows|1166|
+|x64-windows-static|1087|
+|**x64-linux**|1000|
+|**x64-osx**|920|
+|arm64-windows|795|
+|x64-uwp|642|
+|arm-uwp|615|
+
+#### The following documentation has been updated:
+- [PR Review Checklist](docs/maintainers/pr-review-checklist.md) ***[NEW]***
+    - [(#9264)](https://github.com/microsoft/vcpkg/pull/9264) [vcpkg] Initialize PR review checklist
+- [vcpkg_install_qmake](docs/maintainers/vcpkg_install_qmake.md) ***[NEW]***
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [CONTROL Files](docs/maintainers/control-files.md)
+    - [(#9140)](https://github.com/microsoft/vcpkg/pull/9140) [docs] Fix CONTROL file default-features section header
+- [Portfile Functions](docs/maintainers/portfile-functions.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_build_nmake](docs/maintainers/vcpkg_build_nmake.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_common_definitions](docs/maintainers/vcpkg_common_definitions.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_configure_make](docs/maintainers/vcpkg_configure_make.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_download_distfile](docs/maintainers/vcpkg_download_distfile.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_extract_source_archive_ex](docs/maintainers/vcpkg_extract_source_archive_ex.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_find_acquire_program](docs/maintainers/vcpkg_find_acquire_program.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [vcpkg_install_nmake](docs/maintainers/vcpkg_install_nmake.md)
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+#### The following changes have been made to vcpkg's infrastructure:
+- [(#9160)](https://github.com/microsoft/vcpkg/pull/9160) [ffmpeg] Fixed build error ARM64 Windows 10
+- [(#9199)](https://github.com/microsoft/vcpkg/pull/9199) [vcpkg] Add November changelog
+- [(#9203)](https://github.com/microsoft/vcpkg/pull/9203) [vcpkg] Check in baseline results for CI builds
+- [(#9191)](https://github.com/microsoft/vcpkg/pull/9191) [vcpkg] Give hints for yasm with brew and apt
+- [(#9242)](https://github.com/microsoft/vcpkg/pull/9242) [libxslt] Fix writing to locations outside vcpkg in Windows builds
+- [(#9279)](https://github.com/microsoft/vcpkg/pull/9279) Removed umock-c:64-windows-static result in baseline
+- [(#9280)](https://github.com/microsoft/vcpkg/pull/9280) [vcpkg] Add pull request template
+- [(#9331)](https://github.com/microsoft/vcpkg/pull/9331) Update baseline to skip ogre conflicts
+- [(#9349)](https://github.com/microsoft/vcpkg/pull/9349) Update baseline with 'leptonica:arm-uwp=fail'
+- [(#9277)](https://github.com/microsoft/vcpkg/pull/9277) [brynet] Update to 1.0.5
+- [(#9330)](https://github.com/microsoft/vcpkg/pull/9330) [simpleini] Fix build failure on travis CI
+- [(#9313)](https://github.com/microsoft/vcpkg/pull/9313) [opendnp3] Add new port
+- [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES
+- [(#9252)](https://github.com/microsoft/vcpkg/pull/9252) [rttr] Add dependency rapidjson
+- [(#8533)](https://github.com/microsoft/vcpkg/pull/8533) Fix CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+- [(#9382)](https://github.com/microsoft/vcpkg/pull/9382) [directxtk12] Update to dec2019 release
+- [(#9383)](https://github.com/microsoft/vcpkg/pull/9383) [directxtex] Update to dec2019 release
+- [(#9384)](https://github.com/microsoft/vcpkg/pull/9384) [directxmesh] Update to dec2019 release
+- [(#9381)](https://github.com/microsoft/vcpkg/pull/9381) [directxtk] Update to dec2019 release
+- [(#9287)](https://github.com/microsoft/vcpkg/pull/9287) Removed unused template function.
+- [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux
+- [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+- [(#9388)](https://github.com/microsoft/vcpkg/pull/9388) [hiredis] Support building static
+- [(#8624)](https://github.com/microsoft/vcpkg/pull/8624) [protobuf-c]Add new port.
+- [(#9389)](https://github.com/microsoft/vcpkg/pull/9389) Remove vtk:x64-linux result in baseline
+
+<details>
+<summary><b>The following 8 ports have been added:</b></summary>
+
+|port|version|
+|---|---|
+|[proxywrapper](https://github.com/microsoft/vcpkg/pull/8916)| 1.0.0
+|[opendnp3](https://github.com/microsoft/vcpkg/pull/9313)| 2.3.2
+|[function2](https://github.com/microsoft/vcpkg/pull/9246)| 4.0.0
+|[protobuf-c](https://github.com/microsoft/vcpkg/pull/8624)| 1.3.2
+|[indicators](https://github.com/microsoft/vcpkg/pull/9315)| 1.5
+|[proxygen](https://github.com/microsoft/vcpkg/pull/8766)| 2019.10.21.00
+|[azure-kinect-sensor-sdk](https://github.com/microsoft/vcpkg/pull/8786)| 1.4.0-alpha.0
+|[xtensor-fftw](https://github.com/microsoft/vcpkg/pull/9159)| 2019-11-30
+</details>
+
+<details>
+<summary><b>The following 72 ports have been updated:</b></summary>
+
+- restinio `0.6.1` -> `0.6.2`
+    - [(#9174)](https://github.com/microsoft/vcpkg/pull/9174) [restinio] Update to v.0.6.1.1.
+    - [(#9293)](https://github.com/microsoft/vcpkg/pull/9293) [restinio] update to 0.6.2
+
+- pixman `0.38.0-4` -> `0.38.4-1`
+    - [(#9170)](https://github.com/microsoft/vcpkg/pull/9170) [pixman] Update to version 0.38.4
+
+- cjson `1.7.12` -> `2019-11-30`
+    - [(#9157)](https://github.com/microsoft/vcpkg/pull/9157) [cjson] Update to 2019-11-30
+
+- parallel-hashmap `1.24` -> `1.27`
+    - [(#9152)](https://github.com/microsoft/vcpkg/pull/9152) [parallel-hashmap] Update to 1.27
+
+- jsoncons `0.139.0` -> `0.140.0`
+    - [(#9124)](https://github.com/microsoft/vcpkg/pull/9124) [jsoncons] Update to v0.140.0
+
+- boost-modular-build-helper `1.71.0` -> `1.71.0-1`
+    - [(#9108)](https://github.com/microsoft/vcpkg/pull/9108) [boost-modular-build-helper] put quotes around the directory
+
+- protobuf `3.10.0` -> `3.11.2`
+    - [(#9131)](https://github.com/microsoft/vcpkg/pull/9131) [protobuf] Update protobuf to 3.11.0
+    - [(#9271)](https://github.com/microsoft/vcpkg/pull/9271) [protobuf] Update to 3.11.2
+
+- ecsutil `1.0.7.3` -> `1.0.7.8`
+    - [(#8885)](https://github.com/microsoft/vcpkg/pull/8885) [ecsuti] Update to v1.0.7.8
+
+- libmodman `2.0.1` -> `2.0.1-1`
+    - [(#8916)](https://github.com/microsoft/vcpkg/pull/8916) [proxywrapper] Add new port
+
+- libproxy `0.4.15` -> `0.4.15-1`
+    - [(#8916)](https://github.com/microsoft/vcpkg/pull/8916) [proxywrapper] Add new port
+
+- xalan-c `1.11-9` -> `1.11-11`
+    - [(#9203)](https://github.com/microsoft/vcpkg/pull/9203) [vcpkg] Check in baseline results for CI builds
+    - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux
+
+- libxslt `1.1.33-5` -> `1.1.33-6`
+    - [(#9242)](https://github.com/microsoft/vcpkg/pull/9242) [libxslt] Fix writing to locations outside vcpkg in Windows builds
+
+- azure-c-shared-utility `2019-10-07.2` -> `2019-10-07.2-1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- azure-iot-sdk-c `2019-11-21.1` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- azure-macro-utils-c `2019-10-07.2` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- azure-uamqp-c `2019-10-07.2` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- azure-uhttp-c `2019-10-07.2` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- azure-umqtt-c `2019-10-07.2` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- umock-c `2019-10-07.2` -> `2019-11-27.1`
+    - [(#9117)](https://github.com/microsoft/vcpkg/pull/9117) [azure-iot-sdk-c] Update macro-utils and umock-c to differentiate master and public-preview installations
+
+- python3 `3.7.4` -> `3.7.3`
+    - [(#9173)](https://github.com/microsoft/vcpkg/pull/9173) [python3] Fix CONTROL Version
+
+- brynet `1.0.3` -> `1.0.5`
+    - [(#9277)](https://github.com/microsoft/vcpkg/pull/9277) [brynet] Update to 1.0.5
+
+- cpp-httplib `0.2.5` -> `0.4.2`
+    - [(#9360)](https://github.com/microsoft/vcpkg/pull/9360) [cpp-httplib] Update library to 0.4.2
+
+- botan `2.12.1` -> `2.12.1-1`
+    - [(#9335)](https://github.com/microsoft/vcpkg/pull/9335) [botan] Fix unrecognized compile flag MT/MD
+
+- simpleini `2018-08-31-2` -> `2018-08-31-3`
+    - [(#9330)](https://github.com/microsoft/vcpkg/pull/9330) [simpleini] Fix build failure on travis CI
+
+- libpcap `1.9.0` -> `1.9.1`
+    - [(#9329)](https://github.com/microsoft/vcpkg/pull/9329) [libpcap] update portfile for cmake build and bump version to 1.9.1
+
+- live555 `latest` -> `latest-1`
+    - [(#9303)](https://github.com/microsoft/vcpkg/pull/9303) [live555] Fix live555:x86-windows-static build failure
+
+- usockets `0.3.1` -> `0.3.4`
+    - [(#9278)](https://github.com/microsoft/vcpkg/pull/9278) [usockets] update to 0.3.4
+
+- uwebsockets `0.15.7` -> `0.16.5`
+    - [(#9276)](https://github.com/microsoft/vcpkg/pull/9276) [uwebsockets] update to 0.16.5
+
+- check `0.13.0` -> `0.13.0-1`
+    - [(#9267)](https://github.com/microsoft/vcpkg/pull/9267) [check] Fix library cannot be found
+
+- tesseract `4.1.0-3` -> `4.1.0-4`
+    - [(#9266)](https://github.com/microsoft/vcpkg/pull/9266) [tesseract] Fix feature name and build error
+
+- libharu `2017-08-15-8` -> `2017-08-15-9`
+    - [(#9261)](https://github.com/microsoft/vcpkg/pull/9261) [libharu] Remove symbols also exported from tiff (as a default feature)
+
+- alembic `1.7.11-5` -> `1.7.11-6`
+    - [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES
+
+- openexr `2.3.0-4` -> `2.3.0-5`
+    - [(#9255)](https://github.com/microsoft/vcpkg/pull/9255) [OpenEXR] add missing underscore for OpenEXR_IEXMATH_LIBRARY_DEBUG NAMES
+
+- xeus `0.20.0` -> `0.20.0-1`
+    - [(#9254)](https://github.com/microsoft/vcpkg/pull/9254) [xeus] Fix build error with Visual Studio 2019
+
+- libpq `9.6.1-8` -> `9.6.3`
+    - [(#9253)](https://github.com/microsoft/vcpkg/pull/9253) [libpq] Fix version mismatch between CONTROL and portfile
+
+- rttr `0.9.6-1` -> `0.9.6-2`
+    - [(#9252)](https://github.com/microsoft/vcpkg/pull/9252) [rttr] Add dependency rapidjson
+
+- proj4 `6.2.0-1` -> `6.2.1-1`
+    - [(#9227)](https://github.com/microsoft/vcpkg/pull/9227) [proj4] Update to version 6.2.1; disable exporting symbols for static libraries
+
+- geotrans `3.7` -> `3.7-1`
+    - [(#9217)](https://github.com/microsoft/vcpkg/pull/9217) [geotrans] Add macro LITTLE_ENDIAN
+
+- mongoose `6.15-1` -> `6.15-2`
+    - [(#9209)](https://github.com/microsoft/vcpkg/pull/9209) [mongoose] Add feature ssl
+
+- ecm `5.60.0-1` -> `5.60.0-2`
+    - [(#9210)](https://github.com/microsoft/vcpkg/pull/9210) [ecm] Add usage to fix printing error messages
+
+- tbb `2019_U8-2` -> `2019_U8-3`
+    - [(#9188)](https://github.com/microsoft/vcpkg/pull/9188) [tbb] Set fatal build tool requirements for UNIX
+
+- libqglviewer `2.7.0-2` -> `2.7.2-2`
+    - [(#9186)](https://github.com/microsoft/vcpkg/pull/9186) [libqglviewer] update to 2.7.2
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+- nanodbc `2.12.4-4` -> `2.12.4-5`
+    - [(#9185)](https://github.com/microsoft/vcpkg/pull/9185) [nanodbc] Set NANODBC_ENABLE_UNICODE to OFF
+
+- libevent `2.1.11-1` -> `2.1.11-2`
+    - [(#9101)](https://github.com/microsoft/vcpkg/pull/9101) [libevent] Add thread as default feature
+
+- directxtk12 `oct2019` -> `dec2019`
+    - [(#9382)](https://github.com/microsoft/vcpkg/pull/9382) [directxtk12] Update to dec2019 release
+
+- directxtex `oct2019` -> `dec2019`
+    - [(#9383)](https://github.com/microsoft/vcpkg/pull/9383) [directxtex] Update to dec2019 release
+
+- directxmesh `aug2019` -> `dec2019`
+    - [(#9384)](https://github.com/microsoft/vcpkg/pull/9384) [directxmesh] Update to dec2019 release
+
+- directxtk `oct2019` -> `dec2019`
+    - [(#9381)](https://github.com/microsoft/vcpkg/pull/9381) [directxtk] Update to dec2019 release
+
+- nano-signal-slot `2018-08-25-1` -> `2.0.1`
+    - [(#9376)](https://github.com/microsoft/vcpkg/pull/9376) [nano-signal-slot] Update to latest version
+
+- libarchive `3.4.0-1` -> `3.4.0-2`
+    - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux
+
+- openvpn3 `3.4.1` -> `3.4.1-1`
+    - [(#9411)](https://github.com/microsoft/vcpkg/pull/9411) [vcpkg-baseline] Fixes for vtk, libarchive, xalan-c, and openvpn3 on Linux
+
+- ffmpeg `4.2-1` -> `4.2-2`
+    - [(#9405)](https://github.com/microsoft/vcpkg/pull/9405) [ffmpeg] portfile: fix typo Relase->Release
+    - [(#9090)](https://github.com/microsoft/vcpkg/pull/9090) [ffmpeg] install correct copyright file and enable (L)GPLv3 builds
+
+- entt `3.1.1` -> `3.2.2`
+    - [(#9409)](https://github.com/microsoft/vcpkg/pull/9409) [entt] Upgrade library to 3.2.2
+
+- doctest `2.3.5` -> `2.3.6`
+    - [(#9403)](https://github.com/microsoft/vcpkg/pull/9403) [doctest] Update library to 2.3.6
+
+- qcustomplot `2.0.1-1` -> `2.0.1-3`
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+- qscintilla `2.10-9` -> `2.10-11`
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+- qt5-base `5.12.5-3` -> `5.12.5-7`
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+- qwt `6.1.3-8` -> `6.1.3-10`
+    - [(#9412)](https://github.com/microsoft/vcpkg/pull/9412) [vcpkg_install_qmake] Add vcpkg_install_qmake
+
+- hiredis `2019-11-1` -> `2019-11-2`
+    - [(#9388)](https://github.com/microsoft/vcpkg/pull/9388) [hiredis] Support building static
+
+- argparse `2.0.1` -> `2.1`
+    - [(#9291)](https://github.com/microsoft/vcpkg/pull/9291) [argparse] Upgrade to v2.1
+
+- angle `2019-07-19-3` -> `2019-07-19-4`
+    - [(#7923)](https://github.com/microsoft/vcpkg/pull/7923) [angle]Fix windows build error: cannot find definition far.
+
+- libwebp `1.0.2-7` -> `1.0.2-8`
+    - [(#9300)](https://github.com/microsoft/vcpkg/pull/9300) [libwebp] Fixed build error ARM64 Windows 10
+
+- libpng `1.6.37-5` -> `1.6.37-6`
+    - [(#9198)](https://github.com/microsoft/vcpkg/pull/9198) [libpng] Strong cleanup of the port
+
+- libgit2 `0.28.3` -> `0.28.4`
+    - [(#9270)](https://github.com/microsoft/vcpkg/pull/9270) [libgit2] Update to 0.28.4
+
+- embree3 `3.5.2-3` -> `3.6.1`
+    - [(#9073)](https://github.com/microsoft/vcpkg/pull/9073) [embree3] Update to version 3.6.1
+
+- pmdk `1.7` -> `1.7-1`
+    - [(#9094)](https://github.com/microsoft/vcpkg/pull/9094) [pmdk] Remove non-ascii charactor
+
+- fftwpp `2.05` -> `2019-12-19`
+    - [(#9169)](https://github.com/microsoft/vcpkg/pull/9169) [fftwpp] Update to latest commit
+
+- freerdp `2.0.0-rc4-2` -> `2.0.0-rc4-3`
+    - [(#9176)](https://github.com/microsoft/vcpkg/pull/9176) [freerdp] Fix linux build, add dependency port glib
+
+- abseil `2019-05-08-1` -> `2019-12-19`
+    - [(#9367)](https://github.com/microsoft/vcpkg/pull/9367) [abseil] Update to the latest and fix link failure error using StrCat
+
+- sdl2-gfx `1.0.4-2` -> `1.0.4-4`
+    - [(#9319)](https://github.com/microsoft/vcpkg/pull/9319) [sdl2-gfx] Update CMake build and find_package support
+
+- io2d `2019-07-11-1` -> `2019-07-11-2`
+    - [(#8935)](https://github.com/microsoft/vcpkg/pull/8935) [io2d] Fix link to target "Cairo::Cairo" error
+
+- vtk `8.2.0-9` -> `8.2.0-10`
+    - [(#9389)](https://github.com/microsoft/vcpkg/pull/9389) Remove vtk:x64-linux result in baseline
+
+</details>
+
+-- vcpkg team vcpkg@microsoft.com TUE, 09 Jan 05:45:00 -0800
+
 vcpkg (2019.11.30)
 ---
 #### Total port count: 1262

ports/azure-kinect-sensor-sdk/CONTROL

@@ -1,5 +1,5 @@
 Source: azure-kinect-sensor-sdk
-Version: 1.4.0-alpha.0
+Version: 1.4.0-alpha.0-1
 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK
 Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.
 Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv
@@ -9,7 +9,4 @@ Description: Build K4A doxygen documentation.
 
 Feature: tool
 Description: Build tools.
-Build-Depends: gl3w, imgui[example]
+Build-Depends: gl3w, imgui[example]
-
-Feature: test
-Description: Build test projects.

ports/azure-kinect-sensor-sdk/fix-components-path.patch

@@ -0,0 +1,26 @@
+diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt
+index 4be0697..d30c6de 100644
+--- a/src/record/sdk/CMakeLists.txt
++++ b/src/record/sdk/CMakeLists.txt
+@@ -81,7 +81,7 @@ install(
+             development
+     RUNTIME
+         DESTINATION
+-            ${CMAKE_INSTALL_BINDIR}
++            tools
+         COMPONENT
+             runtime
+ )
+diff --git a/src/sdk/CMakeLists.txt b/src/sdk/CMakeLists.txt
+index 3616f40..a5019cb 100644
+--- a/src/sdk/CMakeLists.txt
++++ b/src/sdk/CMakeLists.txt
+@@ -90,7 +90,7 @@ install(
+             development
+     RUNTIME
+         DESTINATION
+-            ${CMAKE_INSTALL_BINDIR}
++            tools
+         COMPONENT
+             runtime
+ )

ports/azure-kinect-sensor-sdk/portfile.cmake

@@ -7,11 +7,15 @@ vcpkg_from_github(
     PATCHES
         fix-builds.patch
         disable-c4275.patch
+        fix-components-path.patch
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+vcpkg_add_to_path("${PYTHON3_DIR}")
+
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     docs K4A_BUILD_DOCS
-    test WITH_TEST
     tool BUILD_TOOLS
 )
 
@@ -22,6 +26,7 @@ vcpkg_configure_cmake(
     -DK4A_SOURCE_LINK=OFF
     -DK4A_MTE_VERSION=ON
     -DBUILD_EXAMPLES=OFF
+    -DWITH_TEST=OFF
 )
 
 vcpkg_install_cmake()
@@ -36,5 +41,9 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/bullet3/CONTROL

@@ -1,7 +1,7 @@
 Source: bullet3
-Version: 2.88-2
+Version: 2.89
 Homepage: https://github.com/bulletphysics/bullet3
 Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
 
 Feature: multithreading
-Description: Multithreading funcitonality for bullet3
+Description: Multithreading functionality for bullet3

ports/bullet3/portfile.cmake

@@ -1,12 +1,12 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO bulletphysics/bullet3
-    REF 2.88
+    REF 2.89
-    SHA512 15face1940d496c96fd19a44139d11d2cbb629526c40432be4a0eef5fa9a532c842ec7318248c0359a080f2034111bf1a3c2d3a6fd789bec675bd368fac7bd93
+    SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
     HEAD_REF master
     PATCHES cmake-fix.patch
 )

ports/caf/CONTROL

@@ -1,4 +1,4 @@
 Source: caf
-Version: 0.16.3
+Version: 0.17.2
 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.

ports/caf/fix-arm.patch

@@ -0,0 +1,19 @@
+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()
+ 

ports/caf/portfile.cmake

@@ -1,15 +1,29 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
+set(CAF_TOOL_PATH )
+if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL arm OR TRIPLET_SYSTEM_ARCH STREQUAL arm64))
+    if (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/caf-generate-enum-strings.exe)
+        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/)
+    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/caf-generate-enum-strings.exe)
+        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows-static/tools/)
+    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/)
+    elseif (EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/caf-generate-enum-strings.exe AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        set(CAF_TOOL_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows-static/tools/)
+    else()
+        message(FATAL_ERROR "Since caf needs to run the built-in executable, please install caf:x86-windows or caf:x64-windows first.")
+    endif()
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF 0.16.3
+    REF 4da751ab7a79bcdc6e9dd2157b9b5c5c6814e26d # 0.17.2
-    SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1
+    SHA512 4bd739c553fcbd6aa3b61372b42ad2ab40099c18959892553b9bc232b95740ba563d967d73e0695f0ce3d31409ae704eb578b6590431039f18291c896f535a36
     HEAD_REF master
 	PATCHES
 		openssl-version-override.patch
+        fix-arm.patch
 )
 
 vcpkg_configure_cmake(
@@ -29,6 +43,7 @@ vcpkg_configure_cmake(
         -DCAF_NO_OPENSSL=OFF
         -DCAF_NO_CURL_EXAMPLES=ON
         -DCAF_OPENSSL_VERSION_OVERRIDE=ON
+        -DCAF_TOOL_PATH=${CAF_TOOL_PATH}
 )
 
 vcpkg_install_cmake()

ports/cgicc/CMakeLists.txt

@@ -104,6 +104,12 @@ set (cgicc_HEADERS
 include_directories (. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_library (cgicc ${cgicc_SOURCES} ${cgicc_HEADERS})
 
+if (BUILD_SHARED_LIBS)
+    add_definitions(-DCGICC_EXPORTS)
+else()
+    add_definitions(-DCGICC_STATIC)
+endif()
+
 install(TARGETS cgicc
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib

ports/cgicc/fix-static-build.patch

@@ -0,0 +1,15 @@
+diff --git a/cgicc/CgiDefs.h.in b/cgicc/CgiDefs.h.in
+index 71b70ad..3793cd8 100644
+--- a/cgicc/CgiDefs.h.in
++++ b/cgicc/CgiDefs.h.in
+@@ -47,7 +47,9 @@
+ #ifdef WIN32
+ 
+ // export library symbols
+-#  ifdef CGICC_EXPORTS
++#  ifdef CGICC_STATIC
++#    define CGICC_API
++#  elif defined(CGICC_EXPORTS)
+ #    define CGICC_API __declspec(dllexport)
+ #  else
+ #    define CGICC_API __declspec(dllimport)

ports/cgicc/portfile.cmake

@@ -11,7 +11,9 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     OUT_SOURCE_PATH SOURCE_PATH
-    PATCHES fix-define.patch
+    PATCHES
+        fix-define.patch
+        fix-static-build.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -27,4 +29,13 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+file(READ ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h CGI_H)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  string(REPLACE "#  ifdef CGICC_STATIC" "#  if 0" CGI_H "${CGI_H}")
+else()
+  string(REPLACE "#  ifdef CGICC_STATIC" "#  if 1" CGI_H "${CGI_H}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/cgicc/CgiDefs.h "${CGI_H}")
+
+
 file(INSTALL ${SOURCE_PATH}/COPYING.DOC DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/cpp-netlib/CONTROL

@@ -1,4 +1,5 @@
 Source: cpp-netlib
-Version: 0.13.0-2
+Version: 0.13.0-3
+Homepage: https://cpp-netlib.org/
 Build-Depends: boost
 Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library

ports/cpp-netlib/portfile.cmake

@@ -1,8 +1,4 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "UWP")
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -27,10 +23,10 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-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)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/cppnetlib)
 else()
-  vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib TARGET_PATH share/cppnetlib)
 endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/curl/0002_fix_uwp.patch

@@ -56,19 +56,6 @@ index e7060eb..9cd76f7 100644
  #endif
      tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
  
-diff --git a/lib/ftp.c b/lib/ftp.c
-index 825aaaa..3b96670 100644
---- a/lib/ftp.c
-+++ b/lib/ftp.c
-@@ -4262,7 +4262,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
-     /* prevpath is "raw" so we convert the input path before we compare the
-        strings */
-     size_t dlen;
--    char *path;
-+    char *path = NULL;
-     CURLcode result =
-       Curl_urldecode(conn->data, ftp->path, 0, &path, &dlen, TRUE);
-     if(result) {
 diff --git a/lib/rand.c b/lib/rand.c
 index 6ee45fe..b2d712d 100644
 --- a/lib/rand.c

ports/curl/CONTROL

@@ -1,5 +1,5 @@
 Source: curl
-Version: 7.66.0-2
+Version: 7.68.0
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl
 Description: A library for transferring data with URLs

ports/curl/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO curl/curl
-    REF curl-7_66_0
+    REF curl-7_68_0
-    SHA512 0b02b6117ab69e848219fa59b25e4254934d841fbc3e2a70ccfdcb417ab7fc46a10dd703a25fbe8a2a98a59cbc73ad6b9298f5668a7345f7910010b958de4d21
+    SHA512 d75ed39b121a5a04d5a4ba89779967a49e196a93325747b51399adf1afb5f5c13355d6dbe798b259d19245c83bb55f0b621b24b25d8f3ddb1914df30067b8737
     HEAD_REF master
     PATCHES
         0001_cmake.patch

ports/google-cloud-cpp/0001-fix-x86-build.patch

@@ -0,0 +1,13 @@
+diff --git a/google/cloud/storage/parallel_upload.h b/google/cloud/storage/parallel_upload.h
+index 44f542d..4fd97bd 100644
+--- a/google/cloud/storage/parallel_upload.h
++++ b/google/cloud/storage/parallel_upload.h
+@@ -515,7 +515,7 @@ StatusOr<std::vector<ParallelUploadFileShard>> CreateUploadShards(
+ 
+   std::size_t const wanted_num_streams =
+       (std::max<std::size_t>)(1,
+-                              (std::min)(max_streams,
++                              (std::min<std::size_t>)(max_streams,
+                                          div_ceil(file_size, min_stream_size)));
+ 
+   std::uintmax_t const stream_size =

ports/google-cloud-cpp/CONTROL

@@ -1,5 +1,5 @@
 Source: google-cloud-cpp
-Version: 0.15.0
+Version: 0.17.0
 Build-Depends: grpc, curl[ssl], crc32c, googleapis, google-cloud-cpp-common
 Description: C++ Client Libraries for Google Cloud Platform APIs.
 Homepage: https://github.com/googleapis/google-cloud-cpp

ports/google-cloud-cpp/portfile.cmake

@@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googleapis/google-cloud-cpp
-    REF v0.15.0
+    REF v0.17.0
-    SHA512 f8cc8f9d47a4df1d76ac7b0836fe107f2f199070a89ab5136f66aa1be5f08737495dbb3f4cf7f709ac0a1346648d869af639836b85b552c6791fa8bb85362a91
+    SHA512 7bfa73db04fe8ff9344201eca8f56107fd895f18b3be44fca45a9f2d64224338980d04841de4418c5c1b7a8ac0768a60e93e5abbed9256567ca7b8bc2bf73cd9
     HEAD_REF master
+    PATCHES
+        0001-fix-x86-build.patch
 )
 
 vcpkg_configure_cmake(

ports/graphicsmagick/CMakeLists.txt

@@ -111,7 +111,7 @@ add_library(graphicsmagick coders/art.c coders/avs.c
 		Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp
 		Magick++/lib/TypeMetric.cpp
 		wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c
-		jbig/libjbig/jbig.c jbig/libjbig/jbig_tab.c)
+		jbig/libjbig/jbig.c jbig/libjbig/jbig_ar.c jbig/libjbig/jbig85.c)
 
 TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE
     ZLIB::ZLIB

ports/graphicsmagick/CONTROL

@@ -1,5 +1,5 @@
 Source: graphicsmagick
-Version: 1.3.33-1
+Version: 1.3.34
 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
 Homepage: https://sourceforge.net/projects/graphicsmagick/
 Description: Image processing library

ports/graphicsmagick/disable_graphicsmagick_modules.patch

@@ -1,11 +1,16 @@
---- a/magick/studio.h	2018-06-23 14:13:49.191541000 -0400
+--- a/magick/studio.h	2019-12-24 13:18:50.000000000 -0200
-+++ b/magick/studio.h	2018-09-02 11:50:41.856753700 -0400
++++ b/magick/studio.h	2020-01-08 20:43:08.325889700 -0200
-@@ -414,7 +414,7 @@
+@@ -470,10 +470,10 @@
- #endif
+ */
  
- #if defined(HasLTDL) || ( defined(MSWINDOWS) && defined(_DLL) )
+ #if defined(HasLTDL)
 -#  define SupportMagickModules
 +//#  define SupportMagickModules
+ #elif !defined(__MINGW32__) && !defined(__MINGW64__)
+ #  if defined(MSWINDOWS) && defined(_DLL)
+-#    define SupportMagickModules
++//#    define SupportMagickModules
+ #  endif
  #endif
  
- #if defined(_MAGICKMOD_)
+ 

ports/graphicsmagick/portfile.cmake

@@ -1,11 +1,9 @@
-include(vcpkg_common_functions)
+set(GM_VERSION 1.3.34)
-
-set(GM_VERSION 1.3.33)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
     FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
-	SHA512 856fafe36693a7963f5944f489f4b7a0d15d9dcc575f96d31486e3abd886f681854cbb2271feb4b4cb19668480904d473138a2d9c2ec95539de705d75e2f49c9
+	SHA512 bc770070d3e6b58ded1932050c1aa9f31edd89ac68e12055d7bb481ba9aa8e7509e69ad676a1624c262f9b55c0ceeea738b807005946ddd97b88d49b39b8a073
 )
 
 vcpkg_extract_source_archive_ex(
@@ -38,18 +36,15 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-graphicsmagick TARGET_PATH share/unofficial-graphicsmagick)
 
 # copy license
-file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick)
+file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/copyright)
 
 # copy config
-file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config)
+file(COPY ${SOURCE_PATH}/config/colors.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
-file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config)
+file(COPY ${SOURCE_PATH}/config/log.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
-file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config)
+file(COPY ${SOURCE_PATH}/config/modules.mgk DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/config)
 
 file(READ ${SOURCE_PATH}/config/type-windows.mgk.in TYPE_MGK)
 string(REPLACE "@windows_font_dir@" "$ENV{SYSTEMROOT}/Fonts/" TYPE_MGK "${TYPE_MGK}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/graphicsmagick/config/type.mgk "${TYPE_MGK}")
 
 vcpkg_copy_pdbs()
-
-vcpkg_test_cmake(PACKAGE_NAME unofficial-graphicsmagick)

ports/hdf5/CONTROL

@@ -2,7 +2,7 @@ Source: hdf5
 Version: 1.10.5-9
 Homepage: https://www.hdfgroup.org/downloads/hdf5/
 Description: HDF5 is a data model, library, and file format for storing and managing data
-Build-Depends: zlib, szip
+Default-Features: szip, zlib
 
 Feature: parallel
 Description: parallel support for HDF5
@@ -10,3 +10,11 @@ Build-Depends: mpi
 
 Feature: cpp
 Description: Builds cpp lib
+
+Feature: szip
+Description: Build with szip
+Build-Depends: szip
+
+Feature: zlib
+Description: Build with zlib
+Build-Depends: zlib

ports/hdf5/portfile.cmake

@@ -15,33 +15,38 @@ vcpkg_extract_source_archive_ex(
         fix-generate.patch
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    parallel HDF5_ENABLE_PARALLEL
-    cpp HDF5_BUILD_CPP_LIB
-)
-
 if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES)
     message(FATAL_ERROR "Feature Parallel and C++ options are mutually exclusive.")
 endif()
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+   FEATURES 
+     parallel     HDF5_ENABLE_PARALLEL
+     cpp          HDF5_BUILD_CPP_LIB
+     szip         HDF5_ENABLE_SZIP_SUPPORT
+     szip         HDF5_ENABLE_SZIP_ENCODING
+     zlib         HDF5_ENABLE_Z_LIB_SUPPORT
+)
+
 file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip
+find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/hdf5-1.10.5
     DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
-    OPTIONS ${FEATURE_OPTIONS}
+    OPTIONS
+        ${FEATURE_OPTIONS}
         -DBUILD_TESTING=OFF
         -DHDF5_BUILD_EXAMPLES=OFF
         -DHDF5_BUILD_TOOLS=OFF
-        -DHDF5_ENABLE_Z_LIB_SUPPORT=ON
-        -DHDF5_ENABLE_SZIP_SUPPORT=ON
-        -DHDF5_ENABLE_SZIP_ENCODING=ON
         -DHDF5_INSTALL_DATA_DIR=share/hdf5/data
         -DHDF5_INSTALL_CMAKE_DIR=share
+        "-DSZIP_LIBRARY_DEBUG:PATH=${SZIP_DEBUG}"
+        "-DSZIP_LIBRARY_RELEASE:PATH=${SZIP_RELEASE}"
 )
 
-
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 vcpkg_fixup_cmake_targets()
@@ -54,5 +59,7 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+
 configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)

ports/ismrmrd/CONTROL

@@ -1,4 +1,4 @@
 Source: ismrmrd
-Version: 1.4.0-1
+Version: 1.4.1
 Description: ISMRM Raw Data Format
 Build-Depends: pugixml, hdf5, boost, fftw3

ports/ismrmrd/fix-depends-hdf5.patch

@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2144fd3..68f9ca9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -108,7 +108,11 @@ endif()
+ if (USE_HDF5_DATASET_SUPPORT)
+     if (VCPKG_TARGET_TRIPLET) #VCPKG HDF5 is packaged differently.
+         find_package(HDF5 CONFIG COMPONENTS C shared REQUIRED)
+-        set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
++        if (BUILD_SHARED_LIBS)
++            set(HDF5_C_LIBRARIES hdf5::hdf5-shared)
++        else()
++            set(HDF5_C_LIBRARIES hdf5::hdf5-static)
++        endif()
+     else ()
+         find_package(HDF5 COMPONENTS C REQUIRED)
+     endif ()

ports/ismrmrd/portfile.cmake

@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
     set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
 endif()
@@ -11,12 +9,13 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ismrmrd/ismrmrd
-    REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
+    REF 1066d90e5d87302ccd71ce58ee153b5c87783064 # v1.4.1
-    SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892
+    SHA512 a830bd3b8a9580cf182f436066213441ee04c781e6e721b82287550f2ca552d58c5390d80b4b6a6b7bd8483fa3e45bf00858268706cedb99a4390ca047eb4d6c
     HEAD_REF master
     PATCHES
         ${STATIC_PATCH}
         ${WIN32_INCLUDE_STDDEF_PATCH}
+        fix-depends-hdf5.patch
 )
 
 vcpkg_configure_cmake(
@@ -25,6 +24,7 @@ vcpkg_configure_cmake(
     OPTIONS
         -DUSE_SYSTEM_PUGIXML=ON
         -DUSE_HDF5_DATASET_SUPPORT=ON
+        -DVCPKG_TARGET_TRIPLET=ON
 )
 
 vcpkg_install_cmake()
@@ -84,7 +84,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/)
 endif()
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright)
 
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd)

ports/ixwebsocket/CONTROL

@@ -1,6 +1,7 @@
 Source: ixwebsocket
-Version: 7.4.0
+Version: 7.9.2
 Build-Depends: zlib
+Homepage: https://github.com/machinezone/IXWebSocket
 Description: Lightweight WebSocket Client and Server + HTTP Client and Server
 Default-Features: ssl
 

ports/ixwebsocket/portfile.cmake

@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO machinezone/IXWebSocket
-    REF v7.4.0
+    REF v7.9.2
-    SHA512 ea78f42a8cf1dfaafe7bf3a849e62a8e039e10cc8d93add7bf2d5283f53311dac449f86c5f22496b55ad6e22597b2842cba85936170d2d0e720389a88d87268c
+    SHA512 478aca334cc9e3244f403b88ec4d33fff2f6815b44ecd846d3c58cd763768e4bad50fec0c4ae570ade9aa8450315c3e70df76ed99de76bc93af705f882fefad1
 )
 
 vcpkg_configure_cmake(
@@ -18,7 +16,7 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ixwebsocket RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
 # Post-build test for cmake libraries
 # vcpkg_test_cmake(PACKAGE_NAME ixwebsocket)

ports/libaaplus/CMakeLists.txt

@@ -5,6 +5,8 @@ cmake_policy(VERSION 3.11)
 
 project(libaaplus LANGUAGES CXX)
 
+set(CMAKE_CXX_STANDARD 14)
+
 option(BUILD_TOOLS "Build libaaplus tools" OFF)
 
 file(GLOB LIBS_SRC RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*.cpp)

ports/libaaplus/CONTROL

@@ -1,5 +1,5 @@
 Source: libaaplus
-Version: 2.1.0-1
+Version: 2.12
 Description: libaaplus is an astronomical computations library by naughter software
 Homepage: http://www.naughter.com/aa.html
 

ports/libaaplus/portfile.cmake

@@ -1,4 +1,4 @@
-set(VERSION 2.10.0)
+set(VERSION 2.12)
 
 vcpkg_download_distfile(
     ARCHIVE_FILE

ports/libevent/CONTROL

@@ -1,6 +1,5 @@
 Source: libevent
-Version: 2.1.11-3
+Version: 2.1.11-4
-Build-Depends: openssl
 Homepage: https://github.com/libevent/libevent
 Description: An event notification library
 Default-Features: thread

ports/libevhtp/CONTROL

@@ -0,0 +1,16 @@
+Source: libevhtp
+Version: 1.2.18
+Homepage: https://github.com/criticalstack/libevhtp
+Build-Depends: libevent
+Description: Libevhtp was created as a replacement API for Libevent's current HTTP API. 
+
+Feature: openssl
+Description: Support SSL for libevhtp
+Build-Depends: openssl
+
+Feature: thread
+Description: Support thread for libevhtp
+
+Feature: regex
+Description: Support oniguruma for libevhtp
+Build-Depends: oniguruma

ports/libevhtp/portfile.cmake

@@ -0,0 +1,33 @@
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO criticalstack/libevhtp
+    REF  e200bfa85bf253e9cfe1c1a9e705fccb176b9171
+    SHA512 d77d6d12dcc2762c8311a04cd3d33c7dfde7b406dbbb544d683e6a3b8e5912ba37a196470bc5aca92b58bd9659fbb396e5a11234b98435534f535046d6dab6eb
+    HEAD_REF master
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+    openssl EVHTP_DISABLE_SSL
+    thread  EVHTP_DISABLE_EVTHR
+    regex   EVHTP_DISABLE_REGEX
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/libplist/CMakeLists.txt

@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.8)
+project(plist C)
+
+file(GLOB_RECURSE PLIST_HEADER include/plist/*.h)
+file(GLOB_RECURSE PLIST_SRC src/*.c)
+
+file(GLOB_RECURSE LIBCNARY_HEADER libcnary/include/*.h)
+file(GLOB_RECURSE LIBCNARY_SRC libcnary/*c)
+
+add_library(plist ${PLIST_SRC} ${PLIST_HEADER} ${LIBCNARY_SRC} ${LIBCNARY_HEADER})
+target_include_directories(plist PRIVATE src include libcnary/include)
+
+if(WIN32)
+    target_compile_options(plist PRIVATE -W3 -WX- -sdl-)
+    target_compile_definitions(plist PRIVATE -DLIBPLIST_EXPORTS)
+endif()
+
+install(
+    TARGETS plist
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/libplist.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc
+    @ONLY
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/libplist.pc
+    DESTINATION lib/pkgconfig)
+
+install(FILES ${PLIST_HEADER} DESTINATION include/plist)

ports/libplist/CONTROL

@@ -1,3 +1,3 @@
 Source: libplist
-Version: 1.2.77
+Version: 1.2.137
 Description: A library to handle Apple Property List format in binary or XML 

ports/libplist/portfile.cmake

@@ -1,31 +1,24 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libimobiledevice-win32/libplist
-    REF f279ef534ab5adeb81f063dee5e8a8fc3ca6d3ab
+    REF f1b85c037693b5749a38473aa6c013ca45a663bf # v1.2.137
-    SHA512 52001a46935693e3ac5f0b8c3d13d9bf51c5f34189f6f006bd697d7e965f402460060708c4fb54ed43f49a217ac442fcb8dca252fcbccd3e6a154b6c9a8c2104
+    SHA512 b38d6dc3f4d480d35d847afeab4c90f90edf249fe506c95a30af40acfb7ecbd978334fa5557cf1421716054db748f6d1d540f2405001b9b597cd56cfbfe2c671
     HEAD_REF msvc-master
     PATCHES dllexport.patch
 )
 
-set(ENV{_CL_} "$ENV{_CL_} /GL-")
+configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
-set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+vcpkg_configure_cmake(
-    set(ENV{_LINK_} "$ENV{_LINK_} /APPCONTAINER")
-endif()
-
-vcpkg_install_msbuild(
     SOURCE_PATH ${SOURCE_PATH}
-    PROJECT_SUBPATH libplist.sln
+    PREFER_NINJA
-    INCLUDES_SUBPATH include
-    LICENSE_SUBPATH COPYING.lesser
-    REMOVE_ROOT_INCLUDES
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+vcpkg_install_cmake()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+vcpkg_copy_pdbs()
-endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/libwandio/CONTROL

@@ -0,0 +1,4 @@
+Source: libwandio
+Version: 4.2.1
+Homepage: https://github.com/wanduow/wandio
+Description: C library for simple and efficient file IO.

ports/libwandio/portfile.cmake

@@ -0,0 +1,27 @@
+vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux and Mac platform" ON_TARGET "Windows")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO wanduow/wandio
+    REF 012b646e7ba7ab191a5a2206488adfac493fcdc6
+    SHA512 e94a82038902c34933c4256f8bd4d7ef3f2cf32fea46f8e31a25df34cc90d3a275ff56d3bc9892aca0c85e6d875e696f96a836cc1444fe165db8364331e6e77d
+    HEAD_REF master
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH ${SOURCE_PATH}
+    AUTOCONFIG
+)
+
+vcpkg_install_make()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/msix/CONTROL

@@ -1,5 +1,5 @@
 Source: msix
-Version: MsixCoreInstaller-preview-1
+Version: 1.7
-Build-Depends: xerces-c, zlib, openssl (!uwp&!windows)
+Build-Depends: xerces-c, zlib, openssl (!uwp&!windows), catch2
 Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.
   The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.

ports/msix/fix-dependency-catch2.patch

@@ -0,0 +1,22 @@
+diff --git a/src/test/msixtest/CMakeLists.txt b/src/test/msixtest/CMakeLists.txt
+index e991231..e5c43ed 100644
+--- a/src/test/msixtest/CMakeLists.txt
++++ b/src/test/msixtest/CMakeLists.txt
+@@ -5,6 +5,8 @@
+ cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
+ project (msixtest)
+ 
++find_package(Catch2 CONFIG REQUIRED)
++
+ if(WIN32)
+     set(DESCRIPTION "msixtest manifest")
+     configure_file(${MSIX_PROJECT_ROOT}/manifest.cmakein ${MSIX_TEST_OUTPUT_DIRECTORY}/${PROJECT_NAME}.exe.manifest CRLF)
+@@ -91,7 +93,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
+ )
+ 
+ add_dependencies(${PROJECT_NAME} msix)
+-target_link_libraries(${PROJECT_NAME} msix)
++target_link_libraries(${PROJECT_NAME} msix Catch2::Catch2)
+ 
+ # For windows copy the library
+ if(WIN32)

ports/msix/install-cmake.patch

@@ -1,19 +1,20 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ee0443..8c0a868 100644
+index 20098bf..38c3c95 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -266,3 +266,5 @@ message(STATUS "sample processed")
+@@ -190,3 +190,5 @@ message(STATUS "src processed")
- add_subdirectory(test)
+ add_subdirectory(sample)
- message(STATUS "tests processed")
+ message(STATUS "sample processed")
  message(STATUS "DONE!")
 +
 +install(TARGETS msix)
+\ No newline at end of file
 diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt
-index 817040b..6b16b69 100644
+index 296eda4..cf87993 100644
 --- a/src/msix/CMakeLists.txt
 +++ b/src/msix/CMakeLists.txt
-@@ -164,9 +164,9 @@ message(STATUS "PAL: Compression     = ${CompressionObject}")
+@@ -87,9 +87,9 @@ endif()
- include(msix_resources)
+ include(msix_resources) # Handles all the certificates and schemas we are going to use.
  
  set(LIB_PUBLIC_HEADERS
 -    ../inc/AppxPackaging.hpp
@@ -24,4 +25,13 @@ index 817040b..6b16b69 100644
 +    ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp
  )
  
- # Bundle specific files
+ set(MsixSrc) # list with all the files we are going to use
+@@ -260,7 +260,7 @@ if(WIN32)
+             "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll")
+     string(REPLACE ";" " " DELAYFLAGS "${DELAYFLAGS}")
+     set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "${DELAYFLAGS} /LTCG")
+-    set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:windowsexports.def")
++    set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/windowsexports.def")
+     if(USE_STATIC_MSVC)
+         if(CMAKE_BUILD_TYPE MATCHES Debug)
+             set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /NODEFAULTLIB:MSVCRTD")

ports/msix/portfile.cmake

@@ -1,27 +1,27 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/msix-packaging
-    REF MsixCoreInstaller-preview
+    REF ab322965d64baf1448548cbe18139e8872d686f2 # v1.7
-    SHA512 b034559da8e4d5fedc79b3ef65b6f8e9bca69c92f3d85096e7ea84a0e394fa04a92f84079524437ceebd6c006a12dac9cc2e46197154257bbf7449ded031d3e8
+    SHA512 d64767c84d5933bf3d1e0e62e9dc21fa13e02b8cf31776ccbe2e7066e514798d8ff758dc2b6fd64f6eabcf3deb83ef0eaa03e1a7d407307f347a045e8a75d3dd
     HEAD_REF master
-    PATCHES install-cmake.patch
+    PATCHES
+        install-cmake.patch
+        fix-dependency-catch2.patch
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/lib)
 file(MAKE_DIRECTORY ${SOURCE_PATH}/lib)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lib)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/lib/CMakeLists.txt)
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
     set(PLATFORM WIN32)
     set(CRYPTO_LIB crypt32)
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(VCPKG_TARGET_IS_LINUX)
     set(PLATFORM LINUX)
     set(CRYPTO_LIB openssl)
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(VCPKG_TARGET_IS_OSX)
     set(PLATFORM MACOS)
     set(CRYPTO_LIB openssl)
 else()
@@ -45,8 +45,5 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL
-    ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/msix RENAME copyright)
-
 vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/netcdf-c/CONTROL

@@ -1,5 +1,5 @@
 Source: netcdf-c
-Version: 4.7.0-5
+Version: 4.7.3
 Build-Depends: hdf5, curl
 Homepage: https://github.com/Unidata/netcdf-c
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.

ports/netcdf-c/fix-build-error-on-linux.patch

@@ -1,28 +0,0 @@
-diff --git a/include/ncconfigure.h b/include/ncconfigure.h
-index 2c5b2c8..d397790 100644
---- a/include/ncconfigure.h
-+++ b/include/ncconfigure.h
-@@ -25,20 +25,20 @@ missing functions should be
- defined and missing types defined.
- */
- 
--#ifndef HAVE_STRDUP
-+#ifndef strdup
- extern char* strdup(const char*);
- #endif
- 
- /* handle null arguments */
- #ifndef nulldup
--#ifdef HAVE_STRDUP
-+#ifdef strdup
- #define nulldup(s) ((s)==NULL?NULL:strdup(s))
- #else
- char *nulldup(const char* s);
- #endif
- #endif
- 
--#ifdef _MSC_VER
-+#ifdef _WIN32
- #ifndef HAVE_SSIZE_T
- #include <basetsd.h>
- typedef SSIZE_T ssize_t;

ports/netcdf-c/hdf5.patch

@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a3874c13..36f15beb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -599,11 +599,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     IF(NC_FIND_SHARED_LIBS)
-       SET(NC_HDF5_LINK_TYPE "shared")
-       SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")
--      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
-     ELSE(NC_FIND_SHARED_LIBS)
-       SET(NC_HDF5_LINK_TYPE "static")
-       SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")
--      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
-+      SET(HDF5_USE_STATIC_LIBRARIES ON)
-     ENDIF(NC_FIND_SHARED_LIBS)
- 
-     #####
-@@ -614,8 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     # had worked.
-     #####
-     IF(MSVC)
--      SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
--      FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE})
-+      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
-     ELSE(MSVC)
-       FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
-     ENDIF(MSVC)

ports/netcdf-c/hdf5_2.patch

@@ -1,13 +0,0 @@
-diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
-index ea9b0294..3c7f427d 100644
---- a/liblib/CMakeLists.txt	
-+++ b/liblib/CMakeLists.txt
-@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4)
-     # HDF5_HL_LIBRARY.
-     SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
-   ELSE() # Windows CMake defines HDF5_LIBRARIES.
--    SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
-+    SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
-   ENDIF()
- ENDIF()
- 

ports/netcdf-c/hdf5_3.patch

@@ -1,14 +0,0 @@
-diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt
-index f3c7bbc..34fc2ab 100644
---- a/libhdf5/CMakeLists.txt
-+++ b/libhdf5/CMakeLists.txt
-@@ -20,3 +20,9 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES})
- 
- # Remember to package this file for CMake builds.
- ADD_EXTRA_DIST(${libnchdf5_SOURCES} CMakeLists.txt)
-+
-+if(HDF5_BUILD_SHARED_LIBS) 
-+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5_hl-shared)
-+else()
-+ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-static hdf5::hdf5_hl-static) 
-+endif()

ports/netcdf-c/portfile.cmake

@@ -1,24 +1,19 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Unidata/netcdf-c
-    REF v4.7.0
+    REF b7cd387bee8c661141fabb490f4969587c008c55 # v4.7.3
-    SHA512 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a
+    SHA512 a55391620fac61e4975fe62907ca21049911afce6190fc12d183d24133a32aae8cd223b97a3fe57fc82d8bdca1a7db451046e3be3c379051624d48b1f56c0332
     HEAD_REF master
     PATCHES
         no-install-deps.patch
         config-pkg-location.patch
-        transitive-hdf5.patch
+        use_targets.patch
-        hdf5.patch
-        hdf5_2.patch
-        fix-build-error-on-linux.patch
-        hdf5_3.patch
 )
 
 #Remove outdated find modules
 file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/windows/FindHDF5.cmake")
 
 if(VCPKG_CRT_LINKAGE STREQUAL "static")
     set(NC_USE_STATIC_CRT ON)
@@ -28,7 +23,7 @@ endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    DISABLE_PARALLEL_CONFIGURE
+    DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source!
     PREFER_NINJA
     OPTIONS
         -DBUILD_UTILITIES=OFF

ports/netcdf-c/transitive-hdf5.patch

@@ -1,13 +0,0 @@
-diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
-index 6f4ccf8..14a3743 100644
---- a/netCDFConfig.cmake.in
-+++ b/netCDFConfig.cmake.in
-@@ -11,6 +11,8 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- 
- set(netCDF_LIBRARIES netcdf)
- 
-+find_package(HDF5 COMPONENTS C HL CONFIG REQUIRED)
-+
- # include target information
- include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
- 

ports/netcdf-c/use_targets.patch

@@ -0,0 +1,168 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1ce05e0fe..7671d7b1e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -431,7 +431,6 @@ IF(NC_EXTRA_DEPS)
+     SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}")
+   ENDFOREACH()
+   MESSAGE("Extra deps: ${EXTRA_DEPS}")
+-  LIST(REMOVE_DUPLICATES EXTRA_DEPS)
+   SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS})
+ ENDIF()
+ ###
+@@ -599,15 +599,6 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     # we will use a static library.  This can be toggled
+     # by explicitly modifying NC_FIND_SHARED_LIBS.
+     ##
+-    IF(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "shared")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
+-    ELSE(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "static")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
+-    ENDIF(NC_FIND_SHARED_LIBS)
+ 
+     #####
+     # First, find the C and HL libraries.
+@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+       SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+       FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE})
+     ELSE(MSVC)
+-      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++      FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED)
+     ENDIF(MSVC)
+-
++    
+     ##
+     # Next, check the HDF5 version. This will inform which
+     # HDF5 variables we need to munge.
+@@ -695,6 +695,19 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     ENDIF()
+   ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
+ 
++  if(TARGET hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared)
++    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared)
++    ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
++  else()
++    set(HDF5_C_LIBRARY hdf5::hdf5-static)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static)
++    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static)
++    ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
++  endif()
++  list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY})
++
+   FIND_PACKAGE(Threads)
+ 
+   # There is a missing case in the above code so default it
+@@ -721,16 +733,11 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)
+ 
+   #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
+-  CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP)
++  set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT})
+   IF(USE_SZIP)
+-    FIND_LIBRARY(SZIP NAMES szip sz)
+-    IF(SZIP)
++    #FIND_LIBRARY(SZIP NAMES szip sz)
++    #IF(SZIP)
+       SET(HAVE_H5Z_SZIP 1)
+-      SET(SZIP_LIBRARY ${SZIP})
+-      SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP})
+-    ELSE()
+-      MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.")
+-    ENDIF()
+   ENDIF()
+ 
+   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS)
+@@ -764,8 +776,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ ENDIF(USE_HDF5 OR ENABLE_NETCDF_4)
+ 
+ # See if we have libcurl
+-FIND_PACKAGE(CURL)
+-ADD_DEFINITIONS(-DCURL_STATICLIB=1)
++FIND_PACKAGE(CURL CONFIG)
+ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+ 
+ # Check to see if CURLOPT_USERNAME is defined.
+@@ -1890,7 +1902,6 @@ ENDIF()
+ 
+ STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
+ 
+-LIST(REMOVE_DUPLICATES NC_LIBS)
+ LIST(REMOVE_DUPLICATES LINKFLAGS)
+ 
+ SET(LIBS ${NC_LIBS})
+diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
+index ea9b02949..ec7851f37 100644
+--- a/liblib/CMakeLists.txt
++++ b/liblib/CMakeLists.txt
+@@ -58,7 +58,7 @@ ENDIF()
+ 
+ SET(TLL_LIBS "")
+ 
+-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY})
++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB)
+ 
+ # Add extra dependencies specified via NC_EXTRA_DEPS
+ SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS})
+@@ -68,27 +68,15 @@ IF(HAVE_LIBDL)
+ ENDIF()
+ 
+ IF(USE_HDF5 OR USE_NETCDF4)
+-  IF(NOT MSVC)
+-    # Some version of cmake define HDF5_hdf5_LIBRARY instead of
+-    # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES
+-    IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES)
+-      SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY})
+-    ENDIF()
+-    IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES)
+-      SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY})
+-    ENDIF()
+-    # The order of the libraries is important here for static
+-    # builds:
+-    # Make sure that HDF5_C_LIBRARY appears *after*
+-    # HDF5_HL_LIBRARY.
+-    SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
+-  ELSE() # Windows CMake defines HDF5_LIBRARIES.
+-    SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY})
+-  ENDIF()
++  if(TARGET hdf5::hdf5-shared)
++    SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared)
++  else()
++    SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static)
++  endif()
+ ENDIF()
+ 
+ IF(USE_DAP)
+-  SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY})
++  SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl)
+ ENDIF()
+ 
+ IF(USE_HDF4)
+@@ -100,7 +88,6 @@ IF(ENABLE_PNETCDF AND PNETCDF)
+ ENDIF()
+ 
+ IF(TLL_LIBS)
+-  LIST(REMOVE_DUPLICATES TLL_LIBS)
+ ENDIF()
+ 
+ TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
+diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
+index c89cf3e67..b81f35a1b 100644
+--- a/netCDFConfig.cmake.in
++++ b/netCDFConfig.cmake.in
+@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(netCDF_LIBRARIES netcdf)
+ 
+ # include target information
++include(CMakeFindDependencyMacro)
++find_dependency(ZLIB)
++find_dependency(HDF5 CONFIG)
++find_dependency(CURL CONFIG)
+ include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
+ 
+ # Compiling Options

ports/openal-soft/CONTROL

@@ -1,4 +1,4 @@
 Source: openal-soft
-Version: 1.19.1-2
+Version: 1.20.0
 Homepage: https://github.com/kcat/openal-soft
 Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.

ports/openal-soft/dont-export-symbols-in-static-build.patch

@@ -1,5 +1,5 @@
 diff --git a/config.h.in b/config.h.in
-index a71b54f..8d84645 100644
+index 4a1e2b00..d5496972 100644
 --- a/config.h.in
 +++ b/config.h.in
 @@ -1,6 +1,8 @@
@@ -8,6 +8,7 @@ index a71b54f..8d84645 100644
  #define AL_API  ${EXPORT_DECL}
  #define ALC_API ${EXPORT_DECL}
 +#endif
- 
+
- /* Define any available alignment declaration */
+ /* Define a restrict macro for non-aliased pointers */
- #define ALIGN(x) ${ALIGN_DECL}
+ #define RESTRICT ${RESTRICT_DECL}
+ 

ports/openal-soft/fix-arm-builds.patch

@@ -1,17 +1,51 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b80250..e2a1ed76 100644
+index 98f9ad49..50b4297f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1409,6 +1409,7 @@ ELSE()
+@@ -1193,6 +1193,7 @@ SET_TARGET_PROPERTIES(common PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+ UNSET(HAS_ROUTER)
+ SET(IMPL_TARGET OpenAL) # Either OpenAL or soft_oal.
+ SET(SUBSYS_FLAG )
++SET(COMMON_LIB )
+
+ # Build main library
+ IF(LIBTYPE STREQUAL "STATIC")
+@@ -1203,12 +1204,15 @@ IF(LIBTYPE STREQUAL "STATIC")
+     ADD_LIBRARY(${IMPL_TARGET} STATIC ${COMMON_OBJS} ${OPENAL_OBJS} ${ALC_OBJS})
+     TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
+ ELSE()
++    SET(COMMON_LIB common)
++
+     IF(WIN32)
+         IF(MSVC)
+             SET(SUBSYS_FLAG ${SUBSYS_FLAG} "/SUBSYSTEM:WINDOWS")
          ELSEIF(CMAKE_COMPILER_IS_GNUCC)
              SET(SUBSYS_FLAG ${SUBSYS_FLAG} "-mwindows")
          ENDIF()
-+        SET(COMMON_LIB ${COMMON_LIB} shell32 ole32)
++        set(COMMON_LIB ${COMMON_LIB} shell32 ole32)
      ENDIF()
- 
+
-     IF(WIN32 AND ALSOFT_BUILD_ROUTER)
+     SET(RC_CONFIG resources/openal32.rc)
+@@ -1223,7 +1227,7 @@ ELSE()
+         TARGET_COMPILE_DEFINITIONS(OpenAL
+             PRIVATE AL_BUILD_LIBRARY AL_ALEXT_PROTOTYPES ${CPP_DEFS})
+         TARGET_COMPILE_OPTIONS(OpenAL PRIVATE ${C_FLAGS})
+-        TARGET_LINK_LIBRARIES(OpenAL PRIVATE common ${LINKER_FLAGS})
++        TARGET_LINK_LIBRARIES(OpenAL PRIVATE ${COMMON_LIB} ${LINKER_FLAGS})
+         TARGET_INCLUDE_DIRECTORIES(OpenAL
+           PUBLIC
+             $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
+@@ -1248,7 +1252,7 @@ ELSE()
+     IF(WIN32)
+         SET_TARGET_PROPERTIES(${IMPL_TARGET} PROPERTIES PREFIX "")
+     ENDIF()
+-    TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE common ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
++    TARGET_LINK_LIBRARIES(${IMPL_TARGET} PRIVATE ${COMMON_LIB} ${LINKER_FLAGS} ${EXTRA_LIBS} ${MATH_LIB})
+ ENDIF()
+
+ TARGET_INCLUDE_DIRECTORIES(${IMPL_TARGET}
 diff --git a/native-tools/CMakeLists.txt b/native-tools/CMakeLists.txt
-index 5e816bba..16f3be12 100644
+index 5e816bba..5d7919f6 100644
 --- a/native-tools/CMakeLists.txt
 +++ b/native-tools/CMakeLists.txt
 @@ -24,6 +24,11 @@ set_target_properties(bsincgen PROPERTIES OUTPUT_NAME bsincgen)
@@ -27,4 +61,3 @@ index 5e816bba..16f3be12 100644
 +    set(BSINCGEN_LIB ${BSINCGEN_LIB} shell32)
 +endif()
 +target_link_libraries(bsincgen ${BSINCGEN_LIB})
-\ No newline at end of file

ports/openal-soft/portfile.cmake

@@ -1,13 +1,10 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+vcpkg_fail_port_install(ON_TARGET "UWP")
-    message(FATAL_ERROR "WindowsStore not supported")
-endif()
 
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kcat/openal-soft
-    REF openal-soft-1.19.1
+    REF openal-soft-1.20.0
-    SHA512 4a64cc90ddeaa3773610b0bc8023d231100f3396f3fc5bd079db81600f80a789c75e6af03391bfc78a903c96bb71f8052a9ae802ea81422028e5b12b7eb6c47b
+    SHA512 d106bf8f96b32a61fadc0ee54882ce5041e4cbc35bf573296a210c83815b6c7be056ee3ed7617196dda5f89f2acd7163375f14b0cf24934faa0eda1fdb4f82a9
     HEAD_REF master
     PATCHES
         dont-export-symbols-in-static-build.patch
@@ -20,10 +17,12 @@ else()
     set(OPENAL_LIBTYPE "STATIC")
 endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_LINUX)
     set(ALSOFT_REQUIRE_WINDOWS OFF)
     set(ALSOFT_REQUIRE_LINUX ON)
-else()
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS)
     set(ALSOFT_REQUIRE_WINDOWS ON)
     set(ALSOFT_REQUIRE_LINUX OFF)
 endif()
@@ -69,9 +68,7 @@ foreach(HEADER al.h alc.h)
     file(WRITE ${CURRENT_PACKAGES_DIR}/include/AL/${HEADER} "${AL_H}")
 endforeach()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/openal-soft)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openal-soft/COPYING ${CURRENT_PACKAGES_DIR}/share/openal-soft/copyright)
+
 vcpkg_copy_pdbs()

ports/opencolorio/CONTROL

@@ -1,5 +1,5 @@
 Source: opencolorio
-Version: 1.1.1
+Version: 1.1.1-1
 Homepage: https://opencolorio.org/
 Description: OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.
 Build-Depends: glew[core], freeglut[core], lcms[core], yaml-cpp[core], tinyxml[core]

ports/opencolorio/portfile.cmake

@@ -1,5 +1,4 @@
 include(vcpkg_common_definitions)
-include(vcpkg_common_functions)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(_BUILD_SHARED OFF)
@@ -29,9 +28,9 @@ vcpkg_check_features(
         applications OCIO_BUILD_APPS
 )
 
-vcpkg_find_acquire_program(PYTHON2)
+vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON2_PATH ${PYTHON2} DIRECTORY)
+get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path(PREPEND ${PYTHON2_PATH})
+vcpkg_add_to_path(PREPEND ${PYTHON3_PATH})
 
 # TODO(theblackunknown) build additional targets based on feature
 

ports/openmvg/CONTROL

@@ -1,5 +1,5 @@
 Source: openmvg
-Version: 1.4-6
+Version: 1.4-7
 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
 Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib, suitesparse
 

ports/openmvg/fix-config-cmake.patch

@@ -0,0 +1,13 @@
+diff --git a/src/cmakeFindModules/OpenMVGConfig.cmake.in b/src/cmakeFindModules/OpenMVGConfig.cmake.in
+index e7dfbfd..357a25c 100644
+--- a/src/cmakeFindModules/OpenMVGConfig.cmake.in
++++ b/src/cmakeFindModules/OpenMVGConfig.cmake.in
+@@ -61,7 +61,7 @@ set(CMAKE_MODULE_PATH ${CURRENT_CONFIG_INSTALL_DIR})
+ 
+ # Build the absolute root install directory as a relative path
+ get_filename_component(CURRENT_ROOT_INSTALL_DIR
+-  ${CMAKE_MODULE_PATH}/../../../ ABSOLUTE)
++  ${CMAKE_MODULE_PATH}/../../ ABSOLUTE)
+ if (NOT EXISTS ${CURRENT_ROOT_INSTALL_DIR})
+   OPENMVG_REPORT_NOT_FOUND(
+     "OpenMVG install root: ${CURRENT_ROOT_INSTALL_DIR}, "

ports/openmvg/portfile.cmake

@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_buildpath_length_warning(37)
 
 #the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself
@@ -12,6 +10,13 @@ vcpkg_from_github(
     SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a
     PATCHES
         fixcmake.patch
+        fix-config-cmake.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    openmp OpenMVG_USE_OPENMP
+    opencv OpenMVG_USE_OPENCV
+    opencv OpenMVG_USE_OCVSIFT
 )
 
 set(ENABLE_OPENCV OFF)
@@ -25,28 +30,28 @@ if("openmp" IN_LIST FEATURES)
 endif()
 
 # remove some deps to prevent conflict
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse)
+                    ${SOURCE_PATH}/src/third_party/cxsparse
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen)
+                    ${SOURCE_PATH}/src/third_party/eigen
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann)
+                    ${SOURCE_PATH}/src/third_party/flann
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg)
+                    ${SOURCE_PATH}/src/third_party/jpeg
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon)
+                    ${SOURCE_PATH}/src/third_party/lemon
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png)
+                    ${SOURCE_PATH}/src/third_party/png
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff)
+                    ${SOURCE_PATH}/src/third_party/tiff
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib)
+                    ${SOURCE_PATH}/src/third_party/zlib)
 
 # remove some cmake modules to force using our configs
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake)
+file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake)
+                    ${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake)
+                    ${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake)
+                    ${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake)
+                    ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake)
+                    ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/src
     PREFER_NINJA
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         -DOpenMVG_BUILD_SHARED=OFF
         -DOpenMVG_BUILD_TESTS=OFF
         -DOpenMVG_BUILD_DOC=OFF
@@ -55,9 +60,6 @@ vcpkg_configure_cmake(
         -DOpenMVG_BUILD_SOFTWARES=OFF
         -DOpenMVG_BUILD_GUI_SOFTWARES=OFF
         -DOpenMVG_BUILD_COVERAGE=OFF
-        -DOpenMVG_USE_OPENMP=${ENABLE_OPENMP}
-        -DOpenMVG_USE_OPENCV=${ENABLE_OPENCV}
-        -DOpenMVG_USE_OCVSIFT=${ENABLE_OPENCV}
         -DOpenMVG_USE_INTERNAL_CLP=OFF
         -DOpenMVG_USE_INTERNAL_COINUTILS=OFF
         -DOpenMVG_USE_INTERNAL_OSI=OFF
@@ -70,8 +72,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/openMVG/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 #remove extra deprecated cmake target files left in unappropriate folders
 file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake)
@@ -79,8 +80,8 @@ file(REMOVE_RECURSE ${REMOVE_CMAKE})
 file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/debug/lib/*.cmake)
 file(REMOVE_RECURSE ${REMOVE_CMAKE})
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data)
+                    ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data)
 
 if(OpenMVG_BUILD_SHARED)
     # release

ports/openmvs/CONTROL

@@ -1,4 +1,4 @@
 Source: openmvs
-Version: 1.0-3
+Version: 1.0.1
 Description: OpenMVS: open Multi-View Stereo reconstruction library
 Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib

ports/openmvs/boost-1.71.patch

@@ -1,13 +0,0 @@
-diff --git a/libs/Common/Types.h b/libs/Common/Types.h
-index aad57d1..ef21380 100644
---- a/libs/Common/Types.h
-+++ b/libs/Common/Types.h
-@@ -88,7 +88,7 @@
- #define BOOST_NO_EXCEPTIONS
- #endif
- #ifdef BOOST_NO_EXCEPTIONS
--namespace boost { void throw_exception(std::exception const&); }
-+#include <boost/throw_exception.hpp>
- #endif
- #define BOOST_NO_UNREACHABLE_RETURN_DETECTION
- // include headers that implement serialization support

ports/openmvs/cgal-5.0.patch

@@ -1,40 +0,0 @@
-diff --git a/libs/MVS/DepthMap.cpp b/libs/MVS/DepthMap.cpp
-index 12973ac..f6621f0 100644
---- a/libs/MVS/DepthMap.cpp
-+++ b/libs/MVS/DepthMap.cpp
-@@ -1071,16 +1071,25 @@ void MVS::EstimatePointNormals(const ImageArr& images, PointCloud& pointcloud, i
- 	// estimates normals direction;
- 	// Note: pca_estimate_normals() requires an iterator over points
- 	// as well as property maps to access each point's position and normal.
--	#if CGAL_VERSION_NR < 1040800000
--	CGAL::pca_estimate_normals(
--	#else
--	CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
--	#endif
--		pointvectors.begin(), pointvectors.end(),
--		CGAL::First_of_pair_property_map<PointVectorPair>(),
--		CGAL::Second_of_pair_property_map<PointVectorPair>(),
--		numNeighbors
--	);
-+        #if CGAL_VERSION_NR < 1041301000
-+          #if CGAL_VERSION_NR < 1040800000
-+          CGAL::pca_estimate_normals(
-+          #else
-+          CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
-+          #endif
-+                pointvectors.begin(), pointvectors.end(),
-+                CGAL::First_of_pair_property_map<PointVectorPair>(),
-+                CGAL::Second_of_pair_property_map<PointVectorPair>(),
-+                numNeighbors
-+          );
-+        #else
-+        CGAL::pca_estimate_normals<CGAL::Sequential_tag>(
-+              pointvectors,
-+              numNeighbors,
-+              CGAL::parameters::point_map(CGAL::First_of_pair_property_map<PointVectorPair>())
-+              .normal_map(CGAL::Second_of_pair_property_map<PointVectorPair>())
-+              );
-+        #endif
- 	// store the point normals
- 	pointcloud.normals.Resize(pointcloud.points.GetSize());
- 	FOREACH(i, pointcloud.normals) {

ports/openmvs/glfw3_target_compat.patch

@@ -1,43 +0,0 @@
-diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt
-index f1690a6..78466cd 100644
---- a/apps/Viewer/CMakeLists.txt
-+++ b/apps/Viewer/CMakeLists.txt
-@@ -16,28 +16,7 @@ else()
- 	MESSAGE("-- Can't find GLEW. Continuing without it.")
- 	RETURN()
- endif()
--if(CMAKE_COMPILER_IS_GNUCXX)
--	FIND_PACKAGE(PkgConfig QUIET)
--	pkg_search_module(GLFW QUIET glfw3)
--	if(GLFW_FOUND)
--		INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS})
--		ADD_DEFINITIONS(${GLFW_DEFINITIONS})
--		MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})")
--	else()
--		MESSAGE("-- Can't find GLFW3. Continuing without it.")
--		RETURN()
--	endif()
--else()
--	FIND_PACKAGE(glfw3 QUIET)
--	if(glfw3_FOUND)
--		INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS})
--		ADD_DEFINITIONS(${glfw3_DEFINITIONS})
--		MESSAGE(STATUS "GLFW3 ${glfw3_VERSION} found (include: ${glfw3_INCLUDE_DIRS})")
--	else()
--		MESSAGE("-- Can't find GLFW3. Continuing without it.")
--		RETURN()
--	endif()
--endif()
-+FIND_PACKAGE(glfw3 REQUIRED)
- 
- # List sources files
- FILE(GLOB PCH_C "Common.cpp")
-@@ -54,7 +33,7 @@ FILE(GLOB LIBRARY_FILES_H "*.h" "*.inl")
- LIST(REMOVE_ITEM LIBRARY_FILES_C ${PCH_C})
- SET(LIBRARY_FILES_C "${PCH_C};${LIBRARY_FILES_C}")
- 
--cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};${GLFW_STATIC_LIBRARIES};GLEW::GLEW;${glfw3_LIBRARY};${GLFW3_LIBRARY};glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
-+cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};GLEW::GLEW;glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
- 
- # Manually set Common.h as the precompiled header
- set_target_pch(${VIEWER_NAME} Common.h)

ports/openmvs/portfile.cmake

@@ -5,13 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cdcseacave/openMVS
-    REF v1.0
+    REF 7110659a3f5181397bc2549cea15d5350cd25c9d
-    SHA512 d5743660286068d2ec9e80b8cfdf1dd612d76f12f1f10c95d32bab55ae65032a200d820f2c76e4781068c61597e2533df8755fd5d9076d3aac9223134eb5b561
+    SHA512 e484a88e0040b69e489476ef20c06184d2dc2bf42452b965b4997a717c2d1f19ab7cd695563c4faacdb0ec8705d072bcfd568d7b3a32e4e8b8c632bcec57e15c
     HEAD_REF master
-    PATCHES
-        glfw3_target_compat.patch
-        boost-1.71.patch
-        cgal-5.0.patch
 )
 
 vcpkg_configure_cmake(

ports/otl/CONTROL

@@ -1,4 +1,4 @@
 Source: otl
-Version: 4.0.448-2
+Version: 4.0.451
 Description: Oracle, Odbc and DB2-CLI Template Library
 Homepage: http://otl.sourceforge.net/

ports/otl/portfile.cmake

@@ -1,9 +1,9 @@
-set(OTL_VERSION 40448)
+set(OTL_VERSION 40451)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip"
-    FILENAME "otl-v${OTL_VERSION}.zip"
+    FILENAME "otlv4_${OTL_VERSION}.zip"
-    SHA512 3ddc7efb79e0f8349783b18fd8c95a778721a7589f4a69168365c072e8fa09f7ec9679c89dcceb844b16e816c6e561f995f1fdd50e8df983e7ff0186083c246c
+    SHA512 add1e54fae20175461d5f09cbe324e98b6f6a3839356136811109cf3251ca96541c101816870c6cc15d7611ad6bf9d576ac8dfce4274419b30866955c5892d15
 )
 
 vcpkg_extract_source_archive_ex(
@@ -13,9 +13,9 @@ vcpkg_extract_source_archive_ex(
 )
 
 file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" 
-    DESTINATION "${CURRENT_PACKAGES_DIR}/include/otl" 
+    DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" 
     RENAME otlv4.h)
 
 file(INSTALL "${SOURCE_PATH}/otlv${OTL_VERSION}.h" 
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/otl" 
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" 
     RENAME copyright)

ports/proj4/CONTROL

@@ -1,5 +1,5 @@
 Source: proj4
-Version: 6.2.1-1
+Version: 6.2.1-2
 Homepage: https://github.com/OSGeo/PROJ
 Description: PROJ.4 library for cartographic projections
 Build-Depends: sqlite3[core]

ports/proj4/portfile.cmake

@@ -28,12 +28,12 @@ if ("database" IN_LIST FEATURES)
     if (VCPKG_TARGET_IS_WINDOWS)
         set(BIN_SUFFIX .exe)
         if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
-            if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3-bin.exe)
+            if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/sqlite3.exe)
                 message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x86-windows first.")
             endif()
             set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x86-windows/tools)
         elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic))
-            if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3-bin.exe)
+            if (NOT EXISTS ${CURRENT_INSTALLED_DIR}/../x64-windows/tools/sqlite3.exe)
                 message(FATAL_ERROR "Proj4 database need to install sqlite3[tool]:x64-windows first.")
             endif()
             set(SQLITE3_BIN_PATH ${CURRENT_INSTALLED_DIR}/../x64-windows/tools)
@@ -61,7 +61,7 @@ vcpkg_configure_cmake(
     -DBUILD_PROJ=OFF
     -DBUILD_PROJINFO=OFF
     -DPROJ_TESTS=OFF
-    -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3-bin${BIN_SUFFIX}
+    -DEXE_SQLITE3=${SQLITE3_BIN_PATH}/sqlite3${BIN_SUFFIX}
 )
 
 vcpkg_install_cmake()

ports/qhull/CONTROL

@@ -1,4 +1,4 @@
 Source: qhull
-Version: 7.3.2-1
+Version: 7.3.2-2
 Homepage: https://github.com/qhull/qhull
 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram

ports/qhull/mac-fix.patch

@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07d3da2..14df8e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -626,18 +626,18 @@ install(TARGETS ${qhull_TARGETS_INSTALL} EXPORT QhullTargets
+ include(CMakePackageConfigHelpers)
+ 
+ write_basic_package_version_file(
+-    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
+     VERSION ${qhull_VERSION}
+     COMPATIBILITY AnyNewerVersion
+ )
+ 
+ export(EXPORT QhullTargets
+-  FILE "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullTargets.cmake"
++  FILE "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullTargets.cmake"
+   NAMESPACE Qhull::
+ )
+ 
+ configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
+-  "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
++  "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
+   @ONLY
+ )
+ 
+@@ -652,8 +652,8 @@ install(EXPORT QhullTargets
+ )
+ install(
+   FILES
+-    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfig.cmake"
+-    "${CMAKE_CURRENT_BINARY_DIR}/Qhull/QhullConfigVersion.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfig.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/QhullExport/QhullConfigVersion.cmake"
+   DESTINATION
+     ${ConfigPackageLocation}
+   COMPONENT

ports/qhull/portfile.cmake

@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF v7.3.2 # Qhull 2019.1
     SHA512 aea2c70179de10f648aba960129a3b9a3fe309a0eb085bdb86f697e3d4b214570c241e88d4f0b4d2974137759ee7086452d0a3957c4b2a256708402fb3c9eb3d
     HEAD_REF master
-	PATCHES uwp.patch
+    PATCHES
+        uwp.patch
+        mac-fix.patch
 )
 if(${TARGET_TRIPLET} STREQUAL "x64-windows-static") 
 # workaround for visual studio toolset regression LNK1201 (remove if solved)

ports/realsense2/CONTROL

@@ -1,5 +1,5 @@
 Source: realsense2
-Version: 2.22.0-2
+Version: 2.30.0
 Homepage: https://github.com/IntelRealSense/librealsense
 Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
 

ports/realsense2/fix-dependency-glfw3.patch

@@ -1,13 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2da00e0..09f3eba 100644
+index 16ced1b..ef1b158 100644
---- a/CMakeLists.txt
+--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
++++ b/CMakeLists.txt
-@@ -52,7 +52,7 @@ option(BUILD_CV_KINFU_EXAMPLE "Build OpenCV KinectFusion example" OFF)
+@@ -69,7 +69,7 @@ include(CMake/install_config.cmake)
- add_subdirectory(wrappers)
+ add_subdirectory(wrappers)
- 
+ 
- if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS)
+ if (BUILD_EXAMPLES AND BUILD_GLSL_EXTENSIONS)
--    find_package(glfw3 3.3 QUIET)
+-    find_package(glfw3 3.3 QUIET)
-+    find_package(glfw3 CONFIG REQUIRED)
++    find_package(glfw3 CONFIG REQUIRED)
-     if(NOT TARGET glfw)
+     if(NOT TARGET glfw)
-         message(STATUS "GLFW 3.3 not found; using internal version")
+         message(STATUS "GLFW 3.3 not found; using internal version")
-         set(GLFW_INSTALL ON)
+         set(GLFW_INSTALL ON CACHE BOOL "" FORCE)

ports/realsense2/portfile.cmake

@@ -1,11 +1,9 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IntelRealSense/librealsense
-    REF v2.22.0
+    REF 9f99fa9a509555f85bffc15ce27531aaa6db6f7e#v2.30.0
-    SHA512 7595780c1955a2d4a91df5b70ab6366c672f389bc3d2dcb9f2e78a2ea1fc875c65f878103df483205e17f62dfd024ee5f7ccb15afc5d18978d3c25aa071652ab
+    SHA512 72d9e0b48a6cd0b056b6d039487431d0097e5151930a2dbb072d09a13fccee1f166ca339fe7f0ab4aae1edc5669de5e8336f0b6d87d1c4ea01ec0c5d4032c728
-    HEAD_REF development
+    HEAD_REF master
     PATCHES
         fix_openni2.patch
         fix-dependency-glfw3.patch

ports/reproc/CONTROL

@@ -1,3 +1,4 @@
 Source: reproc
-Version: 9.0.0
+Version: 10.0.3
 Description: Cross-platform (C99/C++11) process library
+Homepage: https://github.com/DaanDeMeyer/reproc

ports/reproc/portfile.cmake

@@ -1,10 +1,8 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DaanDeMeyer/reproc
-    REF v9.0.0
+    REF v10.0.3
-    SHA512 c9ab8c459f4cdf2b740edd461eefa2972a068078999ab97efff4473f1fae4dd774d00ea56cb33bdf883f78eb8d8b73aa721d35dd77e016b047cf4c9dadfee72b
+    SHA512 6d102962fbfb61b239d243fd38f7519c28cf7098e2e1a2bfd19035fa7152f4dcc51875683c76c1fa7274b786dde4b90873ae4a1eb6e5d9e485e6614ab06bf0d2
     HEAD_REF master
 )
 
@@ -12,20 +10,24 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
-        -DREPROC++=ON
+        -DREPROCXX=ON
         -DREPROC_INSTALL_PKGCONFIG=OFF
+        -DREPROC_INSTALL_CMAKECONFIGDIR=share
 )
 
 vcpkg_install_cmake()
 
-file(GLOB REPROC_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/reproc++/*)
-file(INSTALL ${REPROC_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/reproc++)
-file(INSTALL ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/reproc++/reproc++-targets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/reproc++)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/reproc)
-
-# Debug
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle License
+foreach(TARGET reproc reprocxx)
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/reproc)
+    vcpkg_fixup_cmake_targets(
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/reproc/LICENSE ${CURRENT_PACKAGES_DIR}/share/reproc/copyright)
+        CONFIG_PATH share/${TARGET} 
+        TARGET_PATH share/${TARGET}
+    )
+endforeach()
+
+file(
+    INSTALL ${SOURCE_PATH}/LICENSE 
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    RENAME copyright
+)

ports/sdl1/portfile.cmake

@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO SDL-Mirror/SDL
@@ -53,62 +51,36 @@ if (VCPKG_TARGET_IS_WINDOWS)
         file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDLmain.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDLmaind.lib)
     endif()
 else()
-    find_program(autoreconf autoreconf)
+    message("libgles2-mesa-dev must be installed before sdl1 can build. Install it with \"apt install libgles2-mesa-dev\".")
-    if (NOT autoreconf OR NOT EXISTS "/usr/share/doc/libgles2/copyright")
-        message(FATAL_ERROR "autoreconf and libgles2-mesa-dev must be installed before libepoxy can build. Install them with \"apt-get dh-autoreconf libgles2-mesa-dev\".")
-    endif()
     
-    find_program(MAKE make)
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    if (NOT MAKE)
+        set(BUILD_SHARED yes)
-        message(FATAL_ERROR "MAKE not found")
+        set(BUILD_STATIC no)
+    else()
+        set(BUILD_SHARED no)
+        set(BUILD_STATIC yes)
     endif()
 
     file(REMOVE_RECURSE ${SOURCE_PATH}/m4)
     file(MAKE_DIRECTORY ${SOURCE_PATH}/m4)
     
-    vcpkg_execute_required_process(
+    vcpkg_configure_make(
-        COMMAND "./autogen.sh"
+        SOURCE_PATH ${SOURCE_PATH}
-        WORKING_DIRECTORY ${SOURCE_PATH}
+        NO_DEBUG
-        LOGNAME autoreconf-${TARGET_TRIPLET}
+        PRERUN_SHELL autogen.sh
+        OPTIONS
+            --enable-shared=${BUILD_SHARED}
+            --enable-static=${BUILD_STATIC}
     )
     
-    message(STATUS "Configuring ${TARGET_TRIPLET}")
+    vcpkg_install_make()
-    set(OUT_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/make-build-${TARGET_TRIPLET}-release)
     
-    file(REMOVE_RECURSE ${OUT_PATH_RELEASE})
+    file(GLOB SDL1_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*")
-    file(MAKE_DIRECTORY ${OUT_PATH_RELEASE})
+    foreach (SDL1_TOOL ${SDL1_TOOLS})
-    
+        file(COPY ${SDL1_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
-    vcpkg_execute_required_process(
+        file(REMOVE ${SDL1_TOOL})
-        COMMAND "./configure" --prefix=${OUT_PATH_RELEASE}
+    endforeach()
-        WORKING_DIRECTORY ${SOURCE_PATH}
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-        LOGNAME config-${TARGET_TRIPLET}
-    )
-    
-    message(STATUS "Building ${TARGET_TRIPLET}")
-    vcpkg_execute_build_process(
-        COMMAND "make -j ${VCPKG_CONCURRENCY}"
-        NO_PARALLEL_COMMAND "make"
-        WORKING_DIRECTORY "${SOURCE_PATH}"
-        LOGNAME "build-${TARGET_TRIPLET}-release"
-    )
-    
-    message(STATUS "Installing ${TARGET_TRIPLET}")
-    vcpkg_execute_required_process(
-        COMMAND "make install"
-        WORKING_DIRECTORY "${SOURCE_PATH}"
-        LOGNAME "install-${TARGET_TRIPLET}-release"
-    )
-    
-    file(INSTALL ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR})
-    file(INSTALL ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR})
-    file(INSTALL ${OUT_PATH_RELEASE}/share DESTINATION ${CURRENT_PACKAGES_DIR})
-    
-    file(GLOB DYNAMIC_LIBS ${CURRENT_PACKAGES_DIR}/lib *.so*)
-    
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        file(COPY ${DYNAMIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    endif()
-    file(REMOVE ${DYNAMIC_LIBS})
     
     file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 endif()

ports/sqlite3/CONTROL

@@ -1,5 +1,5 @@
 Source: sqlite3
-Version: 3.30.1-1
+Version: 3.30.1-2
 Homepage: https://sqlite.org/
 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
 

ports/sqlite3/portfile.cmake

@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 set(SQLITE_VERSION 3300100)
 set(SQLITE_HASH 030b53fe684e0fb8e9747b1f160e5e875807eabb0763caff66fe949ee6aa92f26f409b9b25034d8d1f5cee554a99e56a2bb92129287b0fe0671409babe9d18ea )
 
@@ -18,16 +16,15 @@ vcpkg_extract_source_archive_ex(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-set(SQLITE3_SKIP_TOOLS ON)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-if("tool" IN_LIST FEATURES)
+    INVERTED_FEATURES
-    set(SQLITE3_SKIP_TOOLS OFF)
+    tool SQLITE3_SKIP_TOOLS
-endif()
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
-        -DSQLITE3_SKIP_TOOLS=${SQLITE3_SKIP_TOOLS}
     OPTIONS_DEBUG
         -DSQLITE3_SKIP_TOOLS=ON
 )
@@ -37,11 +34,15 @@ vcpkg_fixup_cmake_targets()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX})
+    file(RENAME ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX})
+endif()
+
 configure_file(
     ${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake
     ${CURRENT_PACKAGES_DIR}/share/sqlite3/sqlite3-config.cmake
     @ONLY
 )
 
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n")
-vcpkg_copy_pdbs()
+vcpkg_copy_pdbs()

ports/vtk/fix-VTKConfig-cmake.patch

@@ -0,0 +1,29 @@
+diff --git a/CMake/VTKConfig.cmake.in b/CMake/VTKConfig.cmake.in
+index 13e4db42..d28e0cc2 100644
+--- a/CMake/VTKConfig.cmake.in
++++ b/CMake/VTKConfig.cmake.in
+@@ -66,19 +66,11 @@ set(VTK_USE_FILE "${VTK_CMAKE_DIR}/UseVTK.cmake")
+ # The rendering backend VTK was configured to use.
+ set(VTK_RENDERING_BACKEND "@VTK_RENDERING_BACKEND@")
+ 
+-if (__vtk_install_tree)
+-  if (WIN32)
+-    set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_RUNTIME_DIR@")
+-  else ()
+-    set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_LIBRARY_DIR@")
+-  endif ()
+-else()
+-  if (WIN32)
+-    set (VTK_RUNTIME_DIRS "@CMAKE_BINARY_DIR@/bin")
+-  else ()
+-    set (VTK_RUNTIME_DIRS "@CMAKE_BINARY_DIR@/lib")
+-  endif ()
+-endif()
++if (WIN32)
++  set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_RUNTIME_DIR@")
++else ()
++  set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_LIBRARY_DIR@")
++endif ()
+ 
+ # Setup VTK-m if it was enabled
+ set(VTK_HAS_VTKM @VTK_HAS_VTKM@)

ports/vtk/portfile.cmake

@@ -34,6 +34,7 @@ vcpkg_from_github(
         hdf5_static.patch
         fix-find-lzma.patch
         fix-proj4.patch
+        fix-VTKConfig-cmake.patch
 )
 
 # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK,

ports/xmsh/CONTROL

@@ -1,4 +1,4 @@
 Source: xmsh
-Version: 0.4.1
+Version: 0.5.2
 Description: Reference Implementation of XMSH Library
-Build-Depends: tl-expected
+Build-Depends: tl-expected, nlohmann-json

ports/xmsh/portfile.cmake

@@ -2,11 +2,17 @@ include(vcpkg_common_functions)
 
 vcpkg_find_acquire_program(PYTHON3)
 
+if (NOT VCPKG_TARGET_IS_WINDOWS)
+    message("Building with a gcc version less than 7.1.0 is not supported.")
+else()
+    message(FATAL_ERROR "xmsh only support Linux/OSX.")
+endif()
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO libxmsh/xmsh
-  REF v0.4.1
+  REF e1900845b796ef977db70519b2ac08eebd788236 #v0.5.2
-  SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38
+  SHA512 643c6c94956de9b6fae635b6528e8ba756f4a2bc38de71613c2dd8d47f4a043aee7b6e7fec1870b306be3bea9f5c0c81d1d343bfc27883b3fba986fbc5b15406
   HEAD_REF master
 )
 
@@ -17,6 +23,10 @@ vcpkg_configure_cmake(
     -DPYTHON3_EXECUTABLE=${PYTHON3}
 )
 
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYPATH ${PYTHON3} PATH)
+set(ENV{PATH} "$ENV{PATH};${PYPATH}")
+
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
@@ -26,4 +36,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
+file(INSTALL ${SOURCE_PATH}/copyright.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/xmsh RENAME copyright)
+
 vcpkg_copy_pdbs()

scripts/buildsystems/vcpkg.cmake

@@ -1,6 +1,10 @@
 # Mark variables as used so cmake doesn't complain about them
 mark_as_advanced(CMAKE_TOOLCHAIN_FILE)
 
+# VCPKG toolchain options. 
+option(VCPKG_VERBOSE "Enables messages from the VCPKG toolchain for debugging purposes." OFF)
+mark_as_advanced(VCPKG_VERBOSE)
+
 # Determine whether the toolchain is loaded during a try-compile configuration
 get_property(_CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
 
@@ -22,6 +26,24 @@ if(VCPKG_TOOLCHAIN)
     return()
 endif()
 
+if(DEFINED CMAKE_CONFIGURATION_TYPES) #Generating with a multi config generator
+    #If CMake does not have a mapping for MinSizeRel and RelWithDebInfo in imported targets
+    #it will map those configuration to the first valid configuration in CMAKE_CONFIGURATION_TYPES.
+    #By default this is the debug configuration which is wrong. 
+    if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL)
+        set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;")
+        if(VCPKG_VERBOSE)
+            message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;")
+        endif()
+    endif()
+    if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
+        set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;")
+        if(VCPKG_VERBOSE)
+            message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;")
+        endif()
+    endif()
+endif()
+
 if(VCPKG_TARGET_TRIPLET)
 elseif(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
     set(_VCPKG_TARGET_TRIPLET_ARCH x86)

scripts/ci.baseline.txt

@@ -113,7 +113,6 @@ aws-lambda-cpp:x86-windows=fail
 aws-sdk-cpp:x64-linux=ignore
 azure-c-shared-utility:arm-uwp=fail
 azure-c-shared-utility:x64-uwp=fail
-azure-kinect-sensor-sdk:x64-windows-static=fail
 basisu:x64-linux=ignore
 bde:arm64-windows=fail
 bde:arm-uwp=fail
@@ -182,6 +181,7 @@ bullet3:x64-uwp=fail
 bullet3:x64-osx=fail
 butteraugli:x64-linux=ignore
 caf:arm-uwp=fail
+caf:arm64-windows=fail
 caf:x64-uwp=fail
 caf:x64-linux=ignore
 caffe2:x86-windows=fail
@@ -714,6 +714,12 @@ libepoxy:x64-uwp=fail
 libepoxy:x64-windows-static=fail
 libevent:arm-uwp=fail
 libevent:x64-uwp=fail
+libevhtp:x86-windows=fail
+libevhtp:x64-windows=fail
+libevhtp:x64-windows-static=fail
+libevhtp:x64-uwp=fail
+libevhtp:arm64-windows=fail
+libevhtp:arm-uwp=fail
 libexif:arm-uwp=fail
 libexif:x64-uwp=fail
 libfabric:arm-uwp=fail
@@ -896,7 +902,10 @@ libusb:arm-uwp=fail
 libusb:x64-linux=fail
 libusb:x64-osx=fail
 libusb:x64-uwp=fail
+libusbmuxd:arm64-windows=fail
+libusbmuxd:arm-uwp=fail
 libusbmuxd:x64-uwp=fail
+libusbmuxd:x64-linux=fail
 libusb-win32:arm64-windows=fail
 libusb-win32:arm-uwp=fail
 libusb-win32:x64-linux=fail
@@ -919,6 +928,12 @@ libvpx:arm64-windows=fail
 libvpx:arm-uwp=fail
 libvpx:x64-linux=fail
 libvpx:x64-osx=fail
+libwandio:x86-windows=fail
+libwandio:x64-windows=fail
+libwandio:x64-windows-static=fail
+libwandio:x64-uwp=fail
+libwandio:arm64-windows=fail
+libwandio:arm-uwp=fail
 libwebsockets:arm-uwp=fail
 libwebsockets:x64-uwp=fail
 libxmp-lite:x64-linux=fail
@@ -1491,8 +1506,6 @@ sdformat6:arm-uwp=fail
 sdformat6:x64-uwp=fail
 sdformat6:x64-linux=ignore
 sdl1:arm-uwp=fail
-sdl1:x64-linux=fail
-sdl1:x64-osx=fail
 sdl1:x64-uwp=fail
 sdl2-gfx:arm64-windows=fail
 sdl2-gfx:x64-linux=fail

toolsrc/src/vcpkg/base/system.cpp

@@ -157,11 +157,24 @@ namespace vcpkg
         std::vector<CPUArchitecture> supported_architectures;
         supported_architectures.push_back(get_host_processor());
 
-        // AMD64 machines support to run x86 applications
+        // AMD64 machines support running x86 applications and ARM64 machines support running ARM applications
         if (supported_architectures.back() == CPUArchitecture::X64)
         {
             supported_architectures.push_back(CPUArchitecture::X86);
         }
+        else if (supported_architectures.back() == CPUArchitecture::ARM64)
+        {
+            supported_architectures.push_back(CPUArchitecture::ARM);
+        }
+
+#if defined(_WIN32)
+        // On ARM32/64 Windows we can rely on x86 emulation
+        if (supported_architectures.front() == CPUArchitecture::ARM ||
+            supported_architectures.front() == CPUArchitecture::ARM64)
+        {
+            supported_architectures.push_back(CPUArchitecture::X86);
+        }
+#endif
 
         return supported_architectures;
     }

toolsrc/src/vcpkg/build.cpp

@@ -662,7 +662,7 @@ namespace vcpkg::Build
         std::vector<AbiEntry> abi_tag_entries(dependency_abis.begin(), dependency_abis.end());
 
         // Sorted here as the order of dependency_abis is the only
-        // non-deterministicly ordered set of AbiEntries
+        // non-deterministically ordered set of AbiEntries
         Util::sort(abi_tag_entries);
 
         // If there is an unusually large number of files in the port then