Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5699

17 files changed, 311 insertions, 170 deletions

diff --git a/ports/cppfs/cmake-export-fix.patch b/ports/cppfs/cmake-export-fix.patch
new file mode 100644
index 000000000..344700002
--- /dev/null
+++ b/ports/cppfs/cmake-export-fix.patch
@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea9fd15..c62c6fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -124,7 +124,7 @@ endif()
+ if((UNIX AND SYSTEM_DIR_INSTALL) OR OPTION_FORCE_SYSTEM_DIR_INSTALL)
+     # Install into the system (/usr/bin or /usr/local/bin)
+     set(INSTALL_ROOT      "share/${project}")       # /usr/[local]/share/<project>
+-    set(INSTALL_CMAKE     "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
++    set(INSTALL_CMAKE     "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_EXAMPLES  "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_DATA      "share/${project}")       # /usr/[local]/share/<project>
+     set(INSTALL_BIN       "bin")                    # /usr/[local]/bin
+@@ -183,7 +183,7 @@ add_subdirectory(deploy)
+ install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
+ 
+ # Install cmake find script for the project
+-install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
++# install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
+ 
+ # Install the project meta files
+ install(FILES AUTHORS   DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
+diff --git a/source/cppfs/CMakeLists.txt b/source/cppfs/CMakeLists.txt
+index aa37eda..e8a59e0 100644
+--- a/source/cppfs/CMakeLists.txt
++++ b/source/cppfs/CMakeLists.txt
+@@ -283,7 +283,7 @@ perform_health_checks(
+ 
+ # Library
+ install(TARGETS ${target}
+-    EXPORT  "${target}-export"            COMPONENT dev
++    EXPORT  "${target}-config"            COMPONENT dev
+     RUNTIME DESTINATION ${INSTALL_BIN}    COMPONENT runtime
+     LIBRARY DESTINATION ${INSTALL_SHARED} COMPONENT runtime
+     ARCHIVE DESTINATION ${INSTALL_LIB}    COMPONENT dev
+@@ -302,8 +302,8 @@ install(DIRECTORY
+ )
+ 
+ # CMake config
+-install(EXPORT ${target}-export
++install(EXPORT ${target}-config
+     NAMESPACE   ${META_PROJECT_NAME}::
+-    DESTINATION ${INSTALL_CMAKE}/${target}
++    DESTINATION ${INSTALL_CMAKE}
+     COMPONENT   dev
+ )
diff --git a/ports/cppfs/portfile.cmake b/ports/cppfs/portfile.cmake
index 9716b6bbe..33ea7e605 100644
--- a/ports/cppfs/portfile.cmake
+++ b/ports/cppfs/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         LibCrypto-fix.patch
+        cmake-export-fix.patch
 )
 
 if(${TARGET_TRIPLET} MATCHES "uwp")
@@ -40,6 +41,8 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+vcpkg_fixup_cmake_targets()
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppfs RENAME copyright)
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL
index 7a82286dd..79e7804d5 100644
--- a/ports/fmt/CONTROL
+++ b/ports/fmt/CONTROL
@@ -1,3 +1,3 @@
 Source: fmt
-Version: 5.3.0
+Version: 5.3.0-1
 Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index d36efcadc..228ed7651 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -6,7 +6,6 @@ vcpkg_from_github(
     SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
     HEAD_REF master
 )
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -14,7 +13,6 @@ vcpkg_configure_cmake(
         -DFMT_CMAKE_DIR=share/fmt
         -DFMT_TEST=OFF
         -DFMT_DOC=OFF
-        -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
 )
 
 vcpkg_install_cmake()
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 82751a0c3..399f13111 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
 Source: harfbuzz
-Version: 2.3.1-2
+Version: 2.3.1-3
 Description: HarfBuzz OpenType text shaping engine
 Build-Depends: freetype, ragel, gettext (osx)
 Default-Features: ucdn
diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch
new file mode 100644
index 000000000..85dbbdeec
--- /dev/null
+++ b/ports/harfbuzz/find-package-freetype-2.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index defd5d6..03f9d4e 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -267,7 +267,7 @@ set (subset_project_headers

+ 

+ ## Find and include needed header folders and libraries

+ if (HB_HAVE_FREETYPE)

+-  include (FindFreetype)

++  find_package(Freetype REQUIRED)

+   if (NOT FREETYPE_FOUND)

+     message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")

+   endif ()

diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch
new file mode 100644
index 000000000..ddbc96712
--- /dev/null
+++ b/ports/harfbuzz/glib-cmake.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d6e77e8..36e4b4e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -306,22 +306,14 @@ endif ()
+ if (HB_HAVE_GLIB)
+   add_definitions(-DHAVE_GLIB)
+ 
+-  # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake
+-  find_package(PkgConfig)
+-  pkg_check_modules(PC_GLIB QUIET glib-2.0)
+-
+-  find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS})
+-  find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include)
+-  find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0)
+-
+-  include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR})
++  find_package(Threads REQUIRED)
++  find_package(unofficial-iconv REQUIRED)
++  find_package(unofficial-glib CONFIG REQUIRED)
+ 
+   list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc)
+   list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h)
+ 
+-  list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES})
+-
+-  mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR)
++  list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib)
+ endif ()
+ 
+ if (HB_HAVE_ICU)
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index d538c27cd..e1a8199c0 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -10,8 +10,20 @@ vcpkg_from_github(
         0001-fix-cmake-export.patch
         0002-fix-uwp-build.patch
         0003-remove-broken-test.patch
+        # This patch is required for propagating the full list of static dependencies from freetype
+        find-package-freetype-2.patch
+        # This patch is required for propagating the full list of dependencies from glib
+        glib-cmake.patch
 )
 
+file(READ ${SOURCE_PATH}/CMakeLists.txt _contents)
+if("${_contents}" MATCHES "include \\(FindFreetype\\)")
+    message(FATAL_ERROR "Harfbuzz's cmake must not directly include() FindFreetype.")
+endif()
+if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES")
+    message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.")
+endif()
+
 SET(HB_HAVE_ICU "OFF")
 if("icu" IN_LIST FEATURES)
     SET(HB_HAVE_ICU "ON")
diff --git a/ports/mapbox-variant/CONTROL b/ports/mapbox-variant/CONTROL
index 8e31ca856..fad725911 100644
--- a/ports/mapbox-variant/CONTROL
+++ b/ports/mapbox-variant/CONTROL
@@ -1,3 +1,3 @@
 Source: mapbox-variant

-Version: 1.1.6-0f734f0

+Version: 1.1.6-0f734f0-1

 Description: C++11/C++14 Variant

diff --git a/ports/mapbox-variant/portfile.cmake b/ports/mapbox-variant/portfile.cmake
index ec1a443a8..60fdd07a7 100644
--- a/ports/mapbox-variant/portfile.cmake
+++ b/ports/mapbox-variant/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
 )

 

 # Copy header files

-file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox-variant FILES_MATCHING PATTERN "*.hpp")

+file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp")

 

 # Handle copyright

 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mapbox-variant)

diff --git a/ports/orc/0002-fix-executable-output-folder.patch b/ports/orc/0002-fix-executable-output-folder.patch
deleted file mode 100644
index 5fa992dc1..000000000
--- a/ports/orc/0002-fix-executable-output-folder.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
-index eb6d232..5a99f5c 100644
---- a/tools/src/CMakeLists.txt
-+++ b/tools/src/CMakeLists.txt
-@@ -87,4 +87,7 @@ install(TARGETS
-    orc-contents
-    orc-metadata
-    orc-statistics
--   DESTINATION bin)
-+   orc-scan
-+   orc-memory
-+   csv-import
-+   DESTINATION tools/orc)
diff --git a/ports/orc/0001-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch
index 7930bf148..ae62d9fb0 100644
--- a/ports/orc/0001-dependencies-from-vcpkg.patch
+++ b/ports/orc/0003-dependencies-from-vcpkg.patch
@@ -1,141 +1,184 @@
-diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt

-index 91c67d5..4377b83 100644

---- a/c++/src/CMakeLists.txt

-+++ b/c++/src/CMakeLists.txt

-@@ -197,11 +197,12 @@ endif(BUILD_LIBHDFSPP)

- add_library (orc STATIC ${SOURCE_FILES})

- 

- target_link_libraries (orc

--  protobuf

--  zlib

--  snappy

--  lz4

--  ${LIBHDFSPP_LIBRARIES}

-+  PUBLIC

-+    protobuf::libprotobuf

-+    ZLIB::ZLIB

-+    Snappy::snappy

-+    ${LZ4_STATIC_LIB}

-+    ${LIBHDFSPP_LIBRARIES}

-   )

- 

- install(TARGETS orc DESTINATION lib)

-\ No newline at end of file

-diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt

-index 015814a..2b55f4e 100644

---- a/c++/test/CMakeLists.txt

-+++ b/c++/test/CMakeLists.txt

-@@ -48,10 +48,6 @@ add_executable (orc-test

- 

- target_link_libraries (orc-test

-   orc

--  lz4

--  protobuf

--  snappy

--  zlib

-   ${GTEST_LIBRARIES}

- )

- 

-diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake

-index 0272263..8b79a12 100644

---- a/cmake_modules/ThirdpartyToolchain.cmake

-+++ b/cmake_modules/ThirdpartyToolchain.cmake

-@@ -51,8 +51,8 @@ endif ()

- # ----------------------------------------------------------------------

- # Snappy

- 

--if (NOT "${SNAPPY_HOME}" STREQUAL "")

--  find_package (Snappy REQUIRED)

-+if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1)

-+  find_package (Snappy CONFIG REQUIRED)

-   set(SNAPPY_VENDORED FALSE)

- else ()

-   set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")

-@@ -70,10 +70,6 @@ else ()

-   set(SNAPPY_VENDORED TRUE)

- endif ()

- 

--include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})

--add_library (snappy STATIC IMPORTED)

--set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})

--

- if (SNAPPY_VENDORED)

-   add_dependencies (snappy snappy_ep)

-   if (INSTALL_VENDORED_LIBS)

-@@ -85,7 +81,7 @@ endif ()

- # ----------------------------------------------------------------------

- # ZLIB

- 

--if (NOT "${ZLIB_HOME}" STREQUAL "")

-+if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1)

-   find_package (ZLIB REQUIRED)

-   set(ZLIB_VENDORED FALSE)

- else ()

-@@ -112,10 +108,6 @@ else ()

-   set(ZLIB_VENDORED TRUE)

- endif ()

- 

--include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})

--add_library (zlib STATIC IMPORTED)

--set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})

--

- if (ZLIB_VENDORED)

-   add_dependencies (zlib zlib_ep)

-   if (INSTALL_VENDORED_LIBS)

-@@ -127,8 +119,8 @@ endif ()

- # ----------------------------------------------------------------------

- # LZ4

- 

--if (NOT "${LZ4_HOME}" STREQUAL "")

--  find_package (LZ4 REQUIRED)

-+if (NOT "${LZ4_HOME}" STREQUAL "" OR 1)

-+  find_library(LZ4_STATIC_LIB NAMES lz4d lz4)

-   set(LZ4_VENDORED FALSE)

- else ()

-   set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")

-@@ -154,8 +146,6 @@ else ()

- endif ()

- 

- include_directories (SYSTEM ${LZ4_INCLUDE_DIR})

--add_library (lz4 STATIC IMPORTED)

--set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})

- 

- if (LZ4_VENDORED)

-   add_dependencies (lz4 lz4_ep)

-@@ -230,8 +220,8 @@ endif ()

- # ----------------------------------------------------------------------

- # Protobuf

- 

--if (NOT "${PROTOBUF_HOME}" STREQUAL "")

--  find_package (Protobuf REQUIRED)

-+if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1)

-+  find_package(protobuf CONFIG REQUIRED)

-   set(PROTOBUF_VENDORED FALSE)

- else ()

-   set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")

-@@ -266,13 +256,8 @@ else ()

-   set(PROTOBUF_VENDORED TRUE)

- endif ()

- 

--include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})

- 

--add_library (protobuf STATIC IMPORTED)

--set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})

- 

--add_library (protoc STATIC IMPORTED)

--set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB})

- 

- if (PROTOBUF_VENDORED)

-   add_dependencies (protoc protobuf_ep)

-diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt

-index 667fab4..eb6d232 100644

---- a/tools/src/CMakeLists.txt

-+++ b/tools/src/CMakeLists.txt

-@@ -49,7 +49,6 @@ add_executable (orc-metadata

- 

- target_link_libraries (orc-metadata

-   orc

--  protobuf

-   )

- 

-  add_executable (orc-statistics

+diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
+index 235ced8..0042a88 100644
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -218,12 +218,13 @@ endif(BUILD_LIBHDFSPP)
+ add_library (orc STATIC ${SOURCE_FILES})
+
+ target_link_libraries (orc
+-  protobuf
+-  zlib
+-  snappy
+-  lz4
+-  zstd
+-  ${LIBHDFSPP_LIBRARIES}
++  PRIVATE
++    protobuf::libprotobuf
++    ZLIB::ZLIB
++    Snappy::snappy
++    ${LZ4_STATIC_LIB}
++    ${ZSTD_STATIC_LIB}
++    ${LIBHDFSPP_LIBRARIES}
+   )
+
+ install(TARGETS orc DESTINATION lib)
+diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
+index db68578..709ad07 100644
+--- a/c++/test/CMakeLists.txt
++++ b/c++/test/CMakeLists.txt
+@@ -50,10 +50,10 @@ add_executable (orc-test
+
+ target_link_libraries (orc-test
+   orc
+-  lz4
+-  protobuf
+-  snappy
+-  zlib
++  protobuf::libprotobuf
++  ZLIB::ZLIB
++  Snappy::snappy
++  ${LZ4_STATIC_LIB}
+   ${GTEST_LIBRARIES}
+ )
+
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
+index 1a28b1a..89f57d8 100644
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -59,8 +59,8 @@ endif ()
+ # ----------------------------------------------------------------------
+ # Snappy
+
+-if (NOT "${SNAPPY_HOME}" STREQUAL "")
+-  find_package (Snappy REQUIRED)
++if (NOT "${SNAPPY_HOME}" STREQUAL "" OR 1)
++  find_package (Snappy CONFIG REQUIRED)
+   set(SNAPPY_VENDORED FALSE)
+ else ()
+   set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
+@@ -78,10 +78,6 @@ else ()
+   set(SNAPPY_VENDORED TRUE)
+ endif ()
+
+-include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR})
+-add_library (snappy STATIC IMPORTED)
+-set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB})
+-
+ if (SNAPPY_VENDORED)
+   add_dependencies (snappy snappy_ep)
+   if (INSTALL_VENDORED_LIBS)
+@@ -93,7 +89,8 @@ endif ()
+ # ----------------------------------------------------------------------
+ # ZLIB
+
+-if (NOT "${ZLIB_HOME}" STREQUAL "")
++
++if (NOT "${ZLIB_HOME}" STREQUAL "" OR 1)
+   find_package (ZLIB REQUIRED)
+   set(ZLIB_VENDORED FALSE)
+ else ()
+@@ -120,10 +117,6 @@ else ()
+   set(ZLIB_VENDORED TRUE)
+ endif ()
+
+-include_directories (SYSTEM ${ZLIB_INCLUDE_DIR})
+-add_library (zlib STATIC IMPORTED)
+-set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB})
+-
+ if (ZLIB_VENDORED)
+   add_dependencies (zlib zlib_ep)
+   if (INSTALL_VENDORED_LIBS)
+@@ -134,9 +127,8 @@ endif ()
+
+ # ----------------------------------------------------------------------
+ # Zstd
+-
+-if (NOT "${ZSTD_HOME}" STREQUAL "")
+-  find_package (zstd REQUIRED)
++if (NOT "${ZSTD_HOME}" STREQUAL "" OR 1)
++  find_library(ZSTD_STATIC_LIB NAMES zstd zstd_static)
+   set(ZSTD_VENDORED FALSE)
+ else ()
+   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
+@@ -169,10 +161,6 @@ else ()
+   set(ZSTD_VENDORED TRUE)
+ endif ()
+
+-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
+-add_library (zstd STATIC IMPORTED)
+-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
+-
+ if (ZSTD_VENDORED)
+   add_dependencies (zstd zstd_ep)
+   if (INSTALL_VENDORED_LIBS)
+@@ -183,9 +171,8 @@ endif ()
+
+ # ----------------------------------------------------------------------
+ # LZ4
+-
+-if (NOT "${LZ4_HOME}" STREQUAL "")
+-  find_package (LZ4 REQUIRED)
++if (NOT "${LZ4_HOME}" STREQUAL "" OR 1)
++  find_library(LZ4_STATIC_LIB NAMES lz4d lz4)
+   set(LZ4_VENDORED FALSE)
+ else ()
+   set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
+@@ -211,10 +198,6 @@ else ()
+   set(LZ4_VENDORED TRUE)
+ endif ()
+
+-include_directories (SYSTEM ${LZ4_INCLUDE_DIR})
+-add_library (lz4 STATIC IMPORTED)
+-set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB})
+-
+ if (LZ4_VENDORED)
+   add_dependencies (lz4 lz4_ep)
+   if (INSTALL_VENDORED_LIBS)
+@@ -287,9 +270,8 @@ endif ()
+
+ # ----------------------------------------------------------------------
+ # Protobuf
+-
+-if (NOT "${PROTOBUF_HOME}" STREQUAL "")
+-  find_package (Protobuf REQUIRED)
++if (NOT "${PROTOBUF_HOME}" STREQUAL "" OR 1)
++  find_package (protobuf CONFIG REQUIRED)
+   set(PROTOBUF_VENDORED FALSE)
+ else ()
+   set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
+@@ -325,14 +307,6 @@ else ()
+   set(PROTOBUF_VENDORED TRUE)
+ endif ()
+
+-include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
+-
+-add_library (protobuf STATIC IMPORTED)
+-set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})
+-
+-add_library (protoc STATIC IMPORTED)
+-set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB})
+-
+ if (PROTOBUF_VENDORED)
+   add_dependencies (protoc protobuf_ep)
+   add_dependencies (protobuf protobuf_ep)
+diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
+index f5a53ca..15391bf 100644
+--- a/tools/src/CMakeLists.txt
++++ b/tools/src/CMakeLists.txt
+@@ -51,7 +51,6 @@ add_executable (orc-metadata
+
+ target_link_libraries (orc-metadata
+   orc
+-  protobuf
+   ${CMAKE_THREAD_LIBS_INIT}
+   )
+
+@@ -95,4 +94,7 @@ install(TARGETS
+    orc-contents
+    orc-metadata
+    orc-statistics
+-   DESTINATION bin)
++   orc-scan
++   orc-memory
++   csv-import
++  DESTINATION tools/orc)
diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL
index 45532cad3..1cb8967ed 100644
--- a/ports/orc/CONTROL
+++ b/ports/orc/CONTROL
@@ -1,4 +1,4 @@
 Source: orc
-Version: 1.5.2-f47e02c-2
-Build-Depends: zlib, protobuf, lz4, snappy, gtest
+Version: 1.5.5
+Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
 Description: The smallest, fastest columnar storage for Hadoop workloads.
diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
index f9a23b708..e72f9fd69 100644
--- a/ports/orc/portfile.cmake
+++ b/ports/orc/portfile.cmake
@@ -3,16 +3,16 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/orc
-    REF f47e02cfbf346f14d7f38c3ddd45d39e3b515847
-    SHA512 5a389f4ab3b0ce4e7c8869493cf9e91feb4917a42bf2740abd71602fa03a2a53217b572e60af7328b7568dab084c07275ea275438ec8ae87f230a87fb60f2601
+    REF 47a490f083bd411bf04bfed8131eef42606d7789
+    SHA512 c2650d9fd367a5ec04c79c16434728e5c20608131f21bfc89d412cbaf8dd4ae5900b03e59df21d3617d8c6a9504e4b14b1f788157afa90b57d733499d2995e39
     HEAD_REF master
     PATCHES
-      0001-dependencies-from-vcpkg.patch
-      0002-fix-executable-output-folder.patch
-)
+      0003-dependencies-from-vcpkg.patch
+    )
 
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZSTD.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindProtobuf.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindSnappy.cmake")
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindZLIB.cmake")
diff --git a/ports/orc/usage b/ports/orc/usage
index 6a20ccb89..b364b8bfe 100644
--- a/ports/orc/usage
+++ b/ports/orc/usage
@@ -5,6 +5,7 @@ The package orc does not provide CMake targets:
     find_package(Snappy CONFIG REQUIRED)
 
     find_library(LZ4_LIBRARY NAMES lz4d lz4)
+    find_library(ZSTD_LIBRARY NAMES zstd)
     find_library(ORC_LIBRARY NAMES orc)
 
-    target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ZLIB::ZLIB)
+    target_link_libraries(main PRIVATE ${ORC_LIBRARY} protobuf::libprotoc protobuf::libprotobuf Snappy::snappy ${LZ4_LIBRARY} ${ZSTD_LIBRARY} ZLIB::ZLIB)
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 7bd4d5b3d..0d489e677 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,7 +1,7 @@
 Source: vtk
-Version: 8.2.0-1
+Version: 8.2.0-2
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows)
 
 Feature: openvr
 Description: OpenVR functionality for VTK
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 06773528e..baff2cb06 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -115,6 +115,12 @@ if(VTK_WITH_ALL_MODULES)
     )
 endif()
 
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    set(Module_vtkGUISupportMFC ON)
+else()
+    set(Module_vtkGUISupportMFC OFF)
+endif()
+
 # =============================================================================
 # Configure & Install
 if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static")
@@ -154,6 +160,7 @@ vcpkg_configure_cmake(
         -DVTK_INSTALL_PACKAGE_DIR=share/vtk
         -DVTK_INSTALL_RUNTIME_DIR=bin
         -DVTK_FORBID_DOWNLOADS=ON
+        -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC}
         ${ADDITIONAL_OPTIONS}
 )