Merge branch 'master' into query_deps

bootstrap-vcpkg.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
 . "$vcpkgRootDir/scripts/bootstrap.sh"

ports/ace/CONTROL

@@ -1,3 +1,3 @@
 Source: ace
-Version: 6.5.4-3
+Version: 6.5.5-1
 Description: The ADAPTIVE Communication Environment

ports/ace/portfile.cmake

@@ -13,9 +13,9 @@ set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
 set(ENV{ACE_ROOT} ${ACE_ROOT})
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_4/ACE-src-6.5.4.zip"
+    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_5/ACE-src-6.5.5.zip"
-    FILENAME ACE-src-6.5.4.zip
+    FILENAME ACE-src-6.5.5.zip
-    SHA512 e699b24aa65c44137b7bdbe3c045b6c8d76c43ff4c78a05efe6d0d7fd05acdd1166b74529cc4d7ba9440b6b29cce3aa2dcc97f574c94afc05b0fef18475d6ce3
+    SHA512 65696e6f2776fd9c015adb78a92f1c87edacde62ff11f20f88c416d4420a6fc6e5176412c5f93262d06e67b89717499f8108f68582f70fea6ce05466c53415e9
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -36,7 +36,9 @@ endif()
 if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   set(LIB_RELEASE_SUFFIX .lib)
   set(LIB_DEBUG_SUFFIX d.lib)
-  if(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+  if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+    set(SOLUTION_TYPE vs2019)
+  elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
     set(SOLUTION_TYPE vs2017)
   else()
     set(SOLUTION_TYPE vc14)

ports/activemq-cpp/CONTROL

@@ -0,0 +1,4 @@
+Source: activemq-cpp
+Version: 3.9.5
+Build-Depends: apr
+Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.

ports/activemq-cpp/FunctionLevelLinkingOn.diff

@@ -0,0 +1,76 @@
+diff --git a/vs2010-build/activemq-cpp.vcxproj b/vs2010-build/activemq-cpp.vcxproj
+index a43f072..54b4822 100644
+--- a/vs2010-build/activemq-cpp.vcxproj
++++ b/vs2010-build/activemq-cpp.vcxproj
+@@ -2576,7 +2576,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2602,7 +2602,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2628,7 +2628,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2656,7 +2656,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2684,7 +2684,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2710,7 +2710,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2736,7 +2736,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>
+@@ -2764,7 +2764,7 @@
+       <AdditionalIncludeDirectories>../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <MinimalRebuild>false</MinimalRebuild>
+       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+-      <FunctionLevelLinking>false</FunctionLevelLinking>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
+       <CreateHotpatchableImage>false</CreateHotpatchableImage>
+       <RuntimeTypeInfo>true</RuntimeTypeInfo>
+       <PrecompiledHeaderFile>

ports/activemq-cpp/portfile.cmake

@@ -0,0 +1,84 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+set(VERSION 3.9.5)
+                                              
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/activemq-cpp-library-${VERSION})
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
+    FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
+    SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2  
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/FunctionLevelLinkingOn.diff
+)
+
+set(RELEASE_CONF "ReleaseDLL")
+set(DEBUG_CONF   "DebugDLL")
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+    set(BUILD_ARCH "Win32")
+    set(OUTPUT_DIR "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+    set(BUILD_ARCH "x64")
+    set(OUTPUT_DIR "Win64")
+else()
+    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+
+vcpkg_build_msbuild(
+     PROJECT_PATH ${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj
+     RELEASE_CONFIGURATION ${RELEASE_CONF}
+     DEBUG_CONFIGURATION   ${DEBUG_CONF}
+     PLATFORM ${BUILD_ARCH}
+     USE_VCPKG_INTEGRATION
+)
+
+vcpkg_copy_pdbs()
+ 
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/activemq-cpp)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/copyright)
+
+     
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+)
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll
+    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+)
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+)
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cppd.lib
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cppd.dll
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+)
+file(
+    COPY
+    ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cppd.pdb
+    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+)
+
+file(COPY ${SOURCE_PATH}/src/main/activemq DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
+file(COPY ${SOURCE_PATH}/src/main/cms      DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
+file(COPY ${SOURCE_PATH}/src/main/decaf    DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)

ports/anax/CONTROL

@@ -1,3 +1,3 @@
 Source: anax
-Version: 2.1.0-3
+Version: 2.1.0-4
 Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>

ports/anax/portfile.cmake

@@ -1,11 +1,3 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
@@ -14,17 +6,15 @@ vcpkg_from_github(
     REF v2.1.0
     SHA512 b573733b5f9634bf8cfc5b0715074f9a8ee29ecb48dc981d9371254a1f6ff8afbbb9ba6aa0877d53e518e5486ecc398a6d331fb9b5dbfd17d8707679216e11a3
     HEAD_REF master
-)
+    PATCHES 
-
+        Add-bin-output.patch
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/Add-bin-output.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-    -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
+        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()

ports/angle/CMakeLists.txt

@@ -6,11 +6,6 @@ if(WIN32 AND NOT WINDOWS_STORE)
 else()
     set(WINDOWS_DESKTOP 0)
 endif()
-if (WINDOWS_DESKTOP OR WINDOWS_STORE)
-    set(WINDOWS_ANY 1)
-else()
-    set(WINDOWS_ANY 0)
-endif()
 
 if(UNIX AND NOT APPLE)
     set(LINUX 1)
@@ -18,7 +13,7 @@ else()
     set(LINUX 0)
 endif()
 
-if(WINDOWS_ANY)
+if(MSVC)
     add_compile_options(/d2guard4 /Wv:18 /guard:cf /permissive)
 else()
     set(CMAKE_CXX_STANDARD 17)
@@ -46,7 +41,7 @@ include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 ##########
 # angle::common
-if(WINDOWS_ANY)
+if(WIN32)
     set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix")
 elseif(LINUX)
     set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac")
@@ -152,7 +147,7 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE)
 endif()
 
 # D3D Renderers
-if(WINDOWS_ANY)
+if(WIN32)
     ## All D3D Sources
     file(GLOB_RECURSE LIBANGLE_D3D_SOURCES
         "src/libANGLE/renderer/d3d/*.cpp"
@@ -197,7 +192,7 @@ if(WINDOWS_ANY)
 endif()
 
 ## Core libANGLE library
-if(WINDOWS_ANY)
+if(WIN32)
     set(LIBANGLE_SOURCES_PLATFORM
         "src/third_party/systeminfo/SystemInfo.cpp"
     )
@@ -296,7 +291,7 @@ add_library(libEGL
 )
 target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
 target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>")
-target_include_directories(libEGL PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include")
+target_include_directories(libEGL PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
 
 
 SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "")
@@ -309,7 +304,7 @@ install(TARGETS libEGL libGLESv2 EXPORT ANGLEExport
     ARCHIVE DESTINATION lib
 )
 
-#install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
+install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
 
 if(NOT DISABLE_INSTALL_HEADERS)
     install(
@@ -322,4 +317,3 @@ if(NOT DISABLE_INSTALL_HEADERS)
         PATTERN "export.h" EXCLUDE
     )
 endif()
-

ports/angle/CONTROL

@@ -1,5 +1,5 @@
 Source: angle
-Version: 2019-03-13-c2ee2cc-1
+Version: 2019-03-13-c2ee2cc-2
 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
   The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
 Build-Depends: egl-registry

ports/angle/portfile.cmake

@@ -20,17 +20,16 @@ vcpkg_from_github(
     REPO google/angle
     REF chromium/3672
     SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81
-)
+    PATCHES
-vcpkg_apply_patches(
+        001-fix-uwp.patch
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/001-fix-uwp.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}    
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1
     OPTIONS
         -D${ANGLE_CPU_BITNESS}=1
@@ -38,8 +37,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-#vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle)
-#file(RENAME ${CURRENT_PACKAGES_DIR}/share/angle ${CURRENT_PACKAGES_DIR}/share/unofficial-angle)
 
 vcpkg_copy_pdbs()
 

ports/arrow/CONTROL

@@ -1,4 +1,4 @@
 Source: arrow
-Version: 0.11.1
+Version: 0.13.0
 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog
 Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.

ports/arrow/portfile.cmake

@@ -7,8 +7,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/arrow
-    REF apache-arrow-0.11.1
+    REF apache-arrow-0.13.0
-    SHA512 8a2de7e4b40666e4ea7818fac488549f1348e961e7cb6a4166ae4019976a574fd115dc1cabaf44bc1cbaabf15fb8e5133c8232b34fca250d8ff7c5b65c5407c8
+    SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d
     HEAD_REF master
 )
 
@@ -27,33 +27,31 @@ string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC)
 
 if (IS_STATIC)
     set(PARQUET_ARROW_LINKAGE static)
+    set(BOOST_USE_SHARED off)
+    set(USE_STATIC_CRT on)
 else()
     set(PARQUET_ARROW_LINKAGE shared)
+    set(BOOST_USE_SHARED on)
+    set(USE_STATIC_CRT off)
 endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${CPP_SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+    -DARROW_DEPENDENCY_SOURCE=SYSTEM
     -DARROW_BUILD_TESTS=off
-    -DRAPIDJSON_HOME=${CURRENT_INSTALLED_DIR}
-    -DFLATBUFFERS_HOME=${CURRENT_INSTALLED_DIR}
-    -DARROW_ZLIB_VENDORED=ON
-    -DBROTLI_HOME=${CURRENT_INSTALLED_DIR}
-    -DLZ4_HOME=${CURRENT_INSTALLED_DIR}
-    -DZSTD_HOME=${CURRENT_INSTALLED_DIR}
-    -DSNAPPY_HOME=${CURRENT_INSTALLED_DIR}
     -DBOOST_ROOT=${CURRENT_INSTALLED_DIR}
-    -DGFLAGS_HOME=${CURRENT_INSTALLED_DIR}
-    -DZLIB_HOME=${CURRENT_INSTALLED_DIR}
     -DARROW_PARQUET=ON
     -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
     -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
     -DBUILD_STATIC=${ARROW_BUILD_STATIC}
     -DBUILD_SHARED=${ARROW_BUILD_SHARED}
     -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE}
-    -DDOUBLE_CONVERSION_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_BOOST_USE_SHARED=${BOOST_USE_SHARED}
-    -DGLOG_HOME=${CURRENT_INSTALLED_DIR}
+    -DARROW_USE_STATIC_CRT=${USE_STATIC_CRT}
+    -DARROW_GFLAGS_USE_SHARED=off
+    -DARROW_JEMALLOC=off
 )
 
 vcpkg_install_cmake()
@@ -70,6 +68,15 @@ if(WIN32)
     endif()
 endif()
 
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/arrow/cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfig.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfig.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfigVersion.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfigVersion.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets-release.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-release.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets.cmake)
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/arrow/arrowTargets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-debug.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/arrow RENAME copyright)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

ports/brunocodutra-metal/CONTROL

@@ -0,0 +1,3 @@
+Source: brunocodutra-metal
+Version: v2.0.1-1
+Description: A single header C++11 library designed to make you love template metaprogramming

ports/brunocodutra-metal/portfile.cmake

@@ -0,0 +1,31 @@
+# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO brunocodutra/metal
+    REF v2.0.1
+    SHA512 6aca54e2f2a6d99466d247dbd57706caef33d2399989c2eb14e99d1419922eff753acb53248f8684c1ed11bb87d79b2e850637190e8949f69e0f5ee7304281dc
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+    CONFIG_PATH lib/cmake/Metal
+    TARGET_PATH share/metal
+)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})

ports/cgal/CONTROL

@@ -1,6 +1,6 @@
 Source: cgal
-Version: 4.13-3
+Version: 4.14-1
-Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic
+Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision
 Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.
 
 Feature: qt

ports/cgal/portfile.cmake

@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO CGAL/cgal
-    REF releases/CGAL-4.13
+    REF releases/CGAL-4.14
-    SHA512 3a12d7f567487c282928a162a47737c41c22258556ca0083b9cf492fc8f0a7c334b491b14dbfd6a62e71feeeb1b4995769c13a604e0882548f21c41b996d4eaf
+    SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382
     HEAD_REF master
 )
 
@@ -49,11 +49,6 @@ else()
     endforeach()
 endif()
 
-file(READ ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake _contents)
-string(REPLACE "CGAL_IGNORE_PRECONFIGURED_GMP" "1" _contents "${_contents}")
-string(REPLACE "CGAL_IGNORE_PRECONFIGURED_MPFR" "1" _contents "${_contents}")
-
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/cgal/CGALConfig.cmake "${_contents}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/lib/cgal/CGALConfig.cmake "include (\$\{CMAKE_CURRENT_LIST_DIR\}/../../share/cgal/CGALConfig.cmake)")
 
 file(COPY ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal)
@@ -67,3 +62,5 @@ file(
         ${SOURCE_PATH}/Installation/LICENSE.LGPL
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/cgal
 )
+
+vcpkg_test_cmake(PACKAGE_NAME CGAL)

ports/curl/CONTROL

@@ -1,5 +1,5 @@
 Source: curl
-Version: 7.61.1-3
+Version: 7.61.1-5
 Build-Depends: zlib
 Description: A library for transferring data with URLs
 Default-Features: ssl

ports/curl/portfile.cmake

@@ -107,10 +107,23 @@ endif()
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl.exe")
+# the native CMAKE_EXECUTABLE_SUFFIX does not work in portfiles, so emulate it
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows
+	set(EXECUTABLE_SUFFIX ".exe")
+else()
+	set(EXECUTABLE_SUFFIX "")
+endif()
+
+if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}")
     file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/curl")
-    file(RENAME ${CURRENT_PACKAGES_DIR}/bin/curl.exe ${CURRENT_PACKAGES_DIR}/tools/curl/curl.exe)
+    file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/curl/curl${EXECUTABLE_SUFFIX}")
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl)
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" RELEASE_MODULE)
+        string(REPLACE "\${_IMPORT_PREFIX}/bin/curl${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/curl/curl${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" "${RELEASE_MODULE}")
+    endif()
 endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -118,14 +131,26 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     # Drop debug suffix, as FindCURL.cmake does not look for it
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib")
         file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
+        # Fixup libcurl-target-debug.cmake to match
+        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE)
+        string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}")
     endif()
 else()
     file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config)
     if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib")
         file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib ${CURRENT_PACKAGES_DIR}/lib/libcurl.lib)
+        # Fixup libcurl-target-release.cmake to match
+        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" RELEASE_MODULE)
+        string(REPLACE "\${_IMPORT_PREFIX}/lib/libcurl_imp.lib" "\${_IMPORT_PREFIX}/lib/libcurl.lib" RELEASE_MODULE "${RELEASE_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" "${RELEASE_MODULE}")
     endif()
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib")
         file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib)
+        # Fixup libcurl-target-debug.cmake to match
+        file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE)
+        string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d_imp.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}")
+        file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}")
     endif()
 endif()
 

ports/darknet/CONTROL

@@ -1,5 +1,5 @@
 Source: darknet
-Version: 1.0.0-1
+Version: 1.0.0-2
 Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
 Build-Depends: pthreads (windows), stb
 Default-Features: weights
@@ -16,5 +16,5 @@ Feature: weights
 Description: Download common weights from official websites, using vcpkg proxy-enabled functions
 
 Feature: opencv-cuda
-Build-Depends: darknet[cuda], opencv[cuda]
+Build-Depends: opencv[cuda]
 Description: Build darknet with support for a CUDA-enabled OpenCV

ports/darknet/fix_cmakelists.patch

@@ -1,18 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a5076a..52d19a3 100644
+index acd6ca0..0e7de91 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -25,8 +25,7 @@ enable_language(CXX)
+@@ -28,8 +28,7 @@ enable_language(CXX)
  set(CMAKE_CXX_STANDARD 11)
  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
  
 -set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix" FORCE)
 -set(INSTALL_BIN_DIR      "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Path where exe and dll will be installed" FORCE)
-+set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed" FORCE)
++set(INSTALL_BIN_DIR      "bin"                       CACHE PATH "Path where exe and dll will be installed")
  set(INSTALL_LIB_DIR      "lib"                       CACHE PATH "Path where lib will be installed")
  set(INSTALL_INCLUDE_DIR  "include"                   CACHE PATH "Path where headers will be installed")
  set(INSTALL_CMAKE_DIR    "share/darknet"             CACHE PATH "Path where cmake configs will be installed")
-@@ -76,7 +75,6 @@ if(USE_INTEGRATED_LIBS)
+@@ -79,7 +78,6 @@ if(USE_INTEGRATED_LIBS)
    set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located")
    add_definitions(-D_TIMESPEC_DEFINED)
  endif()
@@ -20,30 +20,3 @@ index 6a5076a..52d19a3 100644
  
  set(CMAKE_DEBUG_POSTFIX d)
  add_definitions(-DUSE_CMAKE_LIBS)
-@@ -323,21 +321,19 @@ endif()
- 
- set_target_properties(darklib PROPERTIES PUBLIC_HEADER "${exported_headers};${CMAKE_CURRENT_LIST_DIR}/include/yolo_v2_class.hpp")
- 
--install(TARGETS darklib uselib darknet EXPORT DarknetTargets
-+install(TARGETS darklib EXPORT DarknetTargets
-   RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
-   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-   ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
-   PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
-   COMPONENT dev
- )
-+install(TARGETS uselib darknet
-+  DESTINATION "${INSTALL_BIN_DIR}"
-+)
- if(OpenCV_VERSION VERSION_GREATER "3.0" AND NOT SKIP_USELIB_TRACK)
-   install(TARGETS uselib_track
--    EXPORT DarknetTargets
--    RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
--    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
--    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
--    PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}"
--    COMPONENT dev
-+    DESTINATION "${INSTALL_BIN_DIR}"
-   )
- endif()
- 

ports/darknet/portfile.cmake

@@ -11,8 +11,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO AlexeyAB/darknet
-  REF 1cd332e4cac001ffcc12a24c72640fe02b69a8a0
+  REF 1cad888641804b1ddddf03ad316aa3a6e9e679ad
-  SHA512 313018d51747b40244d3a828dce8deb35f900a6be1198f0f1af5647f3889ead7f1ac78cdc4223cfe85d279ca21000df1c8feac02e703e5b91af939e26e4d5571
+  SHA512 8d7fc673bc318fd606f7c9de04291cd0fe5c3b8f8d2076e719a6c35fe226a45c10a3f65c38be5476a72b34ac7a31c8f9e1b5ea15d061eddcdda38357bc2a8bca
   HEAD_REF master
   PATCHES
     fix_cmakelists.patch
@@ -28,6 +28,11 @@ if("opencv" IN_LIST FEATURES)
   set(ENABLE_OPENCV ON)
 endif()
 
+if("opencv-cuda" IN_LIST FEATURES)
+  set(ENABLE_OPENCV ON)
+  set(ENABLE_CUDA ON)
+endif()
+
 if("weights" IN_LIST FEATURES)
   vcpkg_download_distfile(YOLOV3_WEIGHTS
     URLS "https://pjreddie.com/media/files/yolov3.weights"

ports/date/CONTROL

@@ -1,5 +1,5 @@
 Source: date
-Version: 2.4.1
+Version: 9dc96fd
 Description: A date and time library based on the C++11/14/17 <chrono> header
 
 Feature: remote-api

ports/date/fix-date.patch

@@ -1,36 +0,0 @@
-diff --git a/include/date/tz.h b/include/date/tz.h
-index 280a598..f9b5a35 100644
---- a/include/date/tz.h
-+++ b/include/date/tz.h
-@@ -1963,7 +1963,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-         bool is_60_sec = fds.tod.seconds() == seconds{60};
-         if (is_60_sec)
-             fds.tod.seconds() -= seconds{1};
--        auto tmp = to_utc_time(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
-+        auto tmp = utc_clock::from_sys(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
-         if (is_60_sec)
-             tmp += seconds{1};
-         if (is_60_sec != is_leap_second(tmp).first || !fds.tod.in_conventional_range())
-@@ -2197,7 +2197,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-     return is;
- }
- 
--#if !defined(_MSC_VER) || _MSC_VER > 1912
-+#if !defined(_MSC_VER) || _MSC_VER > 1913
- 
- // clock_time_conversion
- 
-@@ -2471,7 +2471,7 @@ clock_cast(const std::chrono::time_point<SrcClock, Duration>& tp)
-     return clock_cast_detail::cc_impl<DstClock>(tp, &tp);
- }
- 
--#endif  // !defined(_MSC_VER) || _MSC_VER > 1912
-+#endif  // !defined(_MSC_VER) || _MSC_VER > 1913
- 
- // Deprecated API
- 
-@@ -2579,3 +2579,4 @@ to_gps_time(const tai_time<Duration>& t)
- }  // namespace date
- 
- #endif  // TZ_H
-+

ports/date/portfile.cmake

@@ -10,16 +10,11 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO HowardHinnant/date
-  REF v2.4.1
+  REF 9dc96fd9b5e4e1e7885aa80dc24a3ceb407c3730
-  SHA512 ce7d1c4518558d3690b3a33cd3da1066b43a5f641282c331c60be73e9b010227d4998bca5f34694215ae52f6514a2f5eccd6b0a5ee3dcf8cef2f2d1644c8beee
+  SHA512 1acb78f1ae7f5b1278a9e034fa5ccbb64643ad381ef9bd76bf42fb04d714c6742f2129b6892024cd98bb925e1a6136337fccb636e3f991b428be1ed05ab8901e
   HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-date.patch
-)
-
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 set(HAS_REMOTE_API 0)

ports/ebml/CONTROL

@@ -1,3 +1,3 @@
 Source: ebml
-Version: 1.3.6-1
+Version: 1.3.7
 Description: a C++ libary to parse EBML files

ports/ebml/portfile.cmake

@@ -4,12 +4,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
 
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Matroska-Org/libebml
-    REF release-1.3.6
+    REF release-1.3.7
-    SHA512 249ff2e9b381d827311eaec910962685243a3b65335c7bd404a35e11cd204c63bc7ea69787f0e27ea9c9144024e45867fd4ae7d30688a3695cd45fee1ce89ec9
+    SHA512 754dee128db2eb6f0ba09962312ddda79f3178238464dd6161cce50bd08fd4193490a48bb537c4e2a388dc339951909a8857617cb30500d76d5689da4f855b47
     HEAD_REF master
     PATCHES export-endofstreamx.patch
 )
@@ -22,7 +21,11 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+if (WIN32)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else ()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ebml)
+endif ()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 

ports/effolkronium-random/CONTROL

@@ -1,3 +1,3 @@
 Source: effolkronium-random
-Version: 1.2.0
+Version: 1.3.0
 Description: Random with a modern C++ API

ports/effolkronium-random/portfile.cmake

@@ -3,14 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO effolkronium/random
-    REF v1.2.0
+    REF v1.3.0
-    SHA512 92c5447196601d7dfb0320b517494f4e75cb55011c800cd2f18655cd4ab867672ad39830a3dbb3fc5f39a41c8ae03b6a6910f1eac4a2f131cffca896554be561
+    SHA512 68bd42e696a784832376950df7df9ddc8fc52ad073f44eddc7bcc2547278096ad3ec6463ce3a0e2e60a223e0852e68be4c2e9bcec4b237b9017ac2b03d5be812
     HEAD_REF master
 )
 
-vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt "effolkronium_random" "effolkronium-random")
-vcpkg_replace_string(${SOURCE_PATH}/cmake/config.cmake.in "effolkronium_random" "effolkronium-random")
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -19,7 +16,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium-random)
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium_random)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/effolkronium-random RENAME copyright)

ports/fcl/CONTROL

@@ -1,4 +1,4 @@
 Source: fcl
-Version: 0.5.0-3
+Version: 0.5.0-4
 Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
 Build-Depends: ccd, octomap

ports/fcl/portfile.cmake

@@ -36,7 +36,12 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/")
+if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake")
+else()
+  vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fcl")
+endif()
+
 
 file(READ ${CURRENT_PACKAGES_DIR}/share/fcl/fclConfig.cmake FCL_CONFIG)
 string(REPLACE "unset(_expectedTargets)"

ports/ffmpeg/CONTROL

@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-1
+Version: 4.1-3
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.
 

ports/ffmpeg/FindFFMPEG.cmake

@@ -6,6 +6,8 @@ foreach(FFMPEG_SUBLIBRARY avformat avdevice avcodec avutil swscale)
   find_library(FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY NAMES ${FFMPEG_SUBLIBRARY})
   list(APPEND FFMPEG_LIBRARIES ${FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY})
 endforeach()
-list(APPEND FFMPEG_LIBRARIES wsock32 ws2_32 Secur32)
+if(WIN32)
+  list(APPEND FFMPEG_LIBRARIES wsock32 ws2_32 Secur32)
+endif()
 
 find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)

ports/ffmpeg/build_linux.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/bash
+set -e
+export PATH=/usr/bin:$PATH
+# Export HTTP(S)_PROXY as http(s)_proxy:
+if [ "$HTTP_PROXY" ]; then
+    export http_proxy=$HTTP_PROXY
+fi
+if [ "$HTTPS_PROXY" ]; then
+    export https_proxy=$HTTPS_PROXY
+fi
+
+PATH_TO_BUILD_DIR=$1
+PATH_TO_SRC_DIR=$2
+PATH_TO_PACKAGE_DIR=$3
+# Note: $4 is extra configure options
+
+cd "$PATH_TO_BUILD_DIR"
+echo "=== CONFIGURING ==="
+"$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" $4
+echo "=== BUILDING ==="
+make -j6
+echo "=== INSTALLING ==="
+make install

ports/ffmpeg/configure_opencv.patch

@@ -1,11 +1,11 @@
 --- a/configure
 +++ b/configure
-@@ -5804,7 +5804,7 @@
+@@ -6110,7 +6110,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec
  enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- enabled libopencv         && { check_header opencv2/core/core_c.h &&
+ enabled libopencv         && { check_headers opencv2/core/core_c.h &&
-                                { use_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader ||
+                                { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
--                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+-                                 require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
 +                                 require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core341 -lopencv_imgproc341; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+ enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
- enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||

ports/ffmpeg/detect-openssl.patch

@@ -12,14 +12,11 @@ diff --git a/configure b/configure
 index a1818dc..1cf2a7c 100755
 --- a/configure
 +++ b/configure
-@@ -5836,6 +5836,7 @@ enabled openssl           && { use_pkg_config openssl openssl/ssl.h OPENSSL_init
+@@ -6127,6 +6127,7 @@
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
-                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
-+                               check_lib openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -llibeay32 -lssleay32 ||
                                 die "ERROR: openssl not found"; }
- enabled qtkit_indev      && { check_header_objcc QTKit/QTKit.h || disable qtkit_indev; }
+ enabled rkmpp             && { require_pkg_config rkmpp rockchip_mpp  rockchip/rk_mpi.h mpp_create &&
- 
+                                require_pkg_config rockchip_mpp "rockchip_mpp >= 1.3.7" rockchip/rk_mpi.h mpp_create &&
--- 
-2.10.1.windows.1
-

ports/ffmpeg/portfile.cmake

@@ -21,14 +21,24 @@ vcpkg_apply_patches(
 
 vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
-set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+if (WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make)
+    set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
+    set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
+
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make)
+    else()
+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make)
+    endif()
+    
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 else()
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make)
+    set(ENV{PATH} "$ENV{PATH}:${YASM_EXE_PATH}")
+    set(BASH /bin/bash)
+    set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/build_linux.sh)
 endif()
-set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+
 set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
 set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
 
@@ -122,18 +132,20 @@ endif()
 
 message(STATUS "Building Options: ${OPTIONS}")
 
-if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+if(WIN32)
-    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd")
+    if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-    set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD")
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd")
-else()
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD")
-    set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd")
+    else()
-    set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT")
+        set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd")
+        set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT")
+    endif()
 endif()
 
 message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
 vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+    COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" # BUILD DIR
         "${SOURCE_PATH}" # SOURCE DIR
         "${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
@@ -145,7 +157,7 @@ vcpkg_execute_required_process(
 message(STATUS "Building ${_csc_PROJECT_PATH} for Debug")
 file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
 vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc "${CMAKE_CURRENT_LIST_DIR}\\build.sh"
+    COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
         "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" # BUILD DIR
         "${SOURCE_PATH}" # SOURCE DIR
         "${CURRENT_PACKAGES_DIR}/debug" # PACKAGE DIR

ports/fftw3/CONTROL

@@ -1,5 +1,5 @@
 Source: fftw3
-Version: 3.3.8-2
+Version: 3.3.8-3
 Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
 
 Feature: openmp

ports/fftw3/fftw3_arch_fix.patch

@@ -1,8 +1,8 @@
-diff --git a/CMakeLists - Kopie.txt b/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95bd537a..245acc8f 100644
+index 95bd537a..245acc8f 100644
---- a/CMakeLists - Kopie.txt	
+--- a/CMakeLists.txt	
-+++ b/CMakeLists.txt
++++ b/CMakeLists.txt
-@@ -131,6 +131,7 @@ endif ()
+@@ -131,6 +131,7 @@ endif ()
  
  include (CheckCCompilerFlag)
  
@@ -10,7 +10,7 @@ index 95bd537a..245acc8f 100644
  if (ENABLE_SSE)
    foreach (FLAG "-msse" "/arch:SSE")
      unset (HAVE_SSE CACHE)
-@@ -176,8 +177,9 @@ if (ENABLE_AVX2)
+@@ -176,8 +177,9 @@ if (ENABLE_AVX2)
  endif ()
  
  # AVX2 codelets require FMA support as well

ports/folly/portfile.cmake

@@ -82,10 +82,10 @@ set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake
 FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
 STRING(REPLACE 
 [[
-"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib;${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib;${_IMPORT_PREFIX}/lib/double-conversion.lib;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;${_IMPORT_PREFIX}/lib/zlib.lib;gflags;glog::glog;event"
+"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;${_IMPORT_PREFIX}/lib/double-conversion.lib;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
 ]]
 [[
-"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/double-conversion.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/double-conversion.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/ssleay32.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/ssleay32.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/libeay32.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/libeay32.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
+"Threads::Threads;Iphlpapi.lib;Ws2_32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_context-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_context-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_chrono-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_chrono-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_date_time-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_date_time-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_filesystem-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_filesystem-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_program_options-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_program_options-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_regex-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_regex-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_system-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_system-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_thread-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_thread-vc140-mt-gd.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/boost_atomic-vc140-mt.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/boost_atomic-vc140-mt-gd.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/double-conversion.lib>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/double-conversion.lib>;${_IMPORT_PREFIX}/lib/ssleay32.lib;${_IMPORT_PREFIX}/lib/libeay32.lib;\$<\$<NOT:\$<CONFIG:DEBUG>>:${_IMPORT_PREFIX}/lib/zlib.lib>;\$<\$<CONFIG:DEBUG>:${_IMPORT_PREFIX}/debug/lib/zlibd.lib>;gflags;glog::glog;event"
 ]]
     _contents "${_contents}")
 FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")

ports/freeimage/CONTROL

@@ -1,4 +1,4 @@
 Source: freeimage
-Version: 3.18.0-4
+Version: 3.18.0-5
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr
+Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp[all], libraw, jxrlib, openexr
 Description: Support library for graphics image formats

ports/g2o/CONTROL

@@ -1,4 +1,4 @@
 Source: g2o
-Version: 20170730_git-3
+Version: 20170730_git-4
 Build-Depends: suitesparse, eigen3, clapack, ceres
 Description: g2o: A General Framework for Graph Optimization http://openslam.org/g2o.html

ports/g2o/portfile.cmake

@@ -23,6 +23,10 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
+if(VCPKG_USE_HEAD_VERSION)
+	vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/g2o")
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/*")
     foreach(HEADER ${HEADERS})

ports/gdal/CONTROL

@@ -1,5 +1,5 @@
 Source: gdal
-Version: 2.4.0
+Version: 2.4.0-2
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
 

ports/gdal/portfile.cmake

@@ -37,14 +37,23 @@ endif()
 foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
-    vcpkg_apply_patches(
+    if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
+      vcpkg_apply_patches(
-        PATCHES
+          SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
+          PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-static-build.patch
+          ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
-    )
+          ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-static-build.patch
+      )
+    else()
+      vcpkg_apply_patches(
+          SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}
+          PATCHES
+          ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch
+      )
+    endif()
 endforeach()
 
+
 find_program(NMAKE nmake REQUIRED)
 
 file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
@@ -63,8 +72,13 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRA
 
 # Setup geos libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG)
+else()
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL)
+    file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG)
+endif()
 
 # Setup expat libraries + include path
 file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR)
@@ -200,7 +214,7 @@ list(APPEND NMAKE_OPTIONS_DBG
 )
 if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     # Static Build does not like PG_LIB
-    list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_DBG})
+    list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG})
 endif()
 
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")

ports/giflib/portfile.cmake

@@ -22,6 +22,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG
         -DGIFLIB_SKIP_HEADERS=ON
 )

ports/glew/CONTROL

@@ -1,3 +1,3 @@
-Source: glew
+Source: glew
-Version: 2.1.0-1
+Version: 2.1.0-3
-Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
+Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.

ports/glew/portfile.cmake

@@ -3,7 +3,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0)
 
 # Don't change to vcpkg_from_github! The github-auto-generated archives are missing some files.
-# More info: https://github.com/nigels-com/glew/issues/31
+# More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz"
     FILENAME "glew-2.1.0.tgz"
@@ -13,7 +13,10 @@ vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/build/cmake
-)
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DBUILD_UTILS=OFF
+    )
 
 vcpkg_install_cmake()
 
@@ -40,11 +43,6 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib)
     file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib)
 endif()
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/visualinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/glewinfo.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/visualinfo.exe)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)

ports/google-cloud-cpp/CONTROL

@@ -1,4 +1,4 @@
 Source: google-cloud-cpp
-Version: 0.7.0
+Version: 0.8.0-1
-Build-Depends: grpc, curl, crc32c
+Build-Depends: grpc, curl[ssl], crc32c
 Description: C++ Client Libraries for Google Cloud Platform APIs.

ports/google-cloud-cpp/cmake-libcurl-find-config.patch

@@ -0,0 +1,142 @@
+diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
+index 6ea7ca3e6..3c2db6b28 100644
+--- a/cmake/IncludeCurl.cmake
++++ b/cmake/IncludeCurl.cmake
+@@ -34,49 +34,57 @@ set_property(CACHE GOOGLE_CLOUD_CPP_CURL_PROVIDER
+ if ("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "external")
+     include(external/curl)
+ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
+-    # Search for libcurl, in CMake 3.5 this does not define a target, but it
+-    # will in 3.12 (see https://cmake.org/cmake/help/git-
+-    # stage/module/FindCURL.html for details).  Until then, define the target
+-    # ourselves if it is missing.
+-    find_package(CURL REQUIRED)
+-    if (NOT TARGET CURL::libcurl)
+-        add_library(CURL::libcurl UNKNOWN IMPORTED)
+-        set_property(TARGET CURL::libcurl
+-                     APPEND
+-                     PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+-                              "${CURL_INCLUDE_DIR}")
+-        set_property(TARGET CURL::libcurl
+-                     APPEND
+-                     PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+-    endif ()
+-    # If the library is static, we need to explicitly link its dependencies.
+-    # However, we should not do so for shared libraries, because the version of
+-    # OpenSSL (for example) found by find_package() may be newer than the
+-    # version linked against libcurl.
+-    if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+-        find_package(OpenSSL REQUIRED)
+-        find_package(ZLIB REQUIRED)
+-        set_property(TARGET CURL::libcurl
+-                     APPEND
+-                     PROPERTY INTERFACE_LINK_LIBRARIES
+-                              OpenSSL::SSL
+-                              OpenSSL::Crypto
+-                              ZLIB::ZLIB)
+-        message(STATUS "CURL linkage will be static")
+-        if (WIN32)
++    # Search for libcurl, first using CONFIG mode, and retrying
++    # using MODULE mode if that fails
++    find_package(CURL CONFIG QUIET) # Deliberately quiet, so we can handle the result
++    if(CURL_FOUND)
++        message(STATUS "CURL library found via CONFIG mode")
++    else()
++        # CONFIG mode failed - fallback to MODULE mode
++        # In CMake 3.5 this does not define a target, but it
++        # will in 3.12 (see https://cmake.org/cmake/help/git-
++        # stage/module/FindCURL.html for details).  Until then, define the target
++        # ourselves if it is missing.
++        find_package(CURL MODULE REQUIRED) # Use REQUIRED the second time to fail out
++        if (NOT TARGET CURL::libcurl)
++            add_library(CURL::libcurl UNKNOWN IMPORTED)
+             set_property(TARGET CURL::libcurl
+                          APPEND
+-                         PROPERTY INTERFACE_LINK_LIBRARIES
+-                                  crypt32
+-                                  wsock32
+-                                  ws2_32)
++                         PROPERTY INTERFACE_INCLUDE_DIRECTORIES
++                                  "${CURL_INCLUDE_DIR}")
++            set_property(TARGET CURL::libcurl
++                         APPEND
++                         PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+         endif ()
+-        if (APPLE)
++        # If the library is static, we need to explicitly link its dependencies.
++        # However, we should not do so for shared libraries, because the version of
++        # OpenSSL (for example) found by find_package() may be newer than the
++        # version linked against libcurl.
++        if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
++            find_package(OpenSSL REQUIRED)
++            find_package(ZLIB REQUIRED)
+             set_property(TARGET CURL::libcurl
+                          APPEND
+-                         PROPERTY INTERFACE_LINK_LIBRARIES ldap)
++                         PROPERTY INTERFACE_LINK_LIBRARIES
++                                  OpenSSL::SSL
++                                  OpenSSL::Crypto
++                                  ZLIB::ZLIB)
++            message(STATUS "CURL linkage will be static")
++            if (WIN32)
++                set_property(TARGET CURL::libcurl
++                             APPEND
++                             PROPERTY INTERFACE_LINK_LIBRARIES
++                                      crypt32
++                                      wsock32
++                                      ws2_32)
++            endif ()
++            if (APPLE)
++                set_property(TARGET CURL::libcurl
++                             APPEND
++                             PROPERTY INTERFACE_LINK_LIBRARIES ldap)
++            endif ()
++        else()
++            message(STATUS "CURL linkage will be non-static")
+         endif ()
+-    else()
+-        message(STATUS "CURL linkage will be non-static")
+     endif ()
+ endif ()
+diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
+index a4d261815..640089e09 100644
+--- a/google/cloud/storage/config.cmake.in
++++ b/google/cloud/storage/config.cmake.in
+@@ -13,21 +13,25 @@
+ # limitations under the License.
+ 
+ include(CMakeFindDependencyMacro)
+-find_dependency(CURL)
++# Search for libcurl, first using CONFIG mode, and retrying
++# using MODULE mode if that fails
++find_package(CURL CONFIG QUIET) # find_package so we can explicitly specify QUIET
++if(NOT CURL_FOUND)
++    find_dependency(CURL MODULE)
++    # Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
++    if (NOT TARGET CURL::libcurl)
++        add_library(CURL::libcurl UNKNOWN IMPORTED)
++        set_property(TARGET CURL::libcurl
++                     APPEND
++                     PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
++        set_property(TARGET CURL::libcurl
++                     APPEND
++                     PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
++    endif ()
++endif()
+ find_dependency(Crc32c)
+ find_dependency(google_cloud_cpp_common)
+ find_dependency(OpenSSL)
+ find_dependency(ZLIB)
+ 
+-# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
+-if (NOT TARGET CURL::libcurl)
+-    add_library(CURL::libcurl UNKNOWN IMPORTED)
+-    set_property(TARGET CURL::libcurl
+-                 APPEND
+-                 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
+-    set_property(TARGET CURL::libcurl
+-                 APPEND
+-                 PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+-endif ()
+-
+ include("${CMAKE_CURRENT_LIST_DIR}/storage-targets.cmake")

ports/google-cloud-cpp/cmake-libcurl-target.patch

@@ -0,0 +1,144 @@
+diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake
+index d3323e3b8..6ea7ca3e6 100644
+--- a/cmake/IncludeCurl.cmake
++++ b/cmake/IncludeCurl.cmake
+@@ -39,13 +39,13 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
+     # stage/module/FindCURL.html for details).  Until then, define the target
+     # ourselves if it is missing.
+     find_package(CURL REQUIRED)
+-    if (NOT TARGET CURL::CURL)
+-        add_library(CURL::CURL UNKNOWN IMPORTED)
+-        set_property(TARGET CURL::CURL
++    if (NOT TARGET CURL::libcurl)
++        add_library(CURL::libcurl UNKNOWN IMPORTED)
++        set_property(TARGET CURL::libcurl
+                      APPEND
+                      PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+                               "${CURL_INCLUDE_DIR}")
+-        set_property(TARGET CURL::CURL
++        set_property(TARGET CURL::libcurl
+                      APPEND
+                      PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+     endif ()
+@@ -56,7 +56,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
+     if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+         find_package(OpenSSL REQUIRED)
+         find_package(ZLIB REQUIRED)
+-        set_property(TARGET CURL::CURL
++        set_property(TARGET CURL::libcurl
+                      APPEND
+                      PROPERTY INTERFACE_LINK_LIBRARIES
+                               OpenSSL::SSL
+@@ -64,7 +64,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
+                               ZLIB::ZLIB)
+         message(STATUS "CURL linkage will be static")
+         if (WIN32)
+-            set_property(TARGET CURL::CURL
++            set_property(TARGET CURL::libcurl
+                          APPEND
+                          PROPERTY INTERFACE_LINK_LIBRARIES
+                                   crypt32
+@@ -72,7 +72,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package")
+                                   ws2_32)
+         endif ()
+         if (APPLE)
+-            set_property(TARGET CURL::CURL
++            set_property(TARGET CURL::libcurl
+                          APPEND
+                          PROPERTY INTERFACE_LINK_LIBRARIES ldap)
+         endif ()
+diff --git a/cmake/external/curl.cmake b/cmake/external/curl.cmake
+index 54753ada9..2a83e19df 100644
+--- a/cmake/external/curl.cmake
++++ b/cmake/external/curl.cmake
+@@ -88,10 +88,10 @@ if (NOT TARGET curl_project)
+     endif ()
+ 
+     include(ExternalProjectHelper)
+-    add_library(CURL::CURL INTERFACE IMPORTED)
+-    add_dependencies(CURL::CURL curl_project)
+-    set_library_properties_for_external_project(CURL::CURL curl)
+-    set_property(TARGET CURL::CURL
++    add_library(CURL::libcurl INTERFACE IMPORTED)
++    add_dependencies(CURL::libcurl curl_project)
++    set_library_properties_for_external_project(CURL::libcurl curl)
++    set_property(TARGET CURL::libcurl
+                  APPEND
+                  PROPERTY INTERFACE_LINK_LIBRARIES
+                           c-ares::cares
+@@ -99,7 +99,7 @@ if (NOT TARGET curl_project)
+                           OpenSSL::Crypto
+                           ZLIB::ZLIB)
+     if (WIN32)
+-        set_property(TARGET CURL::CURL
++        set_property(TARGET CURL::libcurl
+                      APPEND
+                      PROPERTY INTERFACE_LINK_LIBRARIES
+                               crypt32
+@@ -107,7 +107,7 @@ if (NOT TARGET curl_project)
+                               ws2_32)
+     endif ()
+     if (APPLE)
+-        set_property(TARGET CURL::CURL
++        set_property(TARGET CURL::libcurl
+                      APPEND
+                      PROPERTY INTERFACE_LINK_LIBRARIES ldap)
+     endif ()
+diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
+index 1e750af8a..a0a04caab 100644
+--- a/google/cloud/storage/CMakeLists.txt
++++ b/google/cloud/storage/CMakeLists.txt
+@@ -226,7 +226,7 @@ target_link_libraries(storage_client
+                       PUBLIC google_cloud_cpp_common
+                              nlohmann_json
+                              Crc32c::crc32c
+-                             CURL::CURL
++                             CURL::libcurl
+                              Threads::Threads
+                              OpenSSL::SSL
+                              OpenSSL::Crypto
+@@ -396,7 +396,7 @@ if (BUILD_TESTING)
+                                           GTest::gmock_main
+                                           GTest::gmock
+                                           GTest::gtest
+-                                          CURL::CURL
++                                          CURL::libcurl
+                                           storage_common_options
+                                           nlohmann_json)
+             if (MSVC)
+diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in
+index 660829ae4..a4d261815 100644
+--- a/google/cloud/storage/config.cmake.in
++++ b/google/cloud/storage/config.cmake.in
+@@ -19,13 +19,13 @@ find_dependency(google_cloud_cpp_common)
+ find_dependency(OpenSSL)
+ find_dependency(ZLIB)
+ 
+-# Some versions of FindCURL do not define CURL::CURL, so we define it ourselves.
+-if (NOT TARGET CURL::CURL)
+-    add_library(CURL::CURL UNKNOWN IMPORTED)
+-    set_property(TARGET CURL::CURL
++# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves.
++if (NOT TARGET CURL::libcurl)
++    add_library(CURL::libcurl UNKNOWN IMPORTED)
++    set_property(TARGET CURL::libcurl
+                  APPEND
+                  PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
+-    set_property(TARGET CURL::CURL
++    set_property(TARGET CURL::libcurl
+                  APPEND
+                  PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}")
+ endif ()
+diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt
+index 9e5fb663d..987958396 100644
+--- a/google/cloud/storage/tests/CMakeLists.txt
++++ b/google/cloud/storage/tests/CMakeLists.txt
+@@ -50,7 +50,7 @@ foreach (fname ${storage_client_integration_tests})
+                                   GTest::gmock_main
+                                   GTest::gmock
+                                   GTest::gtest
+-                                  CURL::CURL
++                                  CURL::libcurl
+                                   Threads::Threads
+                                   nlohmann_json
+                                   storage_common_options)

ports/google-cloud-cpp/portfile.cmake

@@ -5,22 +5,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO GoogleCloudPlatform/google-cloud-cpp
-    REF v0.7.0
+    REF v0.8.0
-    SHA512 8e01096b569e78f74ee0015fa7f04729354f9001234acd098333c883247ede209582c929903460264f1155bfa0225837fd770f75ba021f8287cafa78e87e6975
+    SHA512 cdb527169c7badab395eb38ba554022a364a99b9cb32705bf69a9613cee74acc1e2402e00ffdcb740467e85603e617f73b01e557afeb1f2786872f8d60f3a75a
     HEAD_REF master
+	PATCHES
+		cmake-libcurl-target.patch # Not needed _after_ v0.8.0
+		cmake-libcurl-find-config.patch
 )
 
-set(GOOGLEAPIS_VERSION 6a3277c0656219174ff7c345f31fb20a90b30b97)
-vcpkg_download_distfile(GOOGLEAPIS
-    URLS "https://github.com/google/googleapis/archive/${GOOGLEAPIS_VERSION}.zip"
-    FILENAME "googleapis-${GOOGLEAPIS_VERSION}.zip"
-    SHA512 809b7cf0429df9867c8ab558857785e9d7d70aea033c6d588b60d29d2754001e9aea5fcdd8cae22fad8145226375bedbd1516d86af7d1e9731fffea331995ad9
-)
-
-file(REMOVE_RECURSE ${SOURCE_PATH}/third_party)
-vcpkg_extract_source_archive(${GOOGLEAPIS} ${SOURCE_PATH}/third_party)
-file(RENAME ${SOURCE_PATH}/third_party/googleapis-${GOOGLEAPIS_VERSION} ${SOURCE_PATH}/third_party/googleapis)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -35,6 +27,7 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
 
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/google-cloud-cpp RENAME copyright)
 
 vcpkg_copy_pdbs()

ports/hdf5/CONTROL

@@ -1,5 +1,5 @@
 Source: hdf5
-Version: 1.10.5-1
+Version: 1.10.5-4
 Description: HDF5 is a data model, library, and file format for storing and managing data
 Build-Depends: zlib, szip
 

ports/hdf5/portfile.cmake

@@ -3,13 +3,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 include(vcpkg_common_functions)
-#set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.5/hdf5-1.10.5)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.5/src/CMake-hdf5-1.10.5.tar.gz"
     FILENAME "CMake-hdf5-1.10.5.tar.gz"
-    SHA512  a25ea28d7a511f9184d97b5b8cd4c6d52dcdcad2bffd670e24a1c9a6f98b03108014a853553fa2b00d4be7523128b5fd6a4454545e3b17ff8c66fea16a09e962
+    SHA512 a25ea28d7a511f9184d97b5b8cd4c6d52dcdcad2bffd670e24a1c9a6f98b03108014a853553fa2b00d4be7523128b5fd6a4454545e3b17ff8c66fea16a09e962
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -32,11 +30,12 @@ else()
     set(ENABLE_CPP OFF)
 endif()
 
-#Note: HDF5 Builds by default static as well as shared libraries set BUILD_SHARED_LIBS to OFF to only get static libraries
+#Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
         -DBUILD_TESTING=OFF
@@ -55,14 +54,15 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/hdf5/copyright)
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/hdf5)
 
 #Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/hdf5/data/COPYING ${CURRENT_PACKAGES_DIR}/share/hdf5/copyright)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/hdf5/vcpkg-cmake-wrapper.cmake @ONLY)

ports/hdf5/vcpkg-cmake-wrapper.cmake

@@ -0,0 +1,15 @@
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
+    cmake_policy(PUSH)
+    cmake_policy(SET CMP0057 NEW)
+    if(NOT "CONFIG" IN_LIST ARGS AND NOT "NO_MODULE" IN_LIST ARGS AND "HDF5" IN_LIST ARGS)
+        # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
+        if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+            set(HDF5_USE_STATIC_LIBRARIES ON)
+        else()
+            set(HDF5_USE_STATIC_LIBRARIES OFF)
+        endif()
+    endif()
+    cmake_policy(POP)
+endif()
+_find_package(${ARGS})

ports/highfive/CONTROL

@@ -1,4 +1,4 @@
 Source: highfive
-Version: 1.5-1
+Version: 2.0
 Description: HighFive is a modern C++/C++11 friendly interface for libhdf5
 Build-Depends: hdf5

ports/highfive/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BlueBrain/HighFive
-    REF v1.5
+    REF v2.0
-    SHA512 4133ec2768f54cb3e56c32f3193d6c61ea96013dc73901c39d31ecaf10b04ea2861b0f6f5c9795985050ef72a75e2d360a4b906c9cdeb8ee49309961e15d39bf
+    SHA512 d6bc38ae421adfa3cb9ee761ec92819bebe385cb100a8227bd9ff436cd7ae31725a96264a7963cfe5ce806cdd3b7978a8a630e9312c1567f6df6029062c6b8a0
     HEAD_REF master
 )
 
@@ -28,7 +28,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
-if(NOT WIN32)
+if(NOT WIN32 AND NOT APPLE)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/HighFive)
 endif()
 

ports/inja/CONTROL

@@ -1,4 +1,4 @@
 Source: inja
-Version: 1.0.0
+Version: 2.1.0
 Build-Depends: nlohmann-json
 Description: Inja - A Template Engine for Modern C++

ports/inja/portfile.cmake

@@ -2,10 +2,10 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pantor/inja
-    REF v1.0.0
+    REF v2.1.0
-    SHA512 39598df84766a0d2a28dc92e083e27b7072600372e0313727cd5dd1fe6ad1efc055dc98055247f5cb1fc4096ffb37b59995107f3456a4495bd01381ac6c74a2b
+    SHA512 6b3a3a6a9e2adff14083a8e83c95fdc5ccf0c930acff40c4cf6c11d67b0df18fd941307e5d1f0c45dcfcb4c4afd0026b718ca510a2b297b9c6be048f5b144d42
     HEAD_REF master
 )
-file(INSTALL ${SOURCE_PATH}/src/inja.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL ${SOURCE_PATH}/single_include/inja/inja.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-file(INSTALL ${SOURCE_PATH}/src/inja.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/inja RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/single_include/inja/inja.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/inja RENAME copyright)
 vcpkg_copy_pdbs()

ports/itk/CONTROL

@@ -1,7 +1,7 @@
 Source: itk
-Version: 4.13.0-2
+Version: 4.13.0-906736bd
 Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
-Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, hdf5[cpp]
+Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp]
 
 Feature: vtk
 Description: Build ITKVtkGlue module.

ports/itk/portfile.cmake

@@ -3,16 +3,15 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
-    REF d92873e33e8a54e933e445b92151191f02feab42
+    REF 906736bd453e95ccf03b318d3d07cb7884285161
-    SHA512 0e3ebd27571543e1c497377dd9576a9bb0711129be12131109fe9b3c8413655ad14ce4d9ac6e281bac83c57e6032b614bc9ff53ed357d831544ca52f41513b62
+    SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57
     HEAD_REF master
-    PATCHES hdf5_config_mode_find_package.patch
 )
 
 if ("vtk" IN_LIST FEATURES)
-    set(ITKVtkGlue                     ON )
+    set(ITKVtkGlue ON)
 else()
-    set(ITKVtkGlue                     OFF )
+    set(ITKVtkGlue OFF)
 endif()
 
 # directory path length needs to be shorter than 50 characters
@@ -45,6 +44,7 @@ vcpkg_configure_cmake(
         -DITK_USE_SYSTEM_PNG=ON
         -DITK_USE_SYSTEM_TIFF=ON
         -DITK_USE_SYSTEM_ZLIB=ON
+        -DITK_USE_SYSTEM_EIGEN=ON
         # This should be turned on some day, however for now ITK does download specific versions so it shouldn't spontaneously break
         -DITK_FORBID_DOWNLOADS=OFF
 
@@ -54,8 +54,8 @@ vcpkg_configure_cmake(
         #-DITK_WRAP_PYTHON=ON
         #-DITK_PYTHON_VERSION=3
 
-        -DITK_USE_SYSTEM_HDF5=ON
+        -DITK_USE_SYSTEM_HDF5=ON # HDF5 was problematic in the past
-        -DModule_ITKVtkGlue=${ITKVtkGlue} # this option requires VTK to be a dependency in CONTROL file. VTK depends on HDF5!
+        -DModule_ITKVtkGlue=${ITKVtkGlue} # optional feature
 
         -DModule_IOSTL=ON # example how to turn on a non-default module
         -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module
@@ -68,8 +68,11 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets() # combines release and debug build configurations
 
+file(RENAME ${CURRENT_PACKAGES_DIR}/vcl_compiler_detection.h ${CURRENT_PACKAGES_DIR}/include/ITK-5.0/vcl_compiler_detection.h)
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/vcl_compiler_detection.h)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk)

ports/libharu/CONTROL

@@ -1,4 +1,4 @@
 Source: libharu
-Version: 2017-08-15-d84867ebf9f-4
+Version: 2017-08-15-d84867ebf9f-6
 Description: libharu - free PDF library
 Build-Depends: zlib, libpng

ports/libharu/add-boolean-typedef.patch

@@ -0,0 +1,12 @@
+diff --git a/include/hpdf.h b/include/hpdf.h
+index 1cf0dd9..cce9b59 100644
+--- a/include/hpdf.h
++++ b/include/hpdf.h
+@@ -54,6 +54,7 @@
+ #include "hpdf_types.h"
+ 
+ typedef void         *HPDF_HANDLE;
++typedef HPDF_HANDLE   HPDF_Boolean;
+ typedef HPDF_HANDLE   HPDF_Doc;
+ typedef HPDF_HANDLE   HPDF_Page;
+ typedef HPDF_HANDLE   HPDF_Pages;

ports/libharu/fix-build-fail.patch

@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9d2a604..be8e964 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -79,11 +79,11 @@ if(LIBHPDF_STATIC)
+     LIBRARY DESTINATION lib
+     RUNTIME DESTINATION bin
+   )
+-  if(WIN32 AND NOT CYGWIN)
+-		foreach(addlib ${ADDITIONAL_LIBRARIES})
+-			install(FILES ${addlib} DESTINATION lib)
+-		endforeach(addlib)
+-  endif(WIN32 AND NOT CYGWIN)
++  #if(WIN32 AND NOT CYGWIN)
++		#foreach(addlib ${ADDITIONAL_LIBRARIES})
++			#install(FILES ${addlib} DESTINATION lib)
++		#endforeach(addlib)
++  #endif(WIN32 AND NOT CYGWIN)
+ endif(LIBHPDF_STATIC)
+ if(LIBHPDF_SHARED)
+   add_library(${LIBHPDF_NAME} SHARED ${LIBHPDF_SRCS})

ports/libharu/portfile.cmake

@@ -1,10 +1,22 @@
 include(vcpkg_common_functions)
+
+vcpkg_download_distfile(SHADING_PR
+    URLS "https://github.com/libharu/libharu/pull/157.diff"
+    FILENAME "libharu-shading-pr-157.patch"
+    SHA512 f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libharu/libharu
     REF d84867ebf9f3de6afd661d2cdaff102457fbc371
     SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99
     HEAD_REF master
+    PATCHES
+        fix-build-fail.patch
+        add-boolean-typedef.patch
+        # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature.
+        ${SHADING_PR}
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBHPDF_STATIC)
@@ -20,7 +32,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib ${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib)
        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib)
 endif()

ports/libmodbus/CONTROL

@@ -1,3 +1,3 @@
 Source: libmodbus
-Version: 3.1.4-1
+Version: 3.1.4-2
 Description: libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol

ports/libmodbus/portfile.cmake

@@ -24,3 +24,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodbus RENAME copyright)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

ports/libodb-sqlite/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX)
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
-find_package(sqlite3 REQUIRED)
+find_package(sqlite3 CONFIG)
 configure_file(config.unix.h.in
     ${CMAKE_CURRENT_SOURCE_DIR}/odb/sqlite/details/config.h COPYONLY)
 

ports/libodb-sqlite/CONTROL

@@ -1,4 +1,4 @@
 Source: libodb-sqlite
-Version: 2.4.0-1
+Version: 2.4.0-2
 Description: Sqlite support for the ODB ORM library
 Build-Depends: libodb, sqlite3

ports/libuv/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(libuv C)
 
+find_package(Threads REQUIRED)
+
 file(GLOB UV_SOURCES_COMMON src/*.c)
 
 file(GLOB UV_SOURCES_UNIX
@@ -51,7 +53,7 @@ file(GLOB UV_SOURCES_WIN src/win/*.c)
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN})
     target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600")
-    target_link_libraries(libuv iphlpapi psapi shell32 userenv ws2_32)
+    target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -60,6 +62,7 @@ else() # Assume some Linux variant
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX})
 endif()
 
+target_link_libraries(libuv PRIVATE Threads::Threads)
 target_include_directories(libuv PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
 set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED)
 

ports/libuv/CONTROL

@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.25.0
+Version: 1.27.0
 Description: libuv is a multi-platform support library with a focus on asynchronous I/O.

ports/libuv/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.25.0
+    REF v1.27.0
-    SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
+    SHA512 42dfb7bee21f3f875ae5e6e4531aff52cff59d4c000f9cee1bde1b12c127beb7adefd6d6a11c6f0180868ee5ef15351a21a36c10b1be0aa7bedc15f0c50f87e0
     HEAD_REF v1.x
 )
 

ports/libwebp/CONTROL

@@ -1,8 +1,7 @@
 Source: libwebp
-Version: 1.0.2-1
+Version: 1.0.2-2
 Description: Lossy compression of digital photographic images.
 Build-Depends: opengl
-Default-Features: all
 
 Feature: all
 Description: enable all webp features

ports/live555/CONTROL

@@ -1,3 +1,3 @@
 Source: live555
-Version: latest
+Version: 2019.03.06
 Description: A complete RTSP server application

ports/live555/portfile.cmake

@@ -3,41 +3,38 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     set(VCPKG_LIBRARY_LINKAGE "static")
 endif()
 
-if(NOT VCPKG_USE_HEAD_VERSION)
+# The current Live555 version from http://www.live555.com/live.2019.03.06
-	message(FATAL_ERROR "Live555 does not have persistent releases. Please re-run the installation with --head.")
+set(LIVE_VERSION 2019.03.06)
-else()
-	# The current Live555 version from http://www.live555.com/liveMedia/public/
-	set(LIVE_VERSION latest)
 
-	include(vcpkg_common_functions)
+include(vcpkg_common_functions)
-	set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION}/live)
-	vcpkg_download_distfile(ARCHIVE
+vcpkg_download_distfile(ARCHIVE
-		URLS "http://www.live555.com/liveMedia/public/live555-${LIVE_VERSION}.tar.gz"
+	URLS "http://www.live555.com/live.2019.03.06.tar.gz"
-		FILENAME "live555-${LIVE_VERSION}.tar.gz"
+	FILENAME "live555-${LIVE_VERSION}.tar.gz"
-		SKIP_SHA512
+	SHA512 cf3cbf57ec43d392fa82f06bd02f6d829208c9a9ec1c505d9eb6c5e2dd3393bbd8829b6216163deb8ea8356c180f30f610a639044a6941df5c9a92f29d4f1a75
-	)
+)
 
-	vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
+vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/${LIVE_VERSION})
 
-	file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-	vcpkg_configure_cmake(
+vcpkg_configure_cmake(
-		SOURCE_PATH ${SOURCE_PATH}
+	SOURCE_PATH ${SOURCE_PATH}
-		PREFER_NINJA
+	PREFER_NINJA
-	)
+)
 
-	vcpkg_install_cmake()
+vcpkg_install_cmake()
 
-	file(GLOB HEADERS
+file(GLOB HEADERS
-		"${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*"
+	"${SOURCE_PATH}/BasicUsageEnvironment/include/*.h*"
-		"${SOURCE_PATH}/groupsock/include/*.h*"
+	"${SOURCE_PATH}/groupsock/include/*.h*"
-		"${SOURCE_PATH}/liveMedia/include/*.h*"
+	"${SOURCE_PATH}/liveMedia/include/*.h*"
-		"${SOURCE_PATH}/UsageEnvironment/include/*.h*"
+	"${SOURCE_PATH}/UsageEnvironment/include/*.h*"
-	)
+)
 
-	file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-	file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/live555 RENAME copyright)
+
+vcpkg_copy_pdbs()
 
-	vcpkg_copy_pdbs()
-endif()
 

ports/llvm/CONTROL

@@ -1,4 +1,4 @@
 Source: llvm
-Version: 7.0.0
+Version: 7.0.0-2
 Description: The LLVM Compiler Infrastructure
 Build-Depends: atlmfc (windows)

ports/llvm/install-cmake-modules-to-share.patch

@@ -1,10 +1,26 @@
-diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
+diff -urN llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt llvm-7.0.0.src/cmake/modules/CMakeLists.txt
-index ac4b0b7..13a271d 100644
+--- llvm-7.0.0.src-orig/cmake/modules/CMakeLists.txt	2018-07-27 13:57:51.000000000 +0300
---- a/cmake/modules/CMakeLists.txt
++++ llvm-7.0.0.src/cmake/modules/CMakeLists.txt	2019-03-26 14:56:34.645434190 +0200
-+++ b/cmake/modules/CMakeLists.txt
 @@ -1,4 +1,4 @@
 -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
 +set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
  set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
  
  # First for users who use an installed LLVM, create the LLVMExports.cmake file.
+diff -urN llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt
+--- llvm-7.0.0.src-orig/tools/clang/cmake/modules/CMakeLists.txt	2018-01-24 21:26:50.000000000 +0200
++++ llvm-7.0.0.src/tools/clang/cmake/modules/CMakeLists.txt	2019-03-26 14:57:07.173362736 +0200
+@@ -1,11 +1,11 @@
+ # Generate a list of CMake library targets so that other CMake projects can
+ # link against them. LLVM calls its version of this file LLVMExports.cmake, but
+ # the usual CMake convention seems to be ${Project}Targets.cmake.
+-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
++set(CLANG_INSTALL_PACKAGE_DIR share/clang)
+ set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
+ 
+ # Keep this in sync with llvm/cmake/CMakeLists.txt!
+-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
++set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
+ 
+ get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)

ports/llvm/portfile.cmake

@@ -46,6 +46,7 @@ vcpkg_configure_cmake(
         -DLLVM_INCLUDE_TESTS=OFF
         -DLLVM_ABI_BREAKING_CHECKS=FORCE_OFF
         -DLLVM_TOOLS_INSTALL_DIR=tools/llvm
+        -DLLVM_PARALLEL_LINK_JOBS=1
 )
 
 vcpkg_install_cmake()
@@ -62,10 +63,30 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     file(REMOVE ${DEBUG_EXE})
 endif()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clang TARGET_PATH share/clang)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/clang TARGET_PATH share/clang)
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/llvm)
 vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/llvm)
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-release.cmake "${RELEASE_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake RELEASE_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/bin" "\${_IMPORT_PREFIX}/tools/llvm" RELEASE_MODULE "${RELEASE_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-release.cmake "${RELEASE_MODULE}")
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(READ ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/clang/ClangTargets-debug.cmake "${DEBUG_MODULE}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake DEBUG_MODULE)
+    string(REPLACE "\${_IMPORT_PREFIX}/debug/bin" "\${_IMPORT_PREFIX}/tools/llvm" DEBUG_MODULE "${DEBUG_MODULE}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/llvm/LLVMExports-debug.cmake "${DEBUG_MODULE}")
+endif()
+
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
     ${CURRENT_PACKAGES_DIR}/debug/tools

ports/matroska/CMakeLists.txt

@@ -1,110 +0,0 @@
-cmake_minimum_required(VERSION 3.1.2)
-
-project(matroska VERSION 1.4.8)
-
-option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
-option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)
-
-find_package(ebml 1.3.5 REQUIRED)
-
-include(GNUInstallDirs)
-
-set(libmatroska_SOURCES
-  src/FileKax.cpp
-  src/KaxAttached.cpp
-  src/KaxAttachments.cpp
-  src/KaxBlock.cpp
-  src/KaxBlockData.cpp
-  src/KaxCluster.cpp
-  src/KaxContexts.cpp
-  src/KaxCues.cpp
-  src/KaxCuesData.cpp
-  src/KaxInfoData.cpp
-  src/KaxSeekHead.cpp
-  src/KaxSegment.cpp
-  src/KaxSemantic.cpp
-  src/KaxTracks.cpp
-  src/KaxVersion.cpp)
-
-set(libmatroska_PUBLIC_HEADERS
-  matroska/FileKax.h
-  matroska/KaxAttached.h
-  matroska/KaxAttachments.h
-  matroska/KaxBlockData.h
-  matroska/KaxBlock.h
-  matroska/KaxChapters.h
-  matroska/KaxClusterData.h
-  matroska/KaxCluster.h
-  matroska/KaxConfig.h
-  matroska/KaxContentEncoding.h
-  matroska/KaxContexts.h
-  matroska/KaxCuesData.h
-  matroska/KaxCues.h
-  matroska/KaxDefines.h
-  matroska/KaxInfoData.h
-  matroska/KaxInfo.h
-  matroska/KaxSeekHead.h
-  matroska/KaxSegment.h
-  matroska/KaxSemantic.h
-  matroska/KaxTag.h
-  matroska/KaxTags.h
-  matroska/KaxTrackAudio.h
-  matroska/KaxTrackEntryData.h
-  matroska/KaxTracks.h
-  matroska/KaxTrackVideo.h
-  matroska/KaxTypes.h
-  matroska/KaxVersion.h)
-
-set (libmatroska_C_PUBLIC_HEADERS
-  matroska/c/libmatroska.h
-  matroska/c/libmatroska_t.h)
-
-add_library(matroska ${libmatroska_SOURCES} ${limatroska_PUBLIC_HEADERS} ${libmatroska_C_PUBLIC_HEADERS})
-target_link_libraries(matroska PUBLIC ebml)
-set_target_properties(matroska PROPERTIES
-  VERSION 6.0.0
-  SOVERSION 6)
-target_include_directories(matroska PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-if(MSVC)
-  target_compile_definitions(matroska PRIVATE _CRT_SECURE_NO_WARNINGS)
-endif()
-if(BUILD_SHARED_LIBS)
-  target_compile_definitions(matroska PUBLIC MATROSKA_DLL)
-  set_target_properties(matroska PROPERTIES DEFINE_SYMBOL "MATROSKA_DLL_EXPORT")
-endif()
-
-install(TARGETS matroska
-  EXPORT MatroskaTargets
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-install(FILES ${libmatroska_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska)
-install(FILES ${libmatroska_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska/c)
-
-if(NOT DISABLE_PKGCONFIG)
-  set(prefix ${CMAKE_INSTALL_PREFIX})
-  set(exec_prefix "\$\{prefix\}")
-  set(libdir "\$\{prefix\}/${CMAKE_INSTALL_LIBDIR}")
-  set(includedir "\$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}")
-  set(PACKAGE_VERSION ${PROJECT_VERSION})
-  configure_file(libmatroska.pc.in libmatroska.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmatroska.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-endif()
-
-if(NOT DISABLE_CMAKE_CONFIG)
-  if(WIN32)
-    set(CMAKE_INSTALL_PACKAGEDIR cmake)
-  elseif(WIN32)
-    set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-  endif()
-  include(CMakePackageConfigHelpers)
-  write_basic_package_version_file(MatroskaConfigVersion.cmake COMPATIBILITY SameMajorVersion)
-  install(EXPORT MatroskaTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-  install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/MatroskaConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/MatroskaConfigVersion.cmake
-    DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
-endif()

ports/matroska/CONTROL

@@ -1,4 +1,4 @@
 Source: matroska
-Version: 1.4.9
+Version: 1.4.9-1
 Description: a C++ libary to parse Matroska files (.mkv and .mka)
 Build-Depends: ebml

ports/matroska/portfile.cmake

@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
 include(vcpkg_common_functions)
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@@ -26,15 +14,17 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
     OPTIONS -DDISABLE_PKGCONFIG=1
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+if (WIN32)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else ()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/matroska)
+endif ()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 

ports/milerius-sfml-imgui/CONTROL

@@ -1,4 +1,4 @@
 Source: milerius-sfml-imgui
-Version: 1.1-1
+Version: 1.1-2
 Description: imgui dll for sfml usage
 Build-Depends: sfml (windows), imgui

ports/milerius-sfml-imgui/FixFindPackageIssue.patch

@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27b8bd8..33fe623 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+     message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there")
+ endif ()
+ 
+-project(sfml-imgui)
++project(milerius-sfml-imgui)
+ cmake_minimum_required(VERSION 3.9)
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ 
+@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers)
+ 
+ install(TARGETS
+         ${PROJECT_NAME}
+-        EXPORT sfml-imgui-targets
++        EXPORT milerius-sfml-imgui-targets
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -39,7 +39,7 @@ install(EXPORT ${PROJECT_NAME}-targets
+         )
+ 
+ configure_package_config_file(
+-        "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
++        "${PROJECT_SOURCE_DIR}/cmake/sfml-imgui-config.cmake.in"
+         "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+         INSTALL_DESTINATION lib/cmake/${PROJECT_NAME}
+ )
+@@ -51,6 +51,6 @@ install(FILES
+ install(DIRECTORY
+         ${CMAKE_CURRENT_SOURCE_DIR}/sfml-imgui
+         DESTINATION
+-        ${CMAKE_INSTALL_INCLUDEDIR}/sfml-imgui
++        ${CMAKE_INSTALL_INCLUDEDIR}/
+         FILES_MATCHING PATTERN "*.h*"
+         )
+diff --git a/cmake/sfml-imgui-config.cmake.in b/cmake/sfml-imgui-config.cmake.in
+index cd790be..e1bdd77 100644
+--- a/cmake/sfml-imgui-config.cmake.in
++++ b/cmake/sfml-imgui-config.cmake.in
+@@ -2,5 +2,5 @@
+ find_package(SFML CONFIG REQUIRED graphics)
+ find_package(imgui CONFIG REQUIRED)
+ find_package(OpenGL REQUIRED)
+-include("${CMAKE_CURRENT_LIST_DIR}/sfml-imgui-targets.cmake")
+-check_required_components("sfml-imgui")
+\ No newline at end of file
++include("${CMAKE_CURRENT_LIST_DIR}/milerius-sfml-imgui-targets.cmake")
++check_required_components("milerius-sfml-imgui")
+\ No newline at end of file

ports/milerius-sfml-imgui/portfile.cmake

@@ -8,6 +8,7 @@ vcpkg_from_github(
     REF 1.1
     SHA512 191184f7b302f643bd7c241b69d9f9edc0d03c6f5a0b3a49f57ac84f3828202f8065291fb17993073a2c07f1237ba491de677c47e2f8160dc70ea77f20eb1946
     HEAD_REF master
+    PATCHES FixFindPackageIssue.patch
 )
 
 vcpkg_configure_cmake(
@@ -16,9 +17,9 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sfml-imgui)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/milerius-sfml-imgui)
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/LICENSE ${CURRENT_PACKAGES_DIR}/share/milerius-sfml-imgui/copyright)

ports/msgpack/CONTROL

@@ -1,3 +1,3 @@
 Source: msgpack
-Version: 2.1.5-1
+Version: 3.1.1
 Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.

ports/msgpack/portfile.cmake

@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO msgpack/msgpack-c
-    REF cpp-2.1.5
+    REF cpp-3.1.1
-    SHA512 aab8357e494bb5aa7407b53e5e650382869ea95812a6677e085530d5f27cde6946fbfd0095b19608c75163dbb82de9ccb6a695234e7c03659fc6efc2da300e19
+    SHA512 2d1607f482160d8860b07d7597af760bfefcb3afa4e82602df43487d15950ab235e7efeabd7e08996807935de71d4dcdab424c91bff806279419db2ec9500227
     HEAD_REF master)
 
 vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}

ports/muparser/CONTROL

@@ -1,3 +1,3 @@
 Source: muparser
-Version: 6cf2746
+Version: 2.2.6.1
 Description:  Fast math parser library 

ports/muparser/portfile.cmake

@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO beltoforion/muparser
-  REF 6cf2746f7ce3ecbe0fd91098a3c2123e5253bb0e
+  REF v2.2.6.1
-  SHA512 a44720507806beb577fee9480102dbdcbf8b95612e8e51e1c57688c27e69f5fec0261beb03d034471519d8a4430954d74fdb626f63d21000160eeaa081a83861
+  SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
   HEAD_REF master
 )
 

ports/netcdf-c/CONTROL

@@ -1,4 +1,4 @@
 Source: netcdf-c
-Version: 4.6.2
+Version: 4.6.2-1
 Build-Depends: hdf5, curl
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.

ports/netcdf-c/portfile.cmake

@@ -1,22 +1,11 @@
-# Common Ambient Variables:
-#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
-#   PORT is the current port name (zlib, etc)
-#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/netcdf-c-4.6.2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Unidata/netcdf-c/archive/v4.6.2.tar.gz"
-    FILENAME "netcdf-c-v4.6.2.tar.gz"
-    SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3
-)
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
+vcpkg_from_github(
-    SOURCE_PATH ${SOURCE_PATH}
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Unidata/netcdf-c
+    REF v4.6.2
+    SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3
+    HEAD_REF master
     PATCHES
         no-install-deps.patch
         config-pkg-location.patch
@@ -26,7 +15,8 @@ vcpkg_apply_patches(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    DISABLE_PARALLEL_CONFIGURE
+    PREFER_NINJA
     OPTIONS
         -DBUILD_UTILITIES=OFF
         -DBUILD_TESTING=OFF
@@ -36,9 +26,6 @@ vcpkg_configure_cmake(
         -DENABLE_DAP_REMOTE_TESTS=OFF
         -DDISABLE_INSTALL_DEPENDENCIES=ON
         -DConfigPackageLocation=share/netcdf
-
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
 
 vcpkg_install_cmake()

ports/octomap/CONTROL

@@ -1,3 +1,3 @@
 Source: octomap
-Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-3
+Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-5
 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees

ports/octomap/portfile.cmake

@@ -14,6 +14,7 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DBUILD_OCTOVIS_SUBPROJECT=OFF
         -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF
@@ -25,23 +26,28 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/octomap)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/binvox2bt.exe)
+if(WIN32)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/bt2vrml.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/binvox2bt.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/compare_octrees.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/bt2vrml.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/convert_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/convert_octree.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/compare_octrees.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/edit_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/edit_octree.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/convert_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/convert_octree.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/eval_octree_accuracy.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/eval_octree_accuracy.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/edit_octree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/edit_octree.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/graph2tree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/graph2tree.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/eval_octree_accuracy.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/eval_octree_accuracy.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/log2graph.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/log2graph.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/graph2tree.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/graph2tree.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/log2graph.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/log2graph.exe)
 
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/binvox2bt.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/binvox2bt.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bt2vrml.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bt2vrml.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/compare_octrees.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/compare_octrees.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/convert_octree.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/convert_octree.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/edit_octree.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/edit_octree.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/eval_octree_accuracy.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/eval_octree_accuracy.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/graph2tree.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/graph2tree.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/log2graph.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/log2graph.exe)
+else()
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/octomap)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/octomap)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

ports/opencv/portfile.cmake

@@ -383,6 +383,11 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake "${OPE
 
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules.cmake ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake)
 
+file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES)
+string(REPLACE "${CURRENT_INSTALLED_DIR}"
+               "\${_VCPKG_INSTALLED_DIR}/\${VCPKG_TARGET_TRIPLET}" OPENCV_MODULES "${OPENCV_MODULES}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}")
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 

ports/openmesh/CONTROL

@@ -1,3 +1,3 @@
 Source: openmesh
-Version: 7.0
+Version: 8.0
 Description: A generic and efficient polygon mesh data structure

ports/openmesh/portfile.cmake

@@ -1,12 +1,12 @@
 include(vcpkg_common_functions)
 
-set(VERSION 7.0)
+set(VERSION 8.0)
 
 # Note: upstream GitLab instance at https://graphics.rwth-aachen.de:9000 often goes down
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.openmesh.org/media/Releases/${VERSION}/OpenMesh-${VERSION}.tar.gz"
     FILENAME "OpenMesh-${VERSION}.tar.gz"
-    SHA512 29280c8fe7208d39bd923c4d0444a24463e36b95402e6a75f42adc27bc1b261df9113442f69e1001dc1a8b1198488069ffb049742dcf6eac6ac1ecf4f216fad8
+    SHA512 6c9cb323d83d48daca7ddefe51df67f611befd657655d8013c2c620ad53e0b8521e6b8e25ebf3f5321f94182252ae0c75795875ff7ac11585e4ffa79e16f8008
 )
 
 vcpkg_extract_source_archive_ex(

ports/openssl-windows/CONTROL

@@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2q
+Version: 1.0.2q-2
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

ports/openssl-windows/EnableWinARM64.patch

@@ -0,0 +1,16 @@
+diff --git a/Configure b/Configure
+index 36a7a66..b31543d 100644
+--- a/Configure
++++ b/Configure
+@@ -592,9 +592,9 @@ my %table=(
+ "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+ # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
+ # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
+-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ # Unified CE target
+-"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
++"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+ "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
+ 
+ # Borland C++ 4.5

ports/openssl-windows/portfile.cmake

@@ -6,7 +6,7 @@ include(vcpkg_common_functions)
 set(OPENSSL_VERSION 1.0.2q)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
 
-vcpkg_find_acquire_program(PERL)
+vcpkg_find_acquire_program(PERL) 
 
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
@@ -20,10 +20,12 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${MASTER_COPY_SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
+    PATCHES 
-            ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
+        ConfigureIncludeQuotesFix.patch
-            ${CMAKE_CURRENT_LIST_DIR}/EnableWinARM32.patch
+        STRINGIFYPatch.patch
-            ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch
+        EnableWinARM32.patch
+        EmbedSymbolsInStaticLibsZ7.patch
+        EnableWinARM64.patch
 )
 
 vcpkg_find_acquire_program(NASM)
@@ -52,6 +54,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
         no-asm
         -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
     )
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+    set(OPENSSL_ARCH VC-WIN32)
+    set(OPENSSL_DO "ms\\do_ms.bat")
+    set(CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
+        no-asm
+        -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+    )
 else()
     message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()

ports/opentracing/CONTROL

@@ -0,0 +1,3 @@
+Source: opentracing
+Version: 1.5.1
+Description: C++ implementation of the OpenTracing API http://opentracing.io