[many ports] Updates 2019.07.09 (#7217)

* [many ports] Upgrades 2019.07.11 * Re-generate patches and fix build errors. * [manyport]Fix build errors. * Fix avro-c and console-bridge failures, revert curl and tesseract * fix botan failure * Fix build errors and undo some ports upgrades. * [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors * Fix build errors. * [angle]Undo upgrade changes. * [directxtk]Fix UWP build error (#7233) * Revert leptonica since it cause tesseract failed * Revert jsonnet * [google-cloud-cpp] Disable parallel configure due to source directory writes * [many ports] Undo undesired changes * [bitsery] Fix indentation * [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff * fix console-bridge and remove usockets unused patch * update ogre patch * [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge. * [console-bridge] Fix export macro * [avro-c] Revert upgrade; split to #7875 * [avro-c] Complete previous revert
2024-11-23 11:19:43 +00:00 · 2019-08-24 13:43:57 -07:00 · 2019-08-24 13:43:57 -07:00 · 1550b9e71b
commit 1550b9e71b
parent 18a07faca5
125 changed files with 674 additions and 886 deletions
--- a/ports/args/CONTROL
+++ b/ports/args/CONTROL
@ -1,4 +1,4 @@
 Source: args
-Version: 2019-05-01
+Version: 2019-07-11
 Homepage: https://github.com/Taywee/args
 Description: A simple header-only C++ argument parser library.
--- a/ports/args/portfile.cmake
+++ b/ports/args/portfile.cmake
@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Taywee/args
-    REF 623e52cb128cfc572ad4e79de8d5f8861d13d017
-    SHA512 b951caed125fd937549db6702de8615eac0f380026ea4de5937721143b0929f5aa47ecc8068b7d9689822d303b25d6350f00a8e6346a53d51a0ea40872488533
+    REF 401663c1d57006566db6d8e5b37a21018fbd0bc3
+    SHA512 2e0506f41ee8527e7fb67c0b926ff892fafe79db90920624c84eb603e374eb74c5640e4d0d0d88554db7a57424095b0da96238b4182ac515ae96dc202df95013
    HEAD_REF master
 )

--- a/ports/asmjit/CONTROL
+++ b/ports/asmjit/CONTROL
@ -1,4 +1,4 @@
 Source: asmjit
-Version: 2019-03-29
+Version: 2019-07-11
 Homepage: https://github.com/asmjit/asmjit
 Description: Complete x86/x64 JIT and Remote Assembler for C++
--- a/ports/asmjit/portfile.cmake
+++ b/ports/asmjit/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO asmjit/asmjit
-  REF fc251c914e77cd079e58982cdab00a47539d7fc5
-  SHA512 3db4ed97ded545994ab2e75df5bb027832c3b7adf44bdabfb89a98af4cc51f5e48d4a353b9e99f205702258dfcec70257d6d6c08db78cec941019b3f8a48232a
+  REF 761130b1d8f32b5d3d612d285664fcfef5258149
+  SHA512 a86fd58ba0c8bc81ec575e86a9acdf4a11f2acc9c2facd2a0a8512cffa9ee6fc0bd877a1f33fb52f8f510eff1de654b45cd4f5f5a18c5252ecae22a92db6e93e
  HEAD_REF master
 )

--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@ -1,3 +1,3 @@
 Source: aws-c-common
-Version: 0.3.11-1
+Version: 0.4.1
 Description: AWS common library for C
--- a/ports/aws-c-common/disable-error-4068.patch
+++ b/ports/aws-c-common/disable-error-4068.patch
@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 263d34e..8c699b7 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
+ 
+if (WIN32)
+    add_compile_options(/wd4068)
+endif()
+
+ aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
+ 
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@ -1,11 +1,12 @@
 diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 5ceb11c..9d0aa12 100644
+index 0f597d7..1359b8b 100644
 --- a/cmake/AwsCFlags.cmake
 +++ b/cmake/AwsCFlags.cmake
-@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
-         # Disable unknown pragma warnings
-         list(APPEND AWS_C_FLAGS /wd4068)
- 
+@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
+         # /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
+         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
+         list(APPEND AWS_C_FLAGS /volatile:iso)
+-        
 -        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
 -        if(STATIC_CRT)
 -            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
@ -14,7 +15,6 @@ index 5ceb11c..9d0aa12 100644
 -        endif()
 -        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
 -        list(APPEND AWS_C_FLAGS "${_FLAGS}")
-
+ 
     else()
         list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
- 
--- a/ports/aws-c-common/fix-dependencey-build-error.patch
+++ b/ports/aws-c-common/fix-dependencey-build-error.patch
@ -1,13 +0,0 @@
-diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h
-index 545b06d..c579c82 100644
--- a/include/aws/common/byte_buf.h
-+++ b/include/aws/common/byte_buf.h
-@@ -21,6 +21,8 @@
- 
- #include <string.h>
- 
-+#pragma warning(disable: 4068)
-+
- /**
-  * Represents a length-delimited binary string or buffer. If byte buffer points
-  * to constant memory or memory that should otherwise not be freed by this
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@ -3,11 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO awslabs/aws-c-common
-    REF v0.3.11
-    SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750
+    REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
+    SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa
    HEAD_REF master
    PATCHES
-        fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure
+        disable-error-4068.patch # This patch fixes dependency port compilation failure
        disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
 )

--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@ -1,5 +1,5 @@
 Source: aws-sdk-cpp
-Version: 1.7.116
+Version: 1.7.142
 Homepage: https://github.com/aws/aws-sdk-cpp
 Description: AWS SDK for C++
 Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO aws/aws-sdk-cpp
-    REF 1.7.116
-    SHA512 2d10aebf1c10bb7e7a0efa1fd930b8743d9bce1d7d36f72c55fd13612be4fd30cf0a67ebe4f8d7c05146306084b10d8657ff26ac3bafaaa9efaa4c67707acb49
+    REF d3ee022fea02e8e7e02f3cdd77904dc4c39ab79a
+    SHA512 6f146830f15864bb3770ad50a6ebcbc478235e9c2c59aa044353bbfc297bf26437e07b77b970974cc294782809aaa837a3407cbc846426b04e97447cd7f9e3cf
    HEAD_REF master
 )

--- a/ports/bitsery/CONTROL
+++ b/ports/bitsery/CONTROL
@ -1,3 +1,3 @@
 Source: bitsery
-Version: 4.6.0
+Version: 5.0.0
 Description: Header only C++ binary serialization library
--- a/ports/bitsery/portfile.cmake
+++ b/ports/bitsery/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
 	OUT_SOURCE_PATH SOURCE_PATH
 	REPO fraillt/bitsery
-	REF v4.6.0
-	SHA512 519aec8730f4b6f8d26aff17d984101990ade02888664eb2c40bc1085e4dcffbbe83b08216149da234c8195d1940ec06744f16312f60e362f7005b205aa829a6
+	REF f85dff74151530fb05241877e3c80afab5891467
+	SHA512 27dc79e80224f1429fccbbff75d9562e19db60a50567cb66c7999587cbf4a0b8344e3865ec804c63d05e041377dcc30de6fdc5ddfb99c779894ddd811f0d4a71
 	HEAD_REF master
 	PATCHES fix-install-paths.patch
 )
--- a/ports/botan/CONTROL
+++ b/ports/botan/CONTROL
@ -1,4 +1,4 @@
 Source: botan
-Version: 2.9.0-2
+Version: 2.11.0
 Homepage: https://botan.randombit.net
 Description: A cryptography library written in C++11
--- a/ports/botan/fix-build_error.patch
+++ b/ports/botan/fix-build_error.patch
@ -1,25 +0,0 @@
-diff --git a/src/lib/utils/filesystem.cpp b/src/lib/utils/filesystem.cpp
-index 053c91e..8e0a271 100644
--- a/src/lib/utils/filesystem.cpp
-+++ b/src/lib/utils/filesystem.cpp
-@@ -9,8 +9,10 @@
- #include <botan/internal/filesystem.h>
- #include <algorithm>
- 
-+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
-+
- #if defined(BOTAN_TARGET_OS_HAS_STL_FILESYSTEM_MSVC) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
-  #include <filesystem>
-+  #include <experimental/filesystem>
- #elif defined(BOTAN_HAS_BOOST_FILESYSTEM)
-   #include <boost/filesystem.hpp>
- #elif defined(BOTAN_TARGET_OS_HAS_POSIX1)
-@@ -38,7 +40,7 @@ std::vector<std::string> impl_stl_filesystem(const std::string& dir)
- #if (_MSVC_LANG >= 201703L)
-    using namespace std::filesystem;
- #else
-   using namespace std::tr2::sys;
-+   using namespace std::experimental::filesystem;
- #endif
- 
-    std::vector<std::string> out;
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@ -1,15 +1,13 @@
 include(vcpkg_common_functions)

-set(BOTAN_VERSION 2.9.0)
+set(BOTAN_VERSION 2.11.0)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO randombit/botan
-    REF 0129d3172ec419beb90a2b3487f6385a35da0742
-    SHA512 a8328df5ad2693a96935d1d2202ddd6678a5ba9c63a8159acbe56f1c884fa5faaa71339e8f56284cfd00574a9b4f91bdb1fb22c36c8e899d9b4cbe881f4867d3
+    REF 16a726c3ad10316bd8d37b6118a5cc52894e8e8f
+    SHA512 3d759fb262d65f7d325a1e888f74cb1c372ef687b0fcc6fc6ba041b83e3dc65c2928b343c65a89e73ea00c09d11cdda3a161ca98dbabe426903c4cbaf030767c
    HEAD_REF master
-	PATCHES
-		fix-build_error.patch
 )

 if(CMAKE_HOST_WIN32)
--- a/ports/breakpad/CONTROL
+++ b/ports/breakpad/CONTROL
@ -1,5 +1,5 @@
 Source: breakpad
-Version: 2019-05-08
+Version: 2019-07-11
 Build-Depends: libdisasm
 Homepage: https://github.com/google/breakpad
 Description: a set of client and server components which implement a crash-reporting system.
--- a/ports/breakpad/portfile.cmake
+++ b/ports/breakpad/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO google/breakpad
-    REF 21b48a72aa50dde84149267f6b7402522b846b24
-    SHA512 4ca2f877871c0a79c24ce4cc592dddb3ac4c2eac2a5962dad6d3d94edc91ac82afec3d7e4e7f81e7d9916eb83f8708e66759c38a6ef0e1b2c19691dd1518558a
+    REF c46151db0ffd1a8dae914e45f1212ef427f61ed3
+    SHA512 bd9f247851a3caa6f36574c8a243c2a01cb1cf23c2266b6f6786b85c7418dba5937363c00184e26cda24225f96bb7aaeb08efd13d6a269a3b78c357c2eda7e14
    HEAD_REF master
 )

--- a/ports/chipmunk/CONTROL
+++ b/ports/chipmunk/CONTROL
@ -1,4 +1,4 @@
 Source: chipmunk
-Version: 7.0.2
+Version: 7.0.3
 Homepage: https://github.com/slembcke/Chipmunk2D
 Description: A fast and lightweight 2D game physics library.
--- a/ports/chipmunk/portfile.cmake
+++ b/ports/chipmunk/portfile.cmake
@ -23,13 +23,13 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO slembcke/Chipmunk2D
-    REF Chipmunk-7.0.2
-    SHA512 3a697a73f854b36c53ea99390878094e91a44a0c6a19ebb0cd6726474b9b4f219085944efba4a7ae6faec1def3b9d58a02f159bea15724a7f5235bb645b91dba
+    REF 87340c216bf97554dc552371bbdecf283f7c540e
+    SHA512 9094017755e9c140aa5bf8a1b5502077ae4fb2b0a3e12f1114e86d8591a6188f89822ecc578a2b5e95f61c555018f1b3273fe50e833fe2daf30e94b180a3d07c
    HEAD_REF master
 )

 vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/msvc/vc14/chipmunk/chipmunk.vcxproj
+    PROJECT_PATH ${SOURCE_PATH}/msvc/VS2015/chipmunk/chipmunk.vcxproj
    RELEASE_CONFIGURATION "Release${CHIPMUNK_CONFIGURATION_SUFFIX}"
    DEBUG_CONFIGURATION "Debug${CHIPMUNK_CONFIGURATION_SUFFIX}"
 )
@ -37,32 +37,32 @@ vcpkg_build_msbuild(
 message(STATUS "Installing")
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
    file(INSTALL
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
    )
    file(INSTALL
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.dll"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
        DESTINATION ${CURRENT_PACKAGES_DIR}/bin
    )
 else()
    file(INSTALL
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
    )
    file(INSTALL
-        "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
+        "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.pdb"
        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
    )
 endif()

 file(INSTALL
-    "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
+    "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Debug${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
 )
 file(INSTALL
-    "${SOURCE_PATH}/msvc/vc14/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
+    "${SOURCE_PATH}/msvc/VS2015/chipmunk/${CHIPMUNK_ARCH}/Release${CHIPMUNK_CONFIGURATION_SUFFIX}/chipmunk.lib"
    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
 )
 file(INSTALL
--- a/ports/console-bridge/CONTROL
+++ b/ports/console-bridge/CONTROL
@ -1,4 +1,4 @@
 Source: console-bridge
-Version: 0.3.2-4
+Version: 0.4.3-1
 Homepage: https://github.com/ros/console_bridge
 Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.
--- a/ports/console-bridge/portfile.cmake
+++ b/ports/console-bridge/portfile.cmake
@ -3,14 +3,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ros/console_bridge
-    REF 0.3.2
-    SHA512 41fa5340d7ba79c887ef73eb4fda7b438ed91febd224934ae4658697e4c9e43357207e1b3e191ecce3c97cb9a87b0556372832735a268261bc798cc7683aa207
+    REF f0b423c0c2d02651db1776c96887c0a314908063
+    SHA512 f022341f06c4edf564b94305b7ce279a7a2a61d0323a7ccf374598011909d86b0a9c514b4d41fd1d523baecc1c320d16a931a8f0fbb3a3e4950720f84f0472e6
    HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/static-macro.patch
+    PATCHES static-macro.patch
 )

 vcpkg_configure_cmake(
@ -36,10 +32,10 @@ string(SUBSTRING "${_contents}" 0 2000 license)
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/console-bridge)
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/console-bridge/copyright "${license}")

-file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge/exportdecl.h _contents)
+file(READ ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h _contents)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC" "if 1" _contents "${_contents}")
+    string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 1" _contents "${_contents}")
 else()
-    string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC" "if 0" _contents "${_contents}")
+    string(REPLACE "ifdef CONSOLE_BRIDGE_STATIC_DEFINE" "if 0" _contents "${_contents}")
 endif()
-file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge/exportdecl.h "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/console_bridge_export.h "${_contents}")
--- a/ports/coroutine/CONTROL
+++ b/ports/coroutine/CONTROL
@ -1,4 +1,4 @@
 Source: coroutine
-Version: 1.4.1-1
+Version: 1.4.3
 Build-Depends: ms-gsl
 Description: C++ coroutine helper/example library
--- a/ports/coroutine/portfile.cmake
+++ b/ports/coroutine/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO            luncliff/coroutine
-    REF             1.4.2
-    SHA512          fc2544116a5bee97b8ef1501fc7f1b805248f0a0c601111f1a317e813aa1d3f9a2e08ab1b140cc36e22d9c90249301110ec5b5e55a40fb39217cf5f40998920d
+    REF 74467cb470a6bf8b9559a56ebdcb68ff915d871e
+    SHA512 5d61a23c5fe33c544943659dedecff487bb20f288f9c99f137f37bb777317672f299599b740e53cae42c355595fdfdffe183ade39e828b1f3b4aa821a47cb50e
    HEAD_REF        master
 )

--- a/ports/crc32c/CONTROL
+++ b/ports/crc32c/CONTROL
@ -1,4 +1,4 @@
 Source: crc32c
-Version: 1.0.7-1
+Version: 1.1.0
 Homepage: https://github.com/google/crc32c
 Description: CRC32C implementation with support for CPU-specific acceleration instructions.
--- a/ports/crc32c/portfile.cmake
+++ b/ports/crc32c/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO google/crc32c
-  REF 1.0.7
-  SHA512 fe384ea15976b1317b7f6be3a447ae2cf25e0baa80f6c5e1231719a2af8863bc156b3d33156f24eca85504083730937f81fb624311d27e94ba3d2456bf3d34fa
+  REF 83c31e797274a5b26e9e4a5355ba394cd0cabc10
+  SHA512 829f8618c2769d274b400cf6de1dd2ab874d50d36e8cb086238aadae804154360b113faecd3c60e029a8d5ebc620d4b7cc7e1492775a4235d53989116227cd52
  HEAD_REF master
  PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch
 )
--- a/ports/cxxopts/fix-uwp-error.patch
+++ b/ports/cxxopts/fix-uwp-error.patch
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 440490b..0ceb003 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -54,6 +54,8 @@ endif()
+ 
+ add_library(cxxopts INTERFACE)
+ 
+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
+ # optionally, enable unicode support using the ICU library
+ set(CXXOPTS_USE_UNICODE_HELP FALSE CACHE BOOL "Use ICU Unicode library")
+ if(CXXOPTS_USE_UNICODE_HELP)
--- a/ports/cxxopts/portfile.cmake
+++ b/ports/cxxopts/portfile.cmake
@ -5,6 +5,8 @@ vcpkg_from_github(
    REF v2.2.0
    SHA512 9f5182b3a86b3d47d1ce5e1e222ab596fce59d3b2dcc0ab2c3802338d5e0f3e6556f2a5ff2accb32cae7e2db41ac5a361c93bf0256f9e44c316eaa4b47c19efa
    HEAD_REF master
+    PATCHES
+    fix-uwp-error.patch
 )

 vcpkg_configure_cmake(
--- a/ports/exprtk/CONTROL
+++ b/ports/exprtk/CONTROL
@ -1,4 +1,4 @@
 Source: exprtk
-Version: 2019-03-29
+Version: 2019-07-11
 Homepage: https://github.com/ArashPartow/exprtk
 Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.
--- a/ports/exprtk/portfile.cmake
+++ b/ports/exprtk/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ArashPartow/exprtk
-    REF 9fad72832c70348725c073e369a3321781001766
-    SHA512 6a2a4bdc331806bb5f97737316cc126ab5e8ec75626dd5a63e854a24b7ae41cddccfee8ea09168ed0d272a92dd89cfc9878507ecf70c3f03d5b4f5e53d877727
+    REF 7ccb123e9e79bc3df30a66c0bffe921d195702d7
+    SHA512 75b6adaa254060053f56e3978be3e10847c9dae22f675eae728cb0c7fd9a5e6fee8c8278764826e0e0be3bcb2cfd2288e091d0f965ac2e331403683f15764b92
 )

 file(COPY ${SOURCE_PATH}/exprtk.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/fastcdr/CONTROL
+++ b/ports/fastcdr/CONTROL
@ -1,3 +1,3 @@
 Source: fastcdr
-Version: 1.0.9-1
+Version: 1.0.10
 Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
--- a/ports/fastcdr/portfile.cmake
+++ b/ports/fastcdr/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO eProsima/Fast-CDR
-    REF v1.0.9
-    SHA512 2825e61fc4736c9364fc3130f649798cec11fcb56dc5e202c17731121ad8a2795f0fbf8acb5d8d662181bc470e7a3e95a5027283872714be505bb2562c2e2312
+    REF 649b9a0e763f8a4cfdd41238b1495c58b7ea6660
+    SHA512 9a72c60f59572ec95b320a44f10ba841cb66d3f71e4ebb2b8f00f42400ea9dd379d884937b047206cdeb19f7c298782b3557113b9fb6a1b79a3a9e3592cb1eb9
    HEAD_REF master
    PATCHES install-cmake.patch
 )
--- a/ports/fizz/CONTROL
+++ b/ports/fizz/CONTROL
@ -1,4 +1,4 @@
 Source: fizz
-Version: 2019.05.20.00-1
+Version: 2019.07.08.00
 Build-Depends: folly, openssl, libsodium, zlib
 Description: a TLS 1.3 implementation by Facebook
--- a/ports/fizz/portfile.cmake
+++ b/ports/fizz/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebookincubator/fizz
-    REF 6d26a1be8d7a20d8d89c374ee3dc5c452d18c18d
-    SHA512 bc6aa17a97fdfc53d0a247b876cbd1fea8214608b7e463dcf21e34df65015fe77e617c5a6c6bfa84b87e60e56b6aeb89aa2d8d774f97fc1f76f415869948a48a
+    REF 5a2cbf77381b2489ff636b836c26fde26a66cd7d
+    SHA512 6f6583dae05c95feb521396d932a263984f3b56c4ce18a672214ce5ece960cfb82203f7f6d23fa7b00dca62da640e4294f5f1cd6a6b0459d950c8997b71f3ce1
    HEAD_REF master
    PATCHES
        find-zlib.patch
--- a/ports/folly/CONTROL
+++ b/ports/folly/CONTROL
@ -1,5 +1,5 @@
 Source: folly
-Version: 2019.05.20.00-1
+Version: 2019.06.17.00
 Homepage: https://github.com/facebook/folly
 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
 Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@ -14,8 +14,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO facebook/folly
-    REF 354223ec1602913667c52cee1ce0782a82cb0cad
-    SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023
+    REF d12df6e924adc3889cd2fbeaca078355c5da170f
+    SHA512 ecb55cda91ab6db1519b612b676b5166454132960edce0a36f1b4e42f5e1a5f753d8bbb2ed93e34faed1025a54840eb4dc876a49c88b8dd9c90c8070dafc43b8
    HEAD_REF master
    PATCHES
        missing-include-atomic.patch
--- a/ports/glad/CONTROL
+++ b/ports/glad/CONTROL
@ -1,4 +1,4 @@
 Source: glad
-Version: 0.1.30
+Version: 0.1.31
 Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
 Build-Depends: egl-registry, opengl-registry
--- a/ports/glad/portfile.cmake
+++ b/ports/glad/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Dav1dde/glad
-    REF v0.1.30
-    SHA512 2db0f75e5859be039bf4dcbea239dd6d35bdc92e69912e807dfacdb01581c73b6a5eb0f0889f2ffcd705415abe5f28cf204b4010d08f5477b51c0ce3ae6a35b5
+    REF 1a42f8a6099c60f6a4522731fadad4191d64e6ff
+    SHA512 02870cf43b5ee33a733122885f748a1368e4487fc08f32ba376d6d53c0efd9ed6e9aea350b723d955869ed47b4d9d69235a52f01723215cf4393d6ca99e2ac00
    HEAD_REF master
 )

--- a/ports/gmmlib/CONTROL
+++ b/ports/gmmlib/CONTROL
@ -1,3 +1,3 @@
 Source: gmmlib
-Version: 19.1.2
+Version: 19.2.3
 Description: intel's graphics memory management library
--- a/ports/gmmlib/portfile.cmake
+++ b/ports/gmmlib/portfile.cmake
@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO intel/gmmlib
-    REF intel-gmmlib-19.1.2
-    SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
+    REF e834bcd677382fbebb7749ccbd678d86a82bffd3
+    SHA512 a22593d8d075db7af7fd9ffb6a4e0696e9fe25b73efa9b80e8513452581bdd0ceb6f400dd691e6d52edd72ea6f725066a454a829177d4987ccb4664e4c70ed4d
    HEAD_REF master
 )

--- a/ports/graphite2/CONTROL
+++ b/ports/graphite2/CONTROL
@ -1,5 +1,5 @@
 Source: graphite2
-Version: 1.3.12-1
+Version: 1.3.13
 Homepage: https://github.com/silnrsi/graphite
 Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
  Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
--- a/ports/graphite2/disable-tests.patch
+++ b/ports/graphite2/disable-tests.patch
@ -1,33 +1,45 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a4c648e..db90735 100644
+index 496712d..3df05c7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -80,11 +80,13 @@ if (BUILD_SHARED_LIBS)
- endif (BUILD_SHARED_LIBS)
+@@ -82,10 +82,12 @@ if (BUILD_SHARED_LIBS)
+ endif()
 
 add_subdirectory(src)
+-add_subdirectory(tests)
+-add_subdirectory(doc)
+-if (NOT GRAPHITE2_NFILEFACE)
+-    add_subdirectory(gr2fonttest)
 +if(NOT DISABLE_TESTS)
- add_subdirectory(tests)
- add_subdirectory(doc)
- if (NOT GRAPHITE2_NFILEFACE)
-     add_subdirectory(gr2fonttest)
- endif (NOT GRAPHITE2_NFILEFACE)
-+endif()
+    add_subdirectory(tests)
+    add_subdirectory(doc)
+    if (NOT GRAPHITE2_NFILEFACE)
+        add_subdirectory(gr2fonttest)
+    endif()
+ endif()
 
 set(version 3.0.1)
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 89a59af..c72be21 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -141,7 +141,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-         LINKER_LANGUAGE C)
-     target_link_libraries(graphite2 c)
-     include(Graphite)
-    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-+    if(NOT DISABLE_TESTS)
-+        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
-+    endif()
-     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-     CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 389cf5a..94b7f99 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -127,7 +127,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+         endif ()
+     endif()
+     include(Graphite)
+-    if (BUILD_SHARED_LIBS)
+    if (NOT DISABLE_TESTS)
+         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     endif ()
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+@@ -141,7 +141,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+         LINKER_LANGUAGE C)
+     target_link_libraries(graphite2 c)
+     include(Graphite)
+-    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+    if (NOT DISABLE_TESTS)
+        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+    endif ()
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+     CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif()
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO silnrsi/graphite
-    REF 1.3.12
-    SHA512 d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643
+    REF b45f9b271214b95f3b42e5c9863eae4b0bfb7fd7
+    SHA512 5bd1052c1e21ab523ce17804b7123858d17ca9893cbd972f0af58119c5419d771df13d374569a14dd82605536674d9b1a4787300eac4bd89a177a40df5a05282
    HEAD_REF master
    PATCHES disable-tests.patch
 )
--- a/ports/grpc/00005-fix-uwp-error.patch
+++ b/ports/grpc/00005-fix-uwp-error.patch
@ -0,0 +1,12 @@
+diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
+index eebf66b..6c6ee50 100644
+--- a/src/core/lib/slice/slice.cc
+++ b/src/core/lib/slice/slice.cc
+@@ -220,6 +220,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr<char> p,
+                                         size_t len) {
+   uint8_t* ptr = reinterpret_cast<uint8_t*>(p.get());
+   grpc_slice slice;
+  memset(&slice, 0, sizeof(grpc_slice));
+   if (len <= sizeof(slice.data.inlined.bytes)) {
+     slice.refcount = nullptr;
+     slice.data.inlined.length = len;
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@ -1,5 +1,5 @@
 Source: grpc
-Version: 1.21.1-1
+Version: 1.22.0
 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp)
 Homepage: https://github.com/grpc/grpc
 Description: An RPC library and framework
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@ -13,14 +13,15 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO grpc/grpc
-    REF 75475f090875e737ad6909a6057c59577f0c79b1
-    SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b
+    REF 08fd59f039c7cf62614ab7741b3f34527af103c7
+    SHA512 a1200e0df981f69f9831425a5187dcc843d9eadee1663150cd3aa10d388ae0693ac6aa57760d7047ce1e6c55a15339d1db2f1b6e25f84c76ad97e0b48706e2c4
    HEAD_REF master
    PATCHES
        00001-fix-uwp.patch
        00002-static-linking-in-linux.patch
        00003-undef-base64-macro.patch
        00004-link-gdi32-on-windows.patch
+        00005-fix-uwp-error.patch
 )

 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
--- a/ports/io2d/CONTROL
+++ b/ports/io2d/CONTROL
@ -1,4 +1,4 @@
 Source: io2d
-Version: 0.1-2
+Version: 2019-07-11
 Description: a lightweight, cross platform drawing library
 Build-Depends: cairo (!osx), graphicsmagick (!osx)
--- a/ports/io2d/portfile.cmake
+++ b/ports/io2d/portfile.cmake
@ -8,8 +8,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO cpp-io2d/P0267_RefImpl
-    REF 21ae92c8be6916034e6e18f08aa57899a975dfb0
-    SHA512 5b674f98ca7705d6901af339a4189d5ce4f2c3118bfb99430734f355159602f177bc8d1b345c3a2f17947a62547553f7b91747a1f16da063707a4da7f990391d
+    REF add3c9792dcd3f08c497ae3adafb2a3b5b5fc338
+    SHA512 2727342fbb31523583374ab6df6ff7542e80b4f94319cf0f293e8c085711fa10ed312b4fc4b91391112b5e27eaaae519cb4141ea9d4108ffb5b7383a043b38b8
    HEAD_REF master
    PATCHES find-package.patch
 )
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@ -1,5 +1,5 @@
 Source: libarchive
-Version: 3.3.3-3
+Version: 3.4.0
 Homepage: https://github.com/libarchive/libarchive
 Description: Library for reading and writing streaming archives
 Build-Depends: zlib
--- a/ports/libarchive/fix-buildsystem.patch
+++ b/ports/libarchive/fix-buildsystem.patch
@ -1,63 +1,62 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ca9d8f..61c3b2a 100644
+index bd80b12..6509541 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ IF (MSVC)
-   #                       result of an assignment.
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /we4706")
-   # /WX option is the same as gcc's -Werror option.
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX") <- breaks x64-debug
-   # /Oi option enables built-in functions.
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Oi")
+@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
+   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
+ ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
+ IF (MSVC)
+-  if (ENABLE_WERROR)
+-    # /WX option is the same as gcc's -Werror option.
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+-  endif ()
   #################################################################
-@@ -359,7 +359,7 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+   # Set compile flags for debug build.
+   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
+@@ -377,8 +373,6 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
+   # Maybe DLL path is "C:/Program Files/GnuWin32/bin".
   # The zlib and the bzip2 Setup program have installed programs and DLLs into
   # "C:/Program Files/GnuWin32" by default.
-   # This is convenience setting for Windows.
+-  # This is convenience setting for Windows.
 -  SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH))
-+  #SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH))
   #
   # If you didn't use Setup program or installed into nonstandard path,
   # cmake cannot find out your zlib or bzip2 libraries and include files,
-@@ -399,11 +399,12 @@ IF(ZLIB_FOUND)
-     #
-     # Test if ZLIB_WINAPI macro is needed to use.
-     #
+@@ -415,14 +409,7 @@ IF(ZLIB_FOUND)
+   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
+   IF(WIN32 AND NOT CYGWIN)
+-    #
+-    # Test if ZLIB_WINAPI macro is needed to use.
+-    #
 -    TRY_MACRO_FOR_LIBRARY(
 -      "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
 -      RUNS
 -      "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
 -      ZLIB_WINAPI)
 +    SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box
-+    #TRY_MACRO_FOR_LIBRARY(
-+    #  "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
-+    #  RUNS
-+    #  "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+    #  ZLIB_WINAPI)
     IF(ZLIB_WINAPI)
       ADD_DEFINITIONS(-DZLIB_WINAPI)
     ELSE(ZLIB_WINAPI)
-@@ -462,8 +463,6 @@ ENDIF()
- IF(LIBLZMA_FOUND)
+@@ -482,8 +469,6 @@ IF(LIBLZMA_FOUND)
   SET(HAVE_LIBLZMA 1)
   SET(HAVE_LZMA_H 1)
+   CMAKE_PUSH_CHECK_STATE()
 -  SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
 -  SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
   INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
   LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
   # Test if a macro is needed for the library.
-@@ -1227,7 +1226,8 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
+@@ -1327,7 +1312,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
 CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
 CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
 CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
 -CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
-+#CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
 +set(HAVE_MEMMOVE 1)
 CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
 CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
 CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
-@@ -1258,11 +1258,16 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
+@@ -1359,11 +1344,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
 CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
 CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
 CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
@ -66,20 +65,15 @@ index 1ca9d8f..61c3b2a 100644
 -CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 -CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 -CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
 +set(HAVE_WCRTOMB 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
 +set(HAVE_WCSCMP 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
 +set(HAVE_WCSCPY 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
 +set(HAVE_WCSLEN 1)
-+#CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
 +set(HAVE_WCTOMB 1)
 CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
 CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
 CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
-@@ -1274,10 +1279,14 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
+@@ -1375,10 +1360,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
 CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
 CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
 CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
@ -87,18 +81,14 @@ index 1ca9d8f..61c3b2a 100644
 -CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 -CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
 -CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
-+#CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
 +set(HAVE_VPRINTF 1)
-+#CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
 +set(HAVE_WMEMCMP 1)
-+#CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
 +set(HAVE_WMEMCPY 1)
-+#CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
 +set(HAVE_WMEMMOVE 1)
 
 CMAKE_POP_CHECK_STATE()	# Restore the state of the variables
 
-@@ -1314,9 +1323,13 @@ CHECK_C_SOURCE_COMPILES(
+@@ -1419,9 +1404,13 @@ CHECK_C_SOURCE_COMPILES(
   "#include <sys/sysmacros.h>\nint main() { return major(256); }"
   MAJOR_IN_SYSMACROS)
 
@ -112,32 +102,32 @@ index 1ca9d8f..61c3b2a 100644
 
 IF(HAVE_STRERROR_R)
   SET(HAVE_DECL_STRERROR_R 1)
-@@ -1689,12 +1702,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+@@ -1977,13 +1966,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
+ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
- # Handle generation of the libarchive.pc file for pkg-config
+-# Handle generation of the libarchive.pc file for pkg-config
 -INCLUDE(CreatePkgConfigFile)
-+#INCLUDE(CreatePkgConfigFile)
- 
+-
 #
 # Register installation of PDF documents.
 #
 -IF(WIN32 AND NOT CYGWIN)
-+IF(0 AND WIN32 AND NOT CYGWIN)
+IF(0)
   #
   # On Windows platform, It's better that we install PDF documents
   # on one's computer.
 diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
-index 1f85c01..11b2fb1 100644
+index ec775bb..d63ac7c 100644
 --- a/libarchive/CMakeLists.txt
 +++ b/libarchive/CMakeLists.txt
-@@ -210,28 +210,22 @@ IF(WIN32 AND NOT CYGWIN)
-   LIST(APPEND libarchive_SOURCES archive_disk_acl_sunos.c)
+@@ -235,28 +235,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
 ENDIF()
 
-# Libarchive is a shared library
+ # Libarchive is a shared library
 -ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
 +ADD_LIBRARY(archive ${libarchive_SOURCES} ${include_HEADERS})
+ TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
 TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
 -SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
 -
@ -146,9 +136,9 @@ index 1f85c01..11b2fb1 100644
 -TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
 -SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
 +IF(BUILD_SHARED_LIBS)
-+    SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
+  SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
 +ELSE()
-+    SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS
+  SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS
   LIBARCHIVE_STATIC)
 -# On Posix systems, libarchive.so and libarchive.a can co-exist.
 -IF(NOT WIN32 OR CYGWIN)
@ -164,7 +154,6 @@ index 1f85c01..11b2fb1 100644
           LIBRARY DESTINATION lib
           ARCHIVE DESTINATION lib)
 -  INSTALL_MAN(${libarchive_MANS})
-+  #INSTALL_MAN(${libarchive_MANS})
   INSTALL(FILES ${include_HEADERS} DESTINATION include)
 ENDIF()
 
--- a/ports/libarchive/no-werror.patch
+++ b/ports/libarchive/no-werror.patch
@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 745dc29..820c56f 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
-   #################################################################
-   # Set compile flags for debug build.
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
-@@ -112,7 +112,7 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^Clang$")
-   # Set compile flags for debug build.
-   # This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-+  #SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wextra")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wunused")
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wshadow")
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@ -7,14 +7,13 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libarchive/libarchive
-    REF v3.3.3
-    SHA512 10063764b610c0c966ba0177cac0d2cb781e297a45545cc8a587741513089af26f40769670894c86e7985b73c47e9cb985253bc3bef3a12fa83fe2a6a30acb6d
+    REF 614110e76d9dbb9ed3e159a71cbd75fa3b23efe3
+    SHA512 8feac2c0e22e5b7c05f3be97c774ad82d39bdea4b3fa3a2b297b85f8a5a9f548c528ef63f5495afd42fb75759e03a4108f3831b27103f899f8fe4ef7e8e2d1cf
    HEAD_REF master
    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-dependencies.patch
-        ${CMAKE_CURRENT_LIST_DIR}/fix-lz4.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch
+        fix-buildsystem.patch
+        fix-dependencies.patch
+        fix-lz4.patch
 )

 set(BUILD_libarchive_bzip2 OFF)
@ -69,7 +68,9 @@ vcpkg_configure_cmake(
        -DENABLE_ACL=OFF
        -DENABLE_TEST=OFF
        -DENABLE_ICONV=OFF
-        -DPOSIX_REGEX_LIB=NONE)
+        -DPOSIX_REGEX_LIB=NONE
+        -DENABLE_WERROR=OFF
+)

 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
--- a/ports/libpqxx/CONTROL
+++ b/ports/libpqxx/CONTROL
@ -1,5 +1,5 @@
 Source: libpqxx
-Version: 6.4.4
+Version: 6.4.5
 Homepage: https://github.com/jtv/libpqxx
 Description: The official C++ client API for PostgreSQL
 Build-Depends: libpq
--- a/ports/libpqxx/portfile.cmake
+++ b/ports/libpqxx/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO jtv/libpqxx
-    REF 6.4.4
-    SHA512 a168dbc7af210c711fa9f0f6e20d9d3abea167d412a642f591b104a109f11f4c262a27b6919340d405400a58baf7bcc663f7d3ec1b4ecd03f0a4b6c2960b5099
+    REF a6b1d60e74c1427c8ac2324b85cd4a0dc2068332
+    SHA512 990083f738322283dc9c98b138a676e5ba04ab77794d5a51d672557e0562d2366b5085ad5571dd91af8ba4dea56baa94e8c1e4e6fe571341c95e92eb28d2b15a
    HEAD_REF master
 	PATCHES
 		fix-deprecated-bug.patch
--- a/ports/libssh2/CONTROL
+++ b/ports/libssh2/CONTROL
@ -1,5 +1,5 @@
 Source: libssh2
-Version: 1.8.2
+Version: 1.9.0
 Build-Depends: zlib, openssl
 Homepage: https://www.libssh2.org
 Description: The SSH library
--- a/ports/libssh2/portfile.cmake
+++ b/ports/libssh2/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libssh2/libssh2
-    REF libssh2-1.8.2
-    SHA512 f676f8c2d1c66cd086ad5a1d328e3eb3a033afd4511577451c5664a4e0c4c1ea006fa1885f332fb2b3842b2eb30456322efdd2abf97c2f148c2be0d53e3e5624
+    REF 42d37aa63129a1b2644bf6495198923534322d64
+    SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231
    HEAD_REF master
    PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch"
 )
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@ -1,4 +1,4 @@
 Source: libuv
-Version: 1.29.1
+Version: 1.30.1
 Homepage: https://github.com/libuv/libuv
 Description: libuv is a multi-platform support library with a focus on asynchronous I/O.
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libuv/libuv
-    REF d16e6094e1eb3b0b5981ef1dd7e03ec4d466944d
-    SHA512 338d25fec26ab69d300141086de825edabc5e65c50b6d9cf0e2f8f1937a930e4ecf4460ba2789cef64a85ad4a63c9b5f2a482ee2498c542f73e5915bbff6170f
+    REF 1551969c84c2f546a429dac169c7fdac3e38115e
+    SHA512 86ad8223c2ec6815e009f5070766e7fc626a6249892a097aafbd45d0ac7c6ef2a38c7db45404ebd5c7648d406172b9236c115a2f1f15eaf735ff60e45bfe9bdd
    HEAD_REF v1.x
 )

--- a/ports/luabridge/CONTROL
+++ b/ports/luabridge/CONTROL
@ -1,3 +1,3 @@
 Source: luabridge
-Version: 2.3.1
+Version: 2.3.2
 Description: A lightweight, dependency-free library for binding Lua to C++
--- a/ports/luabridge/portfile.cmake
+++ b/ports/luabridge/portfile.cmake
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO vinniefalco/LuaBridge
-    REF 2.3.1
-    SHA512 6478410ec5863f40087f023a68c585b4c84974aa27dd522552094f6c823bee9820edc77685a9932b5d7d74f26cced4d624810dbfbaa3694f55c0b7803d2d5216
+    REF b6f17446265865e0ba06bea4d8e328eebfa2b9f0
+    SHA512 a422489826ae7047a794948b315f1f9abf8a3201da1d2bf31212a0fd24f47e7a86f17803b1dc678dfc1e0f6724c8e5333bea1a5c7d1e4814e59604cebaa311da
    HEAD_REF master
 )

--- a/ports/matio/CONTROL
+++ b/ports/matio/CONTROL
@ -1,5 +1,5 @@
 Source: matio
-Version: 1.5.15
+Version: 1.5.16
 Homepage: https://github.com/tbeu/matio
 Description: MATLAB MAT File I/O Library
 Build-Depends: zlib, hdf5
--- a/ports/matio/portfile.cmake
+++ b/ports/matio/portfile.cmake
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO tbeu/matio
-    REF v1.5.15
-    SHA512 5e80aef3e929ff306810861ba14bc82bdd9cb3090de60dbd6905cfa35706d8cbe6c40471e8abf41e5d0836c10083c359449d34bdf32c6b2022a73986e8303eb3
+    REF fabac6cf3ab36dbb82bff747aa99016d7759ccc3
+    SHA512 5aa77bced72e23b69692e28ff181f8a08ade25e356cf1ca327cf61c8a3f8f4a468e907090deae104ecff28f997806a8605168b034121f1d8c0a125b750911e83
    HEAD_REF master
 )

--- a/ports/mosquitto/CONTROL
+++ b/ports/mosquitto/CONTROL
@ -1,5 +1,5 @@
 Source: mosquitto
-Version: 1.6.2-2
+Version: 1.6.3
 Build-Depends: c-ares, libwebsockets, openssl, pthreads
 Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
  MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO eclipse/mosquitto
-    REF f825d4bb5e9f4fc5dc62ad09f895c87800d0f579
-    SHA512 cd94236d5673f7e5a992d1e866afe2ccb496dfb7cc24e53808caed603bc8e899ca12857a16eac58ac7ab7235a849b6e2528c55e0debf651ef76dcebef75e7df9
+    REF be73f792008904c5edcba9a2c17dcb23620edb09
+    SHA512 b6fffffc5363c6242487619d920b34f68389dd0a18313733266e0723773af9b92a481bf6fabe6e9ca82e30ea08895822d9cfbf33c2309c1f213c951983e6d129
    HEAD_REF master
    PATCHES
        archive-dest.patch
--- a/ports/ms-gsl/CONTROL
+++ b/ports/ms-gsl/CONTROL
@ -1,4 +1,4 @@
 Source: ms-gsl
-Version: 2019-04-19
+Version: 2019-07-11
 Homepage: https://github.com/Microsoft/GSL
 Description: Microsoft implementation of the Guidelines Support Library
--- a/ports/ms-gsl/portfile.cmake
+++ b/ports/ms-gsl/portfile.cmake
@ -4,8 +4,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO Microsoft/GSL
-    REF b74b286d5e333561b0f1ef1abd18de2606624455
-    SHA512 5d2d9812fab638228eb8802df21d271bd94321f6174f1fa15a3d3a60dc742cdce1ee0701f2096625cca13df934b0d2511f9b4fcc0913780de234ac76403f2482
+    REF 1212beae777dba02c230ece8c0c0ec12790047ea
+    SHA512 754d0adf32cea1da759be9adb8a64c301ae1cb8556853411bcea4c400079e8e310f1fb8d03f1f26f81553eab24b75fea24a67b9b51d8d92bb4f266e155938230
    HEAD_REF master
 )

--- a/ports/nmslib/CONTROL
+++ b/ports/nmslib/CONTROL
@ -1,5 +1,5 @@
 Source: nmslib
-Version: 1.7.3.6-1
+Version: 1.8.1
 Homepage: https://github.com/searchivarius/nmslib
 Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.
 #
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO nmslib/nmslib
-    REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8
-    SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd
+    REF c9fc0b862f09260b558cf81e94e0d58aca15d9e9
+    SHA512 ac9c79e3ac991dd58f239f7e0b2bd6c3185907aa283bc42098aadddac87b361867f002664cc14853822f92a491d95269578bea01aa00477e39a40424320000a1
    HEAD_REF master
 )

--- a/ports/nuklear/CONTROL
+++ b/ports/nuklear/CONTROL
@ -1,4 +1,4 @@
 Source: nuklear
-Version: 2019-03-29
+Version: 2019-07-11
 Homepage: https://github.com/vurtun/nuklear
 Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain
--- a/ports/nuklear/portfile.cmake
+++ b/ports/nuklear/portfile.cmake
@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO vurtun/nuklear
-    REF 509c75b086351e82865f26a507235b60a63e1538
-    SHA512 d86fe93a8da8db955ccd28b353c19ea92aeb54efcf7a47ca160a576f4d52dbedc3abf7d547387a066851928c4f43c961b1daff097b3677a118c89f247042336a
+    REF 5fa99df235e50aef82e7757002099ead7a1395fe
+    SHA512 d0be03e891e4efbc54ef97e2fd8721071227b8aed17d4a57cc4aab4023975f7bf33710a864041a60d2375e3eb8f65cb2ea6255d83db874dcd21e0450ff2f5e5c
    HEAD_REF master
 )
 file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
--- a/ports/ogre/CONTROL
+++ b/ports/ogre/CONTROL
@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.12.0-2
+Version: 1.12.1
 Build-Depends: freeimage, freetype, zlib, zziplib
 Homepage: https://github.com/OGRECave/ogre
 Description: 3D Object-Oriented Graphics Rendering Engine
--- a/ports/ogre/portfile.cmake
+++ b/ports/ogre/portfile.cmake
@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO OGRECave/ogre
-    REF c14f8847f743f4dc1b3abc947b1725c87d8b10ce
-    SHA512 a2fd7ffd653c1578bc860b58cf4c899f27cc967f75e2254dc3e372044f118d5951e42b35bfc711aa8996e1885f372d3cfa5a768b8674e0b3d844811990eb87fc
+    REF 8083067c1835147de5d82015347d95c710e36bc0
+    SHA512 0690aaff0bea74c38598894939396cab8077b84bda166deb4790fba87566114bc5267660e8efc4de9babeb1b8bddf73530e1a1dbbc63c7e24b14bc012b033bc8
    HEAD_REF master
    PATCHES
        toolchain_fixes.patch
--- a/ports/ogre/toolchain_fixes.patch
+++ b/ports/ogre/toolchain_fixes.patch
@ -1,101 +1,49 @@
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
-index a7a3796..7e41f57 100755
+index a7a3796..2e21403 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
-@@ -13,13 +13,15 @@
+@@ -13,10 +13,12 @@
 # directory, but can also be used for custom projects.
 #############################################################
 
+-if(WIN32 OR APPLE)
+-	set(OGRE_CMAKE_DIR "CMake")
+-else()
+-	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
 +if(NOT DEFINED OGRE_CMAKE_DIR)
- if(WIN32 OR APPLE)
- 	set(OGRE_CMAKE_DIR "CMake")
- else()
- 	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
- endif()
-+endif()
- 
-set(INST_FILES Utils/FindPkgMacros.cmake) 
-+set(INST_FILES Utils/FindPkgMacros.cmake)
- 
- if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco")
-   set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake)
-diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
-index 26c384f..131e238 100644
--- a/CMake/ConfigureBuild.cmake
-+++ b/CMake/ConfigureBuild.cmake
-@@ -68,7 +68,7 @@ if (OGRE_CONFIG_THREADS)
- 
+  if(WIN32 OR APPLE)
+    set(OGRE_CMAKE_DIR "CMake")
+  else()
+    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
+  endif()
 endif()
 
-set(OGRE_ASSERT_MODE 1 CACHE STRING 
-+set(OGRE_ASSERT_MODE 1 CACHE STRING
- 	"Enable Ogre asserts and exceptions. Possible values:
- 	0 - Standard asserts in debug builds, nothing in release builds.
- 	1 - Standard asserts in debug builds, exceptions in release builds.
-@@ -197,7 +197,7 @@ if (UNIX)
-     configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc @ONLY)
-     install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/OGRE-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
-   endif ()
-  
-+
-   if (OGRE_BUILD_COMPONENT_TERRAIN)
-     if (OGRE_BUILD_COMPONENT_PAGING)
-       set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}")
+ set(INST_FILES Utils/FindPkgMacros.cmake) 
 diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
-index 783755e..bd7fd3d 100644
+index 783755e..79f7514 100644
 --- a/CMake/InstallResources.cmake
 +++ b/CMake/InstallResources.cmake
-@@ -131,7 +131,7 @@ configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${PROJECT_BINARY_DIR}/inst/bin
- 
- 
- # install resource files
-install(FILES 
-+install(FILES
-   ${PROJECT_BINARY_DIR}/inst/bin/resources.cfg
-   ${PROJECT_BINARY_DIR}/inst/bin/plugins.cfg
-   ${PROJECT_BINARY_DIR}/inst/bin/samples.cfg
-@@ -208,17 +208,19 @@ endif ()
+@@ -208,10 +208,12 @@ endif ()
 # Create the CMake package files
 include(CMakePackageConfigHelpers)
 
+-if(WIN32 OR APPLE)
+-  set(OGRE_CMAKE_DIR "CMake")
+-else()
+-  set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
 +if(NOT DEFINED OGRE_CMAKE_DIR)
- if(WIN32 OR APPLE)
-   set(OGRE_CMAKE_DIR "CMake")
- else()
-   set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
+  if(WIN32 OR APPLE)
+    set(OGRE_CMAKE_DIR "CMake")
+  else()
+    set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
+  endif()
 endif()
-+endif()
 configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
     INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
-     PATH_VARS CMAKE_INSTALL_PREFIX)
- write_basic_package_version_file(
-    ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake 
-    VERSION ${OGRE_VERSION} 
-+    ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake
-+    VERSION ${OGRE_VERSION}
-     COMPATIBILITY SameMajorVersion)
- install(FILES
-    ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
-@@ -228,4 +230,4 @@ install(FILES
- install(EXPORT OgreTargetsRelease CONFIGURATIONS Release None "" DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
- install(EXPORT OgreTargetsRelWithDebInfo CONFIGURATIONS RelWithDebInfo DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
- install(EXPORT OgreTargetsMinSizeRel CONFIGURATIONS MinSizeRel DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
-install(EXPORT OgreTargetsDebug CONFIGURATIONS Debug DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
-\ No newline at end of file
-+install(EXPORT OgreTargetsDebug CONFIGURATIONS Debug DESTINATION ${OGRE_CMAKE_DIR} FILE OgreTargets.cmake)
 diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake
-index 4501cf9..e91bfd0 100644
+index 4501cf9..7eb57c3 100644
 --- a/CMake/Packages/FindCg.cmake
 +++ b/CMake/Packages/FindCg.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  Cg_FOUND - system has Cg
-#  Cg_INCLUDE_DIRS - the Cg include directories 
-+#  Cg_INCLUDE_DIRS - the Cg include directories
- #  Cg_LIBRARIES - link these to use Cg
- 
- include(FindPkgMacros)
@@ -56,7 +56,7 @@ endif()
 
 find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
@ -106,19 +54,10 @@ index 4501cf9..e91bfd0 100644
 if (WIN32)
 	if (CMAKE_CL_64)
 diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake
-index 7c89ec5..445d86a 100644
+index 7c89ec5..d8314f0 100644
 --- a/CMake/Packages/FindFreeImage.cmake
 +++ b/CMake/Packages/FindFreeImage.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  FreeImage_FOUND - system has FreeImage
-#  FreeImage_INCLUDE_DIRS - the FreeImage include directories 
-+#  FreeImage_INCLUDE_DIRS - the FreeImage include directories
- #  FreeImage_LIBRARIES - link these to use FreeImage
- 
- include(FindPkgMacros)
-@@ -43,7 +43,6 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
+@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P
 find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
 find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
 
@ -126,21 +65,12 @@ index 7c89ec5..445d86a 100644
 +make_library_set(FreeImage)
 
 findpkg_finish(FreeImage)
-
+ 
 diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake
-index dd4b179..8e51d2f 100644
+index dd4b179..6f158fc 100644
 --- a/CMake/Packages/FindGLSLOptimizer.cmake
 +++ b/CMake/Packages/FindGLSLOptimizer.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  GLSL_Optimizer_FOUND - system has GLSL_Optimizer
-#  GLSL_Optimizer_INCLUDE_DIRS - the GLSL_Optimizer include directories 
-+#  GLSL_Optimizer_INCLUDE_DIRS - the GLSL_Optimizer include directories
- #  GLSL_Optimizer_LIBRARIES - link these to use GLSL_Optimizer
- 
- include(FindPkgMacros)
-@@ -38,8 +38,7 @@ findpkg_framework(GLSL_Optimizer)
+@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer)
 find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer)
 find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
 find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
@ -149,21 +79,11 @@ index dd4b179..8e51d2f 100644
 
 findpkg_finish(GLSL_Optimizer)
 add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR)
-
 diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake
-index 7125895..f73c928 100644
+index 7125895..13a306f 100644
 --- a/CMake/Packages/FindHLSL2GLSL.cmake
 +++ b/CMake/Packages/FindHLSL2GLSL.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  HLSL2GLSL_FOUND - system has HLSL2GLSL
-#  HLSL2GLSL_INCLUDE_DIRS - the HLSL2GLSL include directories 
-+#  HLSL2GLSL_INCLUDE_DIRS - the HLSL2GLSL include directories
- #  HLSL2GLSL_LIBRARIES - link these to use HLSL2GLSL
- 
- include(FindPkgMacros)
-@@ -38,8 +38,7 @@ findpkg_framework(HLSL2GLSL)
+@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL)
 find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL)
 find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
 find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug)
@ -172,55 +92,24 @@ index 7125895..f73c928 100644
 
 findpkg_finish(HLSL2GLSL)
 add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR)
-
 diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake
-index 2b9deba..6d8fb37 100644
+index 2b9deba..f33a298 100644
 --- a/CMake/Packages/FindNVAPI.cmake
 +++ b/CMake/Packages/FindNVAPI.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  NVAPI_FOUND - system has NVAPI
-#  NVAPI_INCLUDE_DIRS - the NVAPI include directories 
-+#  NVAPI_INCLUDE_DIRS - the NVAPI include directories
- #  NVAPI_LIBRARIES - link these to use NVAPI
- 
- include(FindPkgMacros)
@@ -44,7 +44,7 @@ findpkg_framework(NVAPI)
- find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
- find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
- find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
-make_library_set(NVAPI_LIBRARY)
-+make_library_set(NVAPI)
- 
- findpkg_finish(NVAPI)
-add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
+ find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI)
+ find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
+ find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
+-make_library_set(NVAPI_LIBRARY)
+make_library_set(NVAPI)
+ 
+ findpkg_finish(NVAPI)
+ add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
 \ No newline at end of file
-+add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR)
 diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake
-index 6b6d7fa..c2cb80e 100644
+index 6b6d7fa..3667b8b 100644
 --- a/CMake/Packages/FindPOCO.cmake
 +++ b/CMake/Packages/FindPOCO.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  POCO_FOUND - system has POCO
-#  POCO_INCLUDE_DIRS - the POCO include directories 
-+#  POCO_INCLUDE_DIRS - the POCO include directories
- #  POCO_LIBRARIES - link these to use POCO
- 
- include(FindPkgMacros)
-@@ -23,8 +23,8 @@ getenv_path(POCO_ROOT)
- getenv_path(POCO_BASE)
- 
- # construct search paths
-set(POCO_PREFIX_PATH 
-  ${POCO_HOME} ${ENV_POCO_HOME} 
-+set(POCO_PREFIX_PATH
-+  ${POCO_HOME} ${ENV_POCO_HOME}
-   ${POCO_ROOT} ${ENV_POCO_ROOT}
-   ${POCO_BASE} ${ENV_POCO_BASE}
- )
@@ -50,7 +50,7 @@ findpkg_framework(POCO)
 find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
 find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
@ -257,52 +146,18 @@ index 6b6d7fa..c2cb80e 100644
 findpkg_finish(POCO_NetSSL)
 
 # Look for Poco's XML package
-@@ -96,6 +96,5 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
+@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES)
 find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
 find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
 find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
 -make_library_set(POCO_XML_LIBRARY)
 +make_library_set(POCO_XML)
 findpkg_finish(POCO_XML)
-
+ 
 diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake
-index 0c48510..7f0c8f6 100644
+index 0c48510..c121966 100644
 --- a/CMake/Packages/FindTBB.cmake
 +++ b/CMake/Packages/FindTBB.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  TBB_FOUND - system has TBB
-#  TBB_INCLUDE_DIRS - the TBB include directories 
-+#  TBB_INCLUDE_DIRS - the TBB include directories
- #  TBB_LIBRARIES - link these to use TBB
- 
- include(FindPkgMacros)
-@@ -23,8 +23,8 @@ getenv_path(TBB_ROOT)
- getenv_path(TBB_BASE)
- 
- # construct search paths
-set(TBB_PREFIX_PATH 
-  ${TBB_HOME} ${ENV_TBB_HOME} 
-+set(TBB_PREFIX_PATH
-+  ${TBB_HOME} ${ENV_TBB_HOME}
-   ${TBB_ROOT} ${ENV_TBB_ROOT}
-   ${TBB_BASE} ${ENV_TBB_BASE}
- )
-@@ -68,11 +68,11 @@ if (WIN32 AND MSVC)
-   endif ()
-   if (MSVC_VERSION EQUAL 1900)
-     set(COMPILER_PREFIX "vc13")
-  endif ()  
-+  endif ()
-   if (MSVC_VERSION EQUAL 1911)
-     set(COMPILER_PREFIX "vc14")
-   endif ()
-  
-+
-   # for each prefix path, add ia32/64\${COMPILER_PREFIX}\lib to the lib search path
-   foreach (dir ${TBB_PREFIX_PATH})
-     if (CMAKE_CL_64)
@@ -104,7 +104,7 @@ findpkg_framework(TBB)
 find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS})
 find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS})
@ -329,19 +184,10 @@ index 0c48510..7f0c8f6 100644
 +make_library_set(TBB_MALLOC_PROXY)
 findpkg_finish(TBB_MALLOC_PROXY)
 diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake
-index e97951e..1c7cf00 100644
+index e97951e..54c2567 100644
 --- a/CMake/Packages/FindZZip.cmake
 +++ b/CMake/Packages/FindZZip.cmake
-@@ -11,7 +11,7 @@
- # Once done, this will define
- #
- #  ZZip_FOUND - system has ZZip
-#  ZZip_INCLUDE_DIRS - the ZZip include directories 
-+#  ZZip_INCLUDE_DIRS - the ZZip include directories
- #  ZZip_LIBRARIES - link these to use ZZip
- 
- include(FindPkgMacros)
-@@ -39,12 +39,11 @@ use_pkgconfig(ZZip_PKGC zziplib)
+@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib)
 
 findpkg_framework(ZZip)
 
@ -355,66 +201,6 @@ index e97951e..1c7cf00 100644
 +make_library_set(ZZip)
 
 findpkg_finish(ZZip)
-
-diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in
-index 79c5394..7b22a0d 100644
--- a/CMake/Templates/OGREConfig.cmake.in
-+++ b/CMake/Templates/OGREConfig.cmake.in
-@@ -10,12 +10,12 @@
- # Find OGRE includes and library
- #
- # This module defines
-#  OGRE_INCLUDE_DIRS - the OGRE include directories 
-+#  OGRE_INCLUDE_DIRS - the OGRE include directories
- #  OGRE_LIBRARIES - link these to use the OGRE
- #  OGRE_LIBRARY_DIRS, the location of the libraries
- #  OGRE_STATIC - whther ogre was build as static lib
- #  OGRE_${COMPONENT}_FOUND - ${COMPONENT} is available
-#  OGRE_${COMPONENT}_LIBRARIES - link these to only use ${COMPONENT} 
-+#  OGRE_${COMPONENT}_LIBRARIES - link these to only use ${COMPONENT}
- #  OGRE_PLUGIN_DIR - The directory where the OGRE plugins are located
- #  OGRE_MEDIA_DIR - The directory where the OGRE sample media is located
- #  OGRE_CONFIG_DIR - The directory where the OGRE config files are located
-@@ -25,7 +25,7 @@
- set(OGRE_STATIC @OGRE_STATIC@)
- set(OGRE_MEDIA_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/@OGRE_MEDIA_PATH@")
- set(OGRE_PLUGIN_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/lib/OGRE")
-set(OGRE_CONFIG_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/@OGRE_CFG_INSTALL_PATH@") 
-+set(OGRE_CONFIG_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/@OGRE_CFG_INSTALL_PATH@")
- 
- set(OGRE_PREFIX_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@")
- get_filename_component(OGRE_LIBRARY_DIRS "${OGRE_PREFIX_DIR}/lib" ABSOLUTE)
-@@ -47,7 +47,7 @@ set(OGRE_PLUGINS)
- macro(ogre_declare_component COMPONENT)
-     set(OGRE_${COMPONENT}_FOUND TRUE)
-     set(OGRE_${COMPONENT}_LIBRARIES Ogre${COMPONENT}) # backwards compatibility
-    
-+
-     list(APPEND OGRE_COMPONENTS ${COMPONENT})
-     list(APPEND OGRE_LIBRARIES Ogre${COMPONENT})
- endmacro()
-@@ -55,11 +55,11 @@ endmacro()
- macro(ogre_declare_plugin TYPE COMPONENT)
-     set(OGRE_${TYPE}_${COMPONENT}_FOUND TRUE)
-     set(OGRE_${TYPE}_${COMPONENT}_LIBRARIES ${TYPE}_${COMPONENT})
-    
-+
-     if(@OGRE_STATIC@)
-         list(APPEND OGRE_LIBRARIES ${TYPE}_${COMPONENT})
-     endif()
-    
-+
-     list(APPEND OGRE_PLUGINS ${TYPE}_${COMPONENT})
- endmacro()
- 
-@@ -149,7 +149,7 @@ endif()
- cmake_policy(POP)
- 
- if(@OGRE_STATIC@)
-    list(APPEND OGRE_LIBRARIES OgreGLSupport@OGRE_LIB_SUFFIX@ @CMAKE_DL_LIBS@) # glXXw uses dlopen
-+    list(APPEND OGRE_LIBRARIES OgreGLSupport @CMAKE_DL_LIBS@) # glXXw uses dlopen
-     list(APPEND OGRE_LIBRARY_DIRS "${OGRE_LIBRARY_DIRS}/OGRE") # plugins folder
- endif()
 
 diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake
 index 374f84b..dc7066d 100644
@ -452,150 +238,50 @@ index 374f84b..dc7066d 100644
 
 # Generate debug names from given release names
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d2819f0..f40239f 100644
+index 3e09d2d..58968f0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,7 +142,7 @@ if (MSVC)
- 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /bigobj")
-   endif ()
- 
-  if (OGRE_PROJECT_FOLDERS)  
-+  if (OGRE_PROJECT_FOLDERS)
-     # Turn on the ability to create folders to organize projects (.vcproj)
-     # It creates "CMakePredefinedTargets" folder by default and adds CMake
-     # defined projects like INSTALL.vcproj and ZERO_CHECK.vcproj
-@@ -274,12 +274,8 @@ elseif(EMSCRIPTEN)
+@@ -274,7 +274,7 @@ elseif(EMSCRIPTEN)
 elseif (APPLE AND NOT APPLE_IOS)
 
   set(XCODE_ATTRIBUTE_SDKROOT macosx)
 -  if(CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+  if(1)
     execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT)
     string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")
-  else()
-    set(CMAKE_OSX_SYSROOT macosx)
-  endif()
- 
-   # Make sure that the OpenGL render system is selected for non-iOS Apple builds
-   set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE)
-@@ -310,7 +306,7 @@ include(Dependencies)
- # Customise what to build
- option(OGRE_STATIC "Static build" FALSE)
- option(OGRE_ENABLE_PRECOMPILED_HEADERS "Use precompiled headers to speed up build" TRUE)
-set(OGRE_RESOURCEMANAGER_STRICT "2" CACHE STRING 
-+set(OGRE_RESOURCEMANAGER_STRICT "2" CACHE STRING
-   "Make ResourceManager strict for faster operation. Possible values:
-   0 - OFF search in all groups twice - for case sensitive and insensitive lookup [DEPRECATED]
-   1 - PEDANTIC require an explicit resource group. Case sensitive lookup.
-@@ -352,7 +348,7 @@ cmake_dependent_option(OGRE_BUILD_LIBS_AS_FRAMEWORKS "Build frameworks for libra
- option(OGRE_BUILD_TESTS "Build the unit tests & PlayPen" FALSE)
- option(OGRE_CONFIG_DOUBLE "Use doubles instead of floats in Ogre" FALSE)
- option(OGRE_CONFIG_NODE_INHERIT_TRANSFORM "Tells the node whether it should inherit full transform from it's parent node or derived position, orientation and scale" FALSE)
-set(OGRE_CONFIG_THREADS "3" CACHE STRING 
-+set(OGRE_CONFIG_THREADS "3" CACHE STRING
- 	"Enable Ogre thread safety support for multithreading. Possible values:
- 	0 - no thread safety. DefaultWorkQueue is not threaded.
- 	1 - background resource preparation and loading is thread safe. Threaded DefaultWorkQueue. [DEPRECATED]
+   else()
 diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
-index bdb303d..e8031d1 100644
+index bdb303d..d9cc221 100644
 --- a/Components/Overlay/CMakeLists.txt
 +++ b/Components/Overlay/CMakeLists.txt
-@@ -13,7 +13,7 @@
- 
- # define header and source files for the library
- file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
-list(APPEND HEADER_FILES 
-+list(APPEND HEADER_FILES
-   ${PROJECT_BINARY_DIR}/include/OgreOverlayPrerequisites.h
-   ${CMAKE_CURRENT_SOURCE_DIR}/include/OgreOverlay.i)
- file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
-@@ -21,17 +21,17 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
+@@ -21,7 +21,7 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 # setup target
 add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
 set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
 -target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB)
-target_include_directories(OgreOverlay PUBLIC 
 +target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB)
-+target_include_directories(OgreOverlay PUBLIC
+ target_include_directories(OgreOverlay PUBLIC 
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
   $<INSTALL_INTERFACE:include/OGRE/Overlay>
-   PRIVATE ${FREETYPE_INCLUDE_DIRS})
- 
-generate_export_header(OgreOverlay 
-+generate_export_header(OgreOverlay
-     EXPORT_MACRO_NAME _OgreOverlayExport
-     EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreOverlayPrerequisites.h)
- 
-# install 
-+# install
- ogre_config_framework(OgreOverlay)
- ogre_config_component(OgreOverlay)
- 
-@@ -40,4 +40,4 @@ install(FILES ${HEADER_FILES}
- )
- install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip"
-   DESTINATION "${OGRE_MEDIA_PATH}/packs/"
-)
-\ No newline at end of file
-+)
 diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
-index 6ec4e34..2803a8a 100644
+index 6ec4e34..cc9cb9d 100644
 --- a/OgreMain/CMakeLists.txt
 +++ b/OgreMain/CMakeLists.txt
-@@ -188,21 +188,21 @@ if (WINDOWS_STORE OR WINDOWS_PHONE)
- 	set_target_properties(OgreMain PROPERTIES VS_WINRT_COMPONENT "true")
- endif ()
- 
-generate_export_header(OgreMain 
-+generate_export_header(OgreMain
-     EXPORT_MACRO_NAME _OgreExport
-     NO_EXPORT_MACRO_NAME _OgrePrivate
-     DEPRECATED_MACRO_NAME OGRE_DEPRECATED
-     EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreExports.h)
- 
-target_include_directories(OgreMain PUBLIC 
-  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" 
-+target_include_directories(OgreMain PUBLIC
-+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-   "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>"
-   $<INSTALL_INTERFACE:include/OGRE>
-   PRIVATE "${OGRE_PROFILING_REMOTERY_PATH}")
- 
- # In visual studio 2010 - 64 bit we get this error: "LINK : fatal error LNK1210: exceeded internal ILK size limit; link with /INCREMENTAL:NO"
- if(WIN32 AND MSVC10 AND CMAKE_CL_64)
-  set_target_properties(OgreMain PROPERTIES 
-+  set_target_properties(OgreMain PROPERTIES
-                         VERSION ${OGRE_SOVERSION}
-                         LINK_FLAGS "/INCREMENTAL:NO"
-                       )
-@@ -211,7 +211,7 @@ else()
- endif()
- 
- if(OGRE_GCC_VERSION VERSION_EQUAL 4.8 OR OGRE_GCC_VERSION VERSION_GREATER 4.8)
-	if(CMAKE_SYSTEM_NAME STREQUAL "Android") 
-+	if(CMAKE_SYSTEM_NAME STREQUAL "Android")
- 	  list(APPEND LIBRARIES "atomic")
- 	else()
- 	  list(APPEND LIBRARIES "-latomic")
-@@ -226,8 +226,7 @@ if (APPLE)
+@@ -225,8 +225,6 @@ if (APPLE)
+     set_target_properties(OgreMain PROPERTIES
         LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo"
     )
- 
+-
 -    set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
-  
-+
+   
     if(OGRE_BUILD_LIBS_AS_FRAMEWORKS)
       add_custom_command(TARGET OgreMain POST_BUILD
-           COMMAND mkdir ARGS -p ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
 diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt
-index e9c936a..a83d793 100644
+index e9c936a..bb8747e 100644
 --- a/PlugIns/EXRCodec/CMakeLists.txt
 +++ b/PlugIns/EXRCodec/CMakeLists.txt
-@@ -13,14 +13,14 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
- 
- add_library(Codec_EXR ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
- target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES})
-target_include_directories(Codec_EXR PUBLIC 
-+target_include_directories(Codec_EXR PUBLIC
+@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES})
+ target_include_directories(Codec_EXR PUBLIC 
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
     $<INSTALL_INTERFACE:include/OGRE/Plugins/EXRCodec>)
 -target_include_directories(Codec_EXR SYSTEM PRIVATE  "${OPENEXR_INCLUDE_DIR}/OpenEXR")
@ -603,33 +289,3 @@ index e9c936a..a83d793 100644
 
 ogre_config_framework(Codec_EXR)
 ogre_config_plugin(Codec_EXR)
-generate_export_header(Codec_EXR 
-+generate_export_header(Codec_EXR
-     EXPORT_MACRO_NAME _OgreEXRPluginExport
-     EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreEXRCodecExports.h)
- install(FILES ${HEADER_FILES} DESTINATION include/OGRE/Plugins/EXRCodec)
-diff --git a/RenderSystems/GL3Plus/CMakeLists.txt b/RenderSystems/GL3Plus/CMakeLists.txt
-index ba55b43..66c2758 100644
--- a/RenderSystems/GL3Plus/CMakeLists.txt
-+++ b/RenderSystems/GL3Plus/CMakeLists.txt
-@@ -21,12 +21,12 @@ set(HEADER_FILES ${HEADER_FILES} ${GLSL_HEADERS})
- add_definitions(${OGRE_VISIBILITY_FLAGS})
- 
- if(OGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT)
-  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGL3PlusStateCacheManager.cpp 
-+  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGL3PlusStateCacheManager.cpp
-     PROPERTIES COMPILE_DEFINITIONS OGRE_ENABLE_STATE_CACHE)
- endif()
- add_library(RenderSystem_GL3Plus ${OGRE_LIB_TYPE} ${HEADER_FILES} ${GLSL_SOURCE} ${SOURCE_FILES})
- target_link_libraries(RenderSystem_GL3Plus OgreMain OgreGLSupport ${OPENGL_gl_LIBRARY} ${CMAKE_DL_LIBS})
-target_include_directories(RenderSystem_GL3Plus PUBLIC 
-+target_include_directories(RenderSystem_GL3Plus PUBLIC
-     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL>"
-     $<INSTALL_INTERFACE:include/OGRE/RenderSystems/GL3Plus>
-@@ -44,4 +44,4 @@ ogre_config_plugin(RenderSystem_GL3Plus)
- 
- install(FILES ${HEADER_FILES} ${GLSUPPORT_HEADERS} DESTINATION include/OGRE/RenderSystems/GL3Plus)
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GL DESTINATION include/OGRE/RenderSystems/GL3Plus)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL/ DESTINATION include/OGRE/RenderSystems/GL3Plus)
-+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL DESTINATION include/OGRE/RenderSystems/GL3Plus)
--- a/ports/openvr/CONTROL
+++ b/ports/openvr/CONTROL
@ -1,4 +1,4 @@
 Source: openvr
-Version: 1.4.18
+Version: 1.5.17
 Homepage: https://github.com/ValveSoftware/openvr
 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.
--- a/ports/openvr/portfile.cmake
+++ b/ports/openvr/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ValveSoftware/openvr
-    REF 02bc73b9bcfe9cc2d2802bd5fdc91f724de8ef10
-    SHA512 5b0b954b09570dcf72f0340d6bcc0a5ba9e754babf33aaee35c9d45ce08f5256643692705b014b8c94b098b554e7882a837cf6a2c25e946e6bc69ba3b9db0ede
+    REF cdaf2b330c8df58986391b253cd8f04328139823
+    SHA512 4ed4e7760d45b2b456e2e8b3b59eb394784225c1fade1fffae87110a5f29bcfc2585fcc6f05e220f064982d67101d0d1a76017f071f4d2f65663795d691fc523
    HEAD_REF master
 )

--- a/ports/orc/0003-dependencies-from-vcpkg.patch
+++ b/ports/orc/0003-dependencies-from-vcpkg.patch
@ -1,65 +1,44 @@
 diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index 235ced8..0042a88 100644
+index fae9be0..35cfb5f 100644
 --- a/c++/src/CMakeLists.txt
 +++ b/c++/src/CMakeLists.txt
-@@ -218,12 +218,13 @@ endif(BUILD_LIBHDFSPP)
+@@ -215,11 +215,12 @@ endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
 add_library (orc STATIC ${SOURCE_FILES})
-
+ 
 target_link_libraries (orc
 -  protobuf
 -  zlib
 -  snappy
 -  lz4
-  zstd
 -  ${LIBHDFSPP_LIBRARIES}
 +  PRIVATE
 +    protobuf::libprotobuf
 +    ZLIB::ZLIB
 +    Snappy::snappy
 +    ${LZ4_STATIC_LIB}
-+    ${ZSTD_STATIC_LIB}
 +    ${LIBHDFSPP_LIBRARIES}
   )
-
+ 
 install(TARGETS orc DESTINATION lib)
-diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
-index db68578..709ad07 100644
--- a/c++/test/CMakeLists.txt
-+++ b/c++/test/CMakeLists.txt
-@@ -50,10 +50,10 @@ add_executable (orc-test
-
- target_link_libraries (orc-test
-   orc
-  lz4
-  protobuf
-  snappy
-  zlib
-+  protobuf::libprotobuf
-+  ZLIB::ZLIB
-+  Snappy::snappy
-+  ${LZ4_STATIC_LIB}
-   ${GTEST_LIBRARIES}
- )
-
 diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index 1a28b1a..89f57d8 100644
+index f8584c0..fe48340 100644
 --- a/cmake_modules/ThirdpartyToolchain.cmake
 +++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -59,8 +59,8 @@ endif ()
+@@ -51,8 +51,8 @@ endif ()
 # ----------------------------------------------------------------------
 # Snappy
-
+ 
 -if (NOT "${SNAPPY_HOME}" STREQUAL "")
 -  find_package (Snappy REQUIRED)
-+if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1)
+if (1)
 +  find_package (Snappy CONFIG REQUIRED)
   set(SNAPPY_VENDORED FALSE)
 else ()
   set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
-@@ -78,10 +78,6 @@ else ()
+@@ -70,10 +70,6 @@ else ()
   set(SNAPPY_VENDORED TRUE)
 endif ()
-
+ 
 -include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
 -add_library (snappy STATIC IMPORTED)
 -set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
@ -67,20 +46,19 @@ index 1a28b1a..89f57d8 100644
 if (SNAPPY_VENDORED)
   add_dependencies (snappy snappy_ep)
   if (INSTALL_VENDORED_LIBS)
-@@ -93,7 +89,8 @@ endif ()
+@@ -85,7 +81,7 @@ endif ()
 # ----------------------------------------------------------------------
 # ZLIB
-
+ 
 -if (NOT "${ZLIB_HOME}" STREQUAL "")
-+
-+if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1)
+if (1)
   find_package (ZLIB REQUIRED)
   set(ZLIB_VENDORED FALSE)
 else ()
-@@ -120,10 +117,6 @@ else ()
+@@ -112,10 +108,6 @@ else ()
   set(ZLIB_VENDORED TRUE)
 endif ()
-
+ 
 -include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
 -add_library (zlib STATIC IMPORTED)
 -set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
@ -88,45 +66,21 @@ index 1a28b1a..89f57d8 100644
 if (ZLIB_VENDORED)
   add_dependencies (zlib zlib_ep)
   if (INSTALL_VENDORED_LIBS)
-@@ -134,9 +127,8 @@ endif ()
-
- # ----------------------------------------------------------------------
- # Zstd
-
-if (NOT "${ZSTD_HOME}" STREQUAL "")
-  find_package (zstd REQUIRED)
-+if (NOT "${ZSTD_HOME}" STREQUAL "" OR 1)
-+  find_library(ZSTD_STATIC_LIB NAMES zstd zstd_static)
-   set(ZSTD_VENDORED FALSE)
- else ()
-   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
-@@ -169,10 +161,6 @@ else ()
-   set(ZSTD_VENDORED TRUE)
- endif ()
-
-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
-add_library (zstd STATIC IMPORTED)
-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
-
- if (ZSTD_VENDORED)
-   add_dependencies (zstd zstd_ep)
-   if (INSTALL_VENDORED_LIBS)
-@@ -183,9 +171,8 @@ endif ()
-
+@@ -127,8 +119,8 @@ endif ()
 # ----------------------------------------------------------------------
 # LZ4
-
+ 
 -if (NOT "${LZ4_HOME}" STREQUAL "")
 -  find_package (LZ4 REQUIRED)
-+if (NOT "${LZ4_HOME}" STREQUAL "" OR 1)
-+  find_library(LZ4_STATIC_LIB NAMES lz4d lz4)
+if (1)
+  find_library (LZ4_STATIC_LIB NAMES lz4d lz4)
   set(LZ4_VENDORED FALSE)
 else ()
   set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
-@@ -211,10 +198,6 @@ else ()
+@@ -154,10 +146,6 @@ else ()
   set(LZ4_VENDORED TRUE)
 endif ()
-
+ 
 -include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
 -add_library (lz4 STATIC IMPORTED)
 -set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
@ -134,22 +88,21 @@ index 1a28b1a..89f57d8 100644
 if (LZ4_VENDORED)
   add_dependencies (lz4 lz4_ep)
   if (INSTALL_VENDORED_LIBS)
-@@ -287,9 +270,8 @@ endif ()
-
+@@ -231,8 +219,8 @@ endif ()
 # ----------------------------------------------------------------------
 # Protobuf
-
+ 
 -if (NOT "${PROTOBUF_HOME}" STREQUAL "")
 -  find_package (Protobuf REQUIRED)
-+if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1)
-+  find_package (protobuf CONFIG REQUIRED)
+if (1)
+  find_package (Protobuf CONFIG REQUIRED)
   set(PROTOBUF_VENDORED FALSE)
 else ()
   set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
-@@ -325,14 +307,6 @@ else ()
+@@ -268,14 +256,6 @@ else ()
   set(PROTOBUF_VENDORED TRUE)
 endif ()
-
+ 
 -include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
 -
 -add_library (protobuf STATIC IMPORTED)
@ -162,18 +115,18 @@ index 1a28b1a..89f57d8 100644
   add_dependencies (protoc protobuf_ep)
   add_dependencies (protobuf protobuf_ep)
 diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
-index f5a53ca..15391bf 100644
+index 667fab4..7745fe0 100644
 --- a/tools/src/CMakeLists.txt
 +++ b/tools/src/CMakeLists.txt
-@@ -51,7 +51,6 @@ add_executable (orc-metadata
-
+@@ -49,7 +49,6 @@ add_executable (orc-metadata
+ 
 target_link_libraries (orc-metadata
   orc
 -  protobuf
-   ${CMAKE_THREAD_LIBS_INIT}
   )
-
-@@ -95,4 +94,7 @@ install(TARGETS
+ 
+  add_executable (orc-statistics
+@@ -88,4 +87,7 @@ install(TARGETS
    orc-contents
    orc-metadata
    orc-statistics
--- a/ports/orc/CONTROL
+++ b/ports/orc/CONTROL
@ -1,4 +1,4 @@
 Source: orc
-Version: 1.5.5-1
+Version: 1.5.6
 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
 Description: The smallest, fastest columnar storage for Hadoop workloads.
--- a/ports/orc/portfile.cmake
+++ b/ports/orc/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO apache/orc
-    REF 47a490f083bd411bf04bfed8131eef42606d7789
-    SHA512 c2650d9fd367a5ec04c79c16434728e5c20608131f21bfc89d412cbaf8dd4ae5900b03e59df21d3617d8c6a9504e4b14b1f788157afa90b57d733499d2995e39
+    REF 8a8e471f6a7064e9538374374e57c9e5b4be520d
+    SHA512 c10d6f56965abde585607473142cedea25e2085147e5c66e1991cbbb313543a919d93f9a830c76ae1331f97fafe4e9a47157062b05d80746869bc3f73772e3bc
    HEAD_REF master
    PATCHES
      0003-dependencies-from-vcpkg.patch
--- a/ports/parson/CONTROL
+++ b/ports/parson/CONTROL
@ -1,3 +1,3 @@
 Source: parson
-Version: 2019-04-19
+Version: 2019-07-11
 Description: a lighweight json library written in C
--- a/ports/parson/portfile.cmake
+++ b/ports/parson/portfile.cmake
@ -8,8 +8,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO kgabis/parson
-    REF 809ef4b7d829d3929223387661b8e229e7191340
-    SHA512 ba29478c7603a50c825f90e7d6d1fcb3f80a3ee0091fba07320544fc5a735653259cb1bb207e3124a36553569493e352f8a1d3233fc2d5dc4a9ec55a74e95b54
+    REF 33e5519d0ae68784c91c92af2f48a5b07dc14490
+    SHA512 b4477fe1038465edb210d1d02c8241ba02c44a01fa7838fb6217b36659eae3c5eaf450ec559bd609dfdc2417b4948eacc4a643ed7f1684f9b4bbaded421d7b80
    HEAD_REF master
 )

--- a/ports/piex/CONTROL
+++ b/ports/piex/CONTROL
@ -1,4 +1,4 @@
 Source: piex
-Version: 2018-03-13-1
+Version: 2019-07-11
 Homepage: https://github.com/google/piex
 Description: The Preview Image Extractor (PIEX) is designed to find and extract the largest
--- a/ports/piex/portfile.cmake
+++ b/ports/piex/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO google/piex
-  REF 2aa74c2dd295758ef4562906a5525300972821fc
-  SHA512 4fbea41e8f21c2f4a75d899aa28e2d2e92201d429eb8504515466187befc1eac6c9b31d91b039f2aebe2101bbde6b87adce9bae578a536f264d207fe29e4bd8f
+  REF 256bd102be288c19b4165e0ecc7097a18c004e92
+  SHA512 ae948588a99d586593788c995c3d65a488faaf99b2ab6c51ec39df7e11a42c89454dd505117e90b1f152f6abfc2e3e11f61b0af97e42ecdff0d978934e20f582
  HEAD_REF master
 )

--- a/ports/ptex/CONTROL
+++ b/ports/ptex/CONTROL
@ -1,5 +1,5 @@
 Source: ptex
-Version: 2.1.28-1
+Version: 2.3.2
 Homepage: https://github.com/wdas/ptex
 Description: Per-Face Texture Mapping for Production Rendering.
 Build-Depends: zlib
--- a/ports/ptex/fix-build.patch
+++ b/ports/ptex/fix-build.patch
@ -1,35 +1,40 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd327d0..5043452 100644
+index c708153..0e004da 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -6,15 +6,6 @@ include(CTest)
- include(FindZLIB)
+@@ -60,10 +60,11 @@ include(GNUInstallDirs)
+ include(CTest)
 include(FindThreads)
 
-enable_testing()
+find_package(ZLIB REQUIRED)
+if (0)
+ # Use pkg-config to create a PkgConfig::Ptex_ZLIB imported target
+ find_package(PkgConfig REQUIRED)
+ pkg_checK_modules(Ptex_ZLIB REQUIRED zlib IMPORTED_TARGET)
 -
-# Detect the build type from the $FLAVOR environment variable
-if ("$ENV{FLAVOR}" MATCHES "debug")
-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "type of build" FORCE)
-else ()
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
-endif ()
-
- if (NOT WIN32)
-     set(CMAKE_CXX_FLAGS "-std=c++98 -Wall -Wextra -pedantic")
+ enable_testing()
+ 
+ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+@@ -77,6 +78,7 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+         set(CMAKE_BUILD_TYPE "Release" CACHE STRING "type of build" FORCE)
+     endif ()
 endif ()
-@@ -40,6 +31,6 @@ include_directories(src/ptex)
- include_directories(${ZLIB_INCLUDE_DIR})
+endif()
+ 
+ if (NOT WIN32)
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
+@@ -99,7 +101,9 @@ endif ()
+ include_directories(src/ptex)
 
 add_subdirectory(src/ptex)
-add_subdirectory(src/utils)
-add_subdirectory(src/tests)
-add_subdirectory(src/doc)
-+#add_subdirectory(src/utils)
-+#add_subdirectory(src/tests)
-+#add_subdirectory(src/doc)
+if (0)
+ add_subdirectory(src/utils)
+ add_subdirectory(src/tests)
+ add_subdirectory(src/doc)
+endif()
+ add_subdirectory(src/build)
 diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
-index c926d98..ac2c71d 100644
+index ba3a3cc..1619ff1 100644
 --- a/src/ptex/CMakeLists.txt
 +++ b/src/ptex/CMakeLists.txt
@@ -1,6 +1,8 @@
@ -42,24 +47,53 @@ index c926d98..ac2c71d 100644
 +    add_definitions(-DPTEX_STATIC)  
 +endif ()
 
- set(SRCS
-     PtexCache.cpp
-@@ -14,15 +16,11 @@ set(SRCS
-     PtexUtils.cpp
+ configure_file(PtexVersion.h.in
+     ${CMAKE_CURRENT_SOURCE_DIR}/PtexVersion.h @ONLY)
+@@ -18,29 +20,35 @@ set(SRCS
     PtexWriter.cpp)
 
-add_library(Ptex_static STATIC ${SRCS})
-set_target_properties(Ptex_static PROPERTIES OUTPUT_NAME Ptex)
-+add_library(Ptex ${SRCS})
+ if(PTEX_BUILD_STATIC_LIBS)
+-    add_library(Ptex_static STATIC ${SRCS})
+-    set_target_properties(Ptex_static PROPERTIES OUTPUT_NAME Ptex)
+-    target_include_directories(Ptex_static
+    add_library(Ptex STATIC ${SRCS})
+    target_include_directories(Ptex
+     PUBLIC
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+     PRIVATE
+         ${CMAKE_CURRENT_SOURCE_DIR})
+-    target_link_libraries(Ptex_static
+-        PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB)
+-    install(TARGETS Ptex_static EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    target_link_libraries(Ptex
+        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB)
+    install(TARGETS Ptex EXPORT Ptex
+            RUNTIME DESTINATION bin
+            LIBRARY DESTINATION lib
+            ARCHIVE DESTINATION lib
+    )
+ endif()
 
-add_library(Ptex_dynamic SHARED ${SRCS})
-set_target_properties(Ptex_dynamic PROPERTIES OUTPUT_NAME Ptex)
-+target_link_libraries(Ptex ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
- 
-target_link_libraries(Ptex_dynamic ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES})
-
-install(TARGETS Ptex_static Ptex_dynamic DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS Ptex RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ if(PTEX_BUILD_SHARED_LIBS)
+-    add_library(Ptex_dynamic SHARED ${SRCS})
+-    set_target_properties(Ptex_dynamic PROPERTIES OUTPUT_NAME Ptex)
+-    target_include_directories(Ptex_dynamic
+    add_library(Ptex SHARED ${SRCS})
+    target_include_directories(Ptex
+         PUBLIC
+             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+         PRIVATE
+             ${CMAKE_CURRENT_SOURCE_DIR})
+-    target_link_libraries(Ptex_dynamic
+-        PUBLIC ${CMAKE_THREAD_LIBS_INIT} PkgConfig::Ptex_ZLIB)
+-    install(TARGETS Ptex_dynamic EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    target_link_libraries(Ptex
+        PUBLIC ${CMAKE_THREAD_LIBS_INIT} ZLIB::ZLIB)
+    install(TARGETS Ptex EXPORT Ptex
+            RUNTIME DESTINATION bin
+            LIBRARY DESTINATION lib
+            ARCHIVE DESTINATION lib
+    )
+ endif()
 
 install(FILES
-         PtexHalf.h
--- a/ports/ptex/portfile.cmake
+++ b/ports/ptex/portfile.cmake
@ -1,23 +1,39 @@
+include(vcpkg_common_functions)
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
    message(FATAL_ERROR "UWP build not supported")
 endif()

-include(vcpkg_common_functions)
+set(PTEX_VER 2.3.2)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO wdas/ptex
-    REF v2.1.28
-    SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
-    HEAD_REF master)
+    REF 1b8bc985a71143317ae9e4969fa08e164da7c2e5
+    SHA512 37f2df9ec195f3d69d9526d0dea6a93ef49d69287bfae6ccd9671477491502ea760ed14e3b206b4f488831ab728dc749847b7d176c9b8439fb58b0a0466fe6c5
+    HEAD_REF master
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-build.patch
+)

-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-build.patch)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(BUILD_SHARED_LIB ON)
+    set(BUILD_STATIC_LIB OFF)
+else()
+    set(BUILD_SHARED_LIB OFF)
+    set(BUILD_STATIC_LIB ON)
+endif()

 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA)
+    PREFER_NINJA
+    OPTIONS
+        -DPTEX_VER="v${PTEX_VER}"
+        -DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB}
+        -DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB}
+)

 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Ptex)
 vcpkg_copy_pdbs()

 foreach(HEADER PtexHalf.h Ptexture.h)
@ -30,6 +46,6 @@ foreach(HEADER PtexHalf.h Ptexture.h)
    file(WRITE ${CURRENT_PACKAGES_DIR}/include/${HEADER} "${PTEX_HEADER}")
 endforeach()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
 file(COPY ${SOURCE_PATH}/src/doc/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ptex)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ptex/license.txt ${CURRENT_PACKAGES_DIR}/share/ptex/copyright)
--- a/ports/pybind11/CONTROL
+++ b/ports/pybind11/CONTROL
@ -1,5 +1,5 @@
 Source: pybind11
-Version: 2.2.4
+Version: 2.3.0
 Homepage: https://github.com/pybind/pybind11
 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code.
 Build-Depends: python3 (windows)
--- a/ports/pybind11/portfile.cmake
+++ b/ports/pybind11/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO pybind/pybind11
-    REF v2.2.4
-    SHA512 6bddf5c885ff92a3e373bcedc6574dfefe8be9ebb6176c6c96d475457466c76bfb982c6df4066cb0fbead4b867f87dbc4fbc1605c80852635016f614330ce041
+    REF e43e1cc01ae6d4e4e5ba10557a057d7f3d5ece0d
+    SHA512 546a0501c420cbbb21fb458192bae6c8d34bdd4bdbfe47fed22869e09429d6404b4e399e30c36c6d658bf8002339d051efde33685b03a00797b9cfe476cfb98e
    HEAD_REF master
    PATCHES
        ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO facebook/rocksdb
-  REF v6.1.2
-  SHA512 3d9e994b202c9f1c1c188e37a4f781bb97af5ba72f2f3f59091b79f402b819c9765dcd1e7d0851b5119c0bf510aa3f5bed44a542798ee81795a8328d71554b38
+  REF 2b38e2dd6602a17a2010308580fd5d8c91dea650
+  SHA512 82e9c2417bd0325b2402a64a56cfff25346e277a8174a33727517ada59502fee4bdeea40b0d20f9c6a86c52b66d57340b898096e39ad91bccc4f3a2245bd49b0
  HEAD_REF master
  PATCHES
    0001-disable-gtest.patch
--- a/ports/rs-core-lib/CONTROL
+++ b/ports/rs-core-lib/CONTROL
@ -1,5 +1,5 @@
 Source: rs-core-lib
-Version: 2019-05-07
+Version: 2019-07-11
 Homepage: https://github.com/CaptainCrowbar/rs-core-lib
 Description: Minimal common utilities by Ross Smith

--- a/ports/rs-core-lib/portfile.cmake
+++ b/ports/rs-core-lib/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO CaptainCrowbar/rs-core-lib
-    REF 4828e0dc8b7e7ed76935865cfe99181da0da211b
-    SHA512 97298d94c1cc4cd4cb580bde6c1413a2f429544dc80cae58bc436aad25e385d9ced611a2512a45f1e3d10fd613f26958fc5d3a03ea9bfaefd5170a4b2d1ac124
+    REF fda88535dff2193e75bb9d306e4aa38a957b2c91
+    SHA512 e1842e2d92b5e935a8d867797d26f998cec628b3030077b8694cc3932546efeac81634e7f6d14189248a945fceb329e24aa39cf830384c04c0d67d2aa6255e57
    HEAD_REF master
 )

--- a/ports/shogun/CONTROL
+++ b/ports/shogun/CONTROL
@ -1,4 +1,4 @@
 Source: shogun
-Version: 6.1.3-3
+Version: 6.1.4
 Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64&!osx), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
 Description: Unified and efficient Machine Learning
--- a/ports/shogun/portfile.cmake
+++ b/ports/shogun/portfile.cmake
@ -11,8 +11,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO shogun-toolbox/shogun
-    REF shogun_6.1.3
-    SHA512 11aeed456b13720099ca820ab9742c90ce4af2dc049602a425f8c44d2fa155327c7f1d3af2ec840666f600a91e75902d914ffe784d76ed35810da4f3a5815673
+    REF ab274e7ab6bf24dd598c1daf1e626cb686d6e1cc
+    SHA512 fb90e5bf802c6fd59bf35ab7bbde5e8cfcdc5d46c69c52097140b30c6b29e28b8341dd1ece7f8a1f9d9123f4bc06d44d288584ce7dfddccf3d33fe05106884ae
    HEAD_REF master
    PATCHES
        cmake.patch
--- a/ports/stb/CONTROL
+++ b/ports/stb/CONTROL
@ -1,4 +1,4 @@
 Source: stb
-Version: 2019-05-07
+Version: 2019-07-11
 Homepage: https://github.com/nothings/stb
 Description: stb single-file public domain libraries for C/C++
--- a/ports/stb/portfile.cmake
+++ b/ports/stb/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO nothings/stb
-    REF 1034f5e5c4809ea0a7f4387e0cd37c5184de3cdd
-    SHA512 efc3deedd687615a6706b0d315ded8d76edb28fcd6726531956fde9bba81cc62f25df0a1f998b56e16ab0c62989687c7d5b58875789470c2bf7fd457b1ff6535
+    REF c72a95d766b8cbf5514e68d3ddbf6437ac9425b1
+    SHA512 2be9b2d7848fca133d5733ebb0fdd1f357195f38a2f2b471af3657468f00a75cc94f029ace6127e748da80e0f86933c16a554593a21d8a9057b7691d39facf4b
    HEAD_REF master
 )

--- a/ports/taocpp-json/CONTROL
+++ b/ports/taocpp-json/CONTROL
@ -1,3 +1,3 @@
 Source: taocpp-json
-Version: 2019-05-08
+Version: 2019-07-11
 Description: C++ header-only JSON library
--- a/ports/taocpp-json/portfile.cmake
+++ b/ports/taocpp-json/portfile.cmake
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO taocpp/json
-    REF 6adce3b8e55c16e25b22ec0e33348eefa6aa4533
-    SHA512 078af33eed0bae7671f31a010ba19088d07ac4f78b834bc7565562ee75199e90338dfd450a1d592c4f4ae58eddb3a26018b571381099d22dfc7d3c4143911390
+    REF 2ce7f742f8c47e8871f3052c56f13b237b68b18d
+    SHA512 22492cf87a008ae37fb46490ed5b688b195099a932c2dffaca029927fd9f9dff813ad21135edadf3c11bb0af75f78d00cfb92d875fe5579966e76d2039085eae
    HEAD_REF master
 )

--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@ -1,4 +1,4 @@
 Source: tbb
-Version: 2019_U7-1
+Version: 2019_U8
 Homepage: https://github.com/01org/tbb
 Description: Intel's Threading Building Blocks.
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO intel/tbb
-    REF 4233fef583b4f8cbf9f781311717600feaaa0694
-    SHA512 6eb239f16e0ecacb825264869aafad7fb39aa1b1f8a3c03c92344c4255d1c1a34ca0a47a366c471fd2da808f3be14262c7e2305294677f2f490c1a48f6f76ec3
+    REF 4bdba61bafc6ba2d636f31564f1de5702d365cf7
+    SHA512 0b00c9deefdac5dc1f4fbae314e91eb3513b54b47ff6dec08ed2460486fc7d211ab36d6130e5787bfd50523cb613c65f03f9217d967292ca9056e2d3f5010bf8
    HEAD_REF tbb_2019
 )

--- a/ports/telnetpp/CONTROL
+++ b/ports/telnetpp/CONTROL
@ -1,5 +1,10 @@
 Source: telnetpp
-Version:  1.2.4-1
+Version: 2.0
 Homepage: https://github.com/KazDragon/telnetpp
 Description:  Telnet++ is an implementation of the Telnet Session Layer protocol using C++14
-Build-Depends: boost, gtest, zlib
+Build-Depends: boost-container, boost-signals2, boost-variant, gtest, gsl-lite
+Default-Features: zlib
+
+Feature: zlib
+Description: Zlib support
+Build-Depends: zlib
--- a/ports/telnetpp/fix-build-error.patch
+++ b/ports/telnetpp/fix-build-error.patch
@ -0,0 +1,152 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09b4f9b..feb3746 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -22,9 +22,6 @@ message("Building Telnet++ with zlib: ${TELNETPP_WITH_ZLIB}")
+ message("Building Telnet++ with code coverage: ${TELNETPP_COVERAGE}")
+ message("Building Telnet++ with sanitizers: ${TELNETPP_SANITIZE}")
+ 
+-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+-conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
+-
+ # The required C++ Standard for Telnet++ is C++14.
+ set(CMAKE_CXX_STANDARD 14)
+ 
+@@ -154,18 +151,24 @@ add_library(telnetpp
+     ${TELNETPP_PRIVATE_INCLUDE_FILES}
+ )
+ 
+if (BUILD_SHARED_LIBS)
+    add_definitions(-Dtelnetpp_EXPORTS)
+else()
+    add_definitions(-DTELNETPP_STATIC_DEFINE)
+endif()
+
+ target_link_libraries(telnetpp
+     PUBLIC
+-        CONAN_PKG::gsl-lite
+-        CONAN_PKG::boost_container
+-        CONAN_PKG::boost_signals2
+-        CONAN_PKG::boost_variant
+        ${BOOST_CONTAINER_LIBRARY}
+        ${BOOST_SIGNALS2_LIBRARY}
+        ${BOOST_VARIANT_LIBRARY}
+ )
+ 
+ if (TELNETPP_WITH_ZLIB)
+    find_package(ZLIB REQUIRED)
+     target_link_libraries(telnetpp
+         PRIVATE
+-            CONAN_PKG::zlib
+            ${ZLIB_LIBRARIES}
+     )
+ endif()
+ 
+@@ -180,7 +183,8 @@ target_include_directories(telnetpp
+     PUBLIC
+         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+         $<INSTALL_INTERFACE:include/telnetpp-${TELNETPP_VERSION}>
+-        "${Boost_INCLUDE_DIRS}"
+        $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
+        $<BUILD_INTERFACE:${GSL_INCLUDE_PATH}>
+ )
+ 
+ generate_export_header(telnetpp
+@@ -197,17 +201,19 @@ install(
+         telnetpp
+     EXPORT
+         telnetpp-config
+    RUNTIME DESTINATION
+        bin
+     ARCHIVE DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
+        lib
+     LIBRARY DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
+        lib
+ )
+ 
+ install(
+     DIRECTORY
+         include/
+     DESTINATION
+-        include/telnetpp-${TELNETPP_VERSION}
+        include
+ )
+ 
+ export(
+@@ -221,7 +227,7 @@ install(
+     EXPORT
+         telnetpp-config
+     DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
+        share/telnetpp
+ )
+ 
+ include(CMakePackageConfigHelpers)
+@@ -236,7 +242,7 @@ install(
+     FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/telnetpp-config-version.cmake"
+     DESTINATION
+-        lib/telnetpp-${TELNETPP_VERSION}
+        share/telnetpp
+ )
+ 
+ if (TELNETPP_WITH_TESTS)
+@@ -299,13 +305,13 @@ if (TELNETPP_WITH_TESTS)
+     target_link_libraries(telnetpp_tester
+         PRIVATE
+             telnetpp
+-            CONAN_PKG::gtest
+            GTest::GTest GTest::Main
+     )
+ 
+     if (TELNETPP_WITH_ZLIB)
+         target_link_libraries(telnetpp_tester
+             PRIVATE
+-                CONAN_PKG::zlib
+                ${ZLIB_LIBRARIES}
+         )
+     endif()
+ 
+diff --git a/include/telnetpp/core.hpp b/include/telnetpp/core.hpp
+index 2362fac..48d340e 100644
+--- a/include/telnetpp/core.hpp
+++ b/include/telnetpp/core.hpp
+@@ -1,7 +1,7 @@
+ #pragma once
+ 
+ #include "telnetpp/detail/export.hpp"
+-#include <gsl-lite.h>
+#include <gsl-lite.hpp>
+ #include <string>
+ #include <cstdint>
+ 
+diff --git a/include/telnetpp/subnegotiation.hpp b/include/telnetpp/subnegotiation.hpp
+index a209b72..1f24fc9 100644
+--- a/include/telnetpp/subnegotiation.hpp
+++ b/include/telnetpp/subnegotiation.hpp
+@@ -15,7 +15,11 @@ public:
+     //* =====================================================================
+     /// \brief Constructor
+     //* =====================================================================
+#if _WIN32
+    const subnegotiation(option_type option, bytes content) noexcept
+#else
+     constexpr subnegotiation(option_type option, bytes content) noexcept
+#endif
+       : option_(std::move(option)),
+         content_(std::move(content))
+     {
+@@ -32,7 +36,11 @@ public:
+     //* =====================================================================
+     /// \brief Returns the content for this subnegotiation.
+     //* =====================================================================
+#if _WIN32
+    const bytes content() const noexcept
+#else
+     constexpr bytes content() const noexcept
+#endif
+     {
+         return content_;
+     }
--- a/Show More
+++ b/Show More