[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
microsoft · Aug 24, 2019 · 1550b9e · 1550b9e
1 parent 18a07fa
commit 1550b9e
Show file tree

Hide file tree

Showing 125 changed files with 674 additions and 886 deletions.
diff --git 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.
diff --git 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
 )
 

diff --git 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++
diff --git 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
 )
 

diff --git 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
diff --git 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})
+
diff --git 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)
-
diff --git a/ports/aws-c-common/fix-dependencey-build-error.patch b/ports/aws-c-common/fix-dependencey-build-error.patch
diff --git 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
 )
 

diff --git 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

diff --git 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
 )
 

diff --git 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
diff --git 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
 )

diff --git 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
diff --git a/ports/botan/fix-build_error.patch b/ports/botan/fix-build_error.patch
diff --git 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)

diff --git 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.
diff --git 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
 )
 

diff --git 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.
diff --git a/ports/chipmunk/portfile.cmake b/ports/chipmunk/portfile.cmake
@@ -23,46 +23,46 @@ 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}"
 )
 
 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

diff --git 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.
diff --git 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}")
diff --git 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
diff --git 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
 )
 

diff --git 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.
diff --git 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
 )

diff --git 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)
diff --git 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(

diff --git 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.
diff --git 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)

diff --git 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.