diff --git a/README_ko_KR.md b/README_ko_KR.md
index f9270fe7cc60b4..3f76ac0c5c0d67 100644
--- a/README_ko_KR.md
+++ b/README_ko_KR.md
@@ -20,7 +20,7 @@ vcpkg 사용을 시작하는 방법은 [시작하기](#시작하기) 섹션을 
 - [Vcpkg: 개요 둘러보기](#vcpkg-개요)
 - [목차](#목차)
 - [시작하기](#시작하기)
-  - [빠르게 시작하기: 원도우](#빠르게-시작하기-원도우)
+  - [빠르게 시작하기: 윈도우](#빠르게-시작하기-윈도우)
   - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스)
   - [리눅스 개발자 도구 설치하기](#리눅스-개발자-도구-설치하기)
   - [macOS 개발자 도구 설치하기](#macos-개발자-도구-설치하기)
diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch
deleted file mode 100644
index 7df7ca641e5336..00000000000000
--- a/ports/asio/inline_dummy_return.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp
-index 60a6f5cd..af7be635 100644
---- a/asio/include/asio/impl/use_awaitable.hpp
-+++ b/asio/include/asio/impl/use_awaitable.hpp
-@@ -236,7 +236,7 @@ T dummy_return()
- }
- 
- template <>
--void dummy_return()
-+inline void dummy_return()
- {
- }
- #endif // defined(_MSC_VER)
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
index af3683874e75d1..d5f65149acdd39 100644
--- a/ports/asio/portfile.cmake
+++ b/ports/asio/portfile.cmake
@@ -3,11 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-18-1
-    SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8
+    REF asio-1-18-2
+    SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113
     HEAD_REF master
-    PATCHES
-        inline_dummy_return.patch
 )
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency
@@ -30,4 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
index 076b4f60894754..5f285c16fa15a0 100644
--- a/ports/asio/vcpkg.json
+++ b/ports/asio/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "asio",
-  "version": "1.18.1",
-  "port-version": 1,
+  "version": "1.18.2",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/",
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 19314eb0ee6446..36141ffcbc6e8b 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,10 +1,14 @@
-vcpkg_from_git(
+set(BZIP2_VERSION 1.0.8)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz"
+    FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
+    SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+)
+
+vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL https://sourceware.org/git/bzip2.git
-    REF 75a94bea3918e612b879d6a11ca64b8689526147 # REFERENCE BZIP2 VERSION 1.0.8
-    SHA512 4611105f9090477b5f6f6dbd303a282099df71644e04d8a998ef81de487f6c8cac4c0ec1283ad737f6767c51f1e3b4e24e2ee021c6dd085925617d9ed145b2ba
-    PATCHES
-        fix-import-export-macros.patch
+    ARCHIVE ${ARCHIVE}
+    PATCHES fix-import-export-macros.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json
index 8c7520de83e597..2f8b8aabf328a9 100644
--- a/ports/bzip2/vcpkg.json
+++ b/ports/bzip2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bzip2",
-  "version-string": "1.0.8",
-  "port-version": 1,
+  "version-semver": "1.0.8",
+  "port-version": 2,
   "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
   "homepage": "https://sourceware.org/bzip2/",
   "documentation": "https://sourceware.org/bzip2/docs.html"
diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL
index 8daea5ae60981d..ac6f8f2caa1b92 100644
--- a/ports/cnl/CONTROL
+++ b/ports/cnl/CONTROL
@@ -1,3 +1,4 @@
 Source: cnl
-Version: 2019-06-23
+Version: 1.1.7
 Description: A Compositional Numeric Library for C++
+Homepage: https://github.com/johnmcfarlane/cnl
diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake
index da03f7900e57ca..3c54e457914edc 100644
--- a/ports/cnl/portfile.cmake
+++ b/ports/cnl/portfile.cmake
@@ -1,11 +1,10 @@
 # header-only library
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO johnmcfarlane/cnl
-    REF 48428242e72b8239cb14c963e40f724929d54df7
-    SHA512 c7e012d99409977137a44915dd7a4df5014b6e8540ceee3e82492052541ce77a254d79e624d766b510e7d3a6b17a9d9b02391c6993ae55d3904334116e747983
-    HEAD_REF develop
+    REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7
+    SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572
+    HEAD_REF main
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch
new file mode 100644
index 00000000000000..cd79597821941e
--- /dev/null
+++ b/ports/curl/0020-fix-pc-file.patch
@@ -0,0 +1,16 @@
+diff -urw a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2021-05-10 20:46:52.204346972 +0200
++++ b/CMakeLists.txt	2021-05-11 19:39:00.065235266 +0200
+@@ -1482,6 +1482,12 @@
+       message(WARNING "Bad lib in library list: ${_libname}")
+       continue()
+     endif()
++  elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$")
++    if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES)
++      set(_lib "-framework ${CMAKE_MATCH_2}")
++    else()
++      set(_lib "-framework ${_lib}")
++    endif()
+   endif()
+   if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-")
+     set(LIBCURL_LIBS          "${LIBCURL_LIBS} ${_lib}")
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 3512adeaf81e58..6d410fb58b9231 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_from_github(
         0010_fix_othertests_cmake.patch
         0011_fix_static_build.patch
         0012-fix-dependency-idn2.patch
+        0020-fix-pc-file.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB)
diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
index 6efa34f0f645d4..7059f6d4749868 100644
--- a/ports/curl/vcpkg.json
+++ b/ports/curl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "curl",
   "version": "7.74.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "A library for transferring data with URLs",
   "homepage": "https://github.com/curl/curl",
   "dependencies": [
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
index e4da939a31efdb..fc00ee3ad3b79a 100644
--- a/ports/drogon/CONTROL
+++ b/ports/drogon/CONTROL
@@ -1,5 +1,5 @@
 Source: drogon
-Version: 1.6.0
+Version: 1.7.1
 Homepage: https://github.com/an-tao/drogon
 Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows
 Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index 69ea0cf5559259..0171af1d511968 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -1,14 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.6.0
-    SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db
+    REF v1.7.1
+    SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6
     HEAD_REF master
     PATCHES
         vcpkg.patch
         resolv.patch
         drogon_config.patch
-        ssize_t.patch
 )
 
 vcpkg_check_features(
@@ -30,6 +29,9 @@ vcpkg_install_cmake()
 
 # Fix CMake files
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon)
+
+vcpkg_fixup_pkgconfig()
+
 # Copy drogon_ctl
 if("ctl" IN_LIST FEATURES)
     message("copying tools")
diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch
deleted file mode 100644
index aae977522a37ef..00000000000000
--- a/ports/drogon/ssize_t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/orm_lib/inc/drogon/orm/Mapper.h b/orm_lib/inc/drogon/orm/Mapper.h
-index d248625..8911f7f 100644
---- a/orm_lib/inc/drogon/orm/Mapper.h
-+++ b/orm_lib/inc/drogon/orm/Mapper.h
-@@ -21,7 +21,7 @@
- #include <vector>
- 
- #ifdef _WIN32
--using ssize_t = std::intptr_t;
-+using ssize_t = long long;
- #endif
- 
- namespace drogon
diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in
index 58040884b11f6c..b7e53982c14f2c 100644
--- a/ports/ffmpeg/build.sh.in
+++ b/ports/ffmpeg/build.sh.in
@@ -15,6 +15,61 @@ cygpath() {
     fi
 }
 
+move_binary() {
+    SOURCE=$1
+    TARGET=$2
+    BINARY=$3
+
+    # run lipo over the command to check whether it really
+    # is a binary that we need to merge architectures
+    lipo $SOURCE/$BINARY -info &> /dev/null || return 0
+
+    # get the directory name the file is in
+    DIRNAME=$(dirname $BINARY)
+
+    # ensure the directory to move the binary to exists
+    mkdir -p $TARGET/$DIRNAME
+
+    # now finally move the binary
+    mv $SOURCE/$BINARY $TARGET/$BINARY
+}
+
+move_binaries() {
+    SOURCE=$1
+    TARGET=$2
+
+    [ ! -d $SOURCE ] && return 0
+    pushd $SOURCE
+
+    for BINARY in $(find . -type f); do
+        move_binary $SOURCE $TARGET $BINARY
+    done
+
+    popd
+}
+
+merge_binaries() {
+    TARGET=$1
+    SOURCE=$2
+
+    shift
+    shift
+
+    pushd $SOURCE/$1
+    BINARIES=$(find . -type f)
+    popd
+
+    for BINARY in $BINARIES; do
+        COMMAND="lipo -create -output $TARGET/$BINARY"
+
+        for ARCH in $@; do
+            COMMAND="$COMMAND -arch $ARCH $SOURCE/$ARCH/$BINARY"
+        done
+
+        $($COMMAND)
+    done
+}
+
 export PKG_CONFIG_PATH="$(cygpath -p "${PKG_CONFIG_PATH}")"
 
 # Export HTTP(S)_PROXY as http(s)_proxy:
@@ -27,19 +82,45 @@ PATH_TO_PACKAGE_DIR=$(cygpath "@INST_PREFIX@")
 
 JOBS=@VCPKG_CONCURRENCY@
 
+OSX_ARCHS="@OSX_ARCHS@"
+OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@
+
 # Default to hardware concurrency if unset.
 : ${JOBS:=$(nproc)}
 
+build_ffmpeg() {
+    echo "=== CONFIGURING ==="
+
+    sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@
+
+    echo "=== BUILDING ==="
+
+    make -j${JOBS}
+
+    echo "=== INSTALLING ==="
+
+    make install
+}
+
 cd "$PATH_TO_BUILD_DIR"
 
-echo "=== CONFIGURING ==="
+if [ $OSX_ARCH_COUNT -gt 1 ]; then
+    for ARCH in $OSX_ARCHS; do
+        echo "=== CLEANING FOR $ARCH ==="
+
+        make clean && make distclean
 
-sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@
+        build_ffmpeg --enable-cross-compile --arch=$ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH
 
-echo "=== BUILDING ==="
+        echo "=== COLLECTING BINARIES FOR $ARCH ==="
 
-make -j${JOBS}
+        move_binaries $PATH_TO_PACKAGE_DIR/lib $PATH_TO_BUILD_DIR/stage/$ARCH/lib
+        move_binaries $PATH_TO_PACKAGE_DIR/bin $PATH_TO_BUILD_DIR/stage/$ARCH/bin
+    done
 
-echo "=== INSTALLING ==="
+    echo "=== MERGING ARCHITECTURES ==="
 
-make install
+    merge_binaries $PATH_TO_PACKAGE_DIR $PATH_TO_BUILD_DIR/stage $OSX_ARCHS
+else
+    build_ffmpeg
+fi
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 0f3121bf4a9628..1dfe4b18e21a14 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -550,8 +550,22 @@ else()
     set(OPTIONS "${OPTIONS} --disable-zlib")
 endif()
 
+set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake")
+vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE)
+include("${CMAKE_VARS_FILE}")
+
 if (VCPKG_TARGET_IS_OSX)
+    # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us
+    if ("${VCPKG_OSX_SYSROOT}" STREQUAL "")
+        set(VCPKG_OSX_SYSROOT ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT})
+    endif()
+
     set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX
+    set(OPTIONS "${OPTIONS} --extra-cflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"")
+    set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"")
+
+    list(JOIN VCPKG_OSX_ARCHITECTURES " " OSX_ARCHS)
+    LIST(LENGTH VCPKG_OSX_ARCHITECTURES OSX_ARCH_COUNT)
 endif()
 
 set(OPTIONS_CROSS "")
@@ -564,8 +578,17 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU
             get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
             set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}")
         endforeach(GAS_PATH)
-    elseif(VCPKG_TARGET_IS_OSX) # VCPKG_TARGET_ARCHITECTURE = arm64
-        set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64")
+    elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64
+        # get the number of architectures requested
+        list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT)
+
+        # ideally we should check the CMAKE_HOST_SYSTEM_PROCESSOR, but that seems to be
+        # broken when inside a vcpkg port, so we only set it when doing a simple build
+        # for a single platform. multi-platform builds use a different script
+        if (ARCHITECTURE_COUNT LESS 2)
+            message(STATUS "Building on host: ${CMAKE_SYSTEM_PROCESSOR}")
+            set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64")
+        endif()
     endif()
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index fe16cfed194c3f..1b5c40f0a0d672 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4",
-  "port-version": 5,
+  "port-version": 6,
   "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."
diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch
index 0efab0f1c98985..76431c3672b268 100644
--- a/ports/fmt/fix-warning4189.patch
+++ b/ports/fmt/fix-warning4189.patch
@@ -2,11 +2,13 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h
 index 4e96539..0f1d179 100644
 --- a/include/fmt/format.h
 +++ b/include/fmt/format.h
-@@ -33,6 +33,7 @@
+@@ -33,6 +33,9 @@
  #ifndef FMT_FORMAT_H_
  #define FMT_FORMAT_H_
- 
+
++#ifdef _MSC_VER
 +#pragma warning(disable:4189)
++#endif
  #include <algorithm>
  #include <cerrno>
  #include <cmath>
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
index 2328012478dde5..b55b731cca125d 100644
--- a/ports/fmt/vcpkg.json
+++ b/ports/fmt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fmt",
   "version": "7.1.3",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "dependencies": [
diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch
index 2e3893a9745fe4..d1201794b55597 100644
--- a/ports/geographiclib/cxx-library-only.patch
+++ b/ports/geographiclib/cxx-library-only.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 345df69b..cb891034 100644
+index eb08bd48..88552153 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -196,6 +196,11 @@ else ()
@@ -74,23 +74,10 @@ index 345df69b..cb891034 100644
    if (GEOGRAPHICLIB_PRECISION EQUAL 2)
      set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib)
 diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index cbc21961..69c923bc 100644
+index fd0669f2..4744e08d 100644
 --- a/cmake/CMakeLists.txt
 +++ b/cmake/CMakeLists.txt
-@@ -33,10 +33,10 @@ configure_file (project-config.cmake.in
- configure_file (project-config-version.cmake.in
-   "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY)
- export (TARGETS
--  ${PROJECT_ALL_LIBRARIES} ${TOOLS}
-+  ${PROJECT_ALL_LIBRARIES}
-   FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake")
- export (TARGETS
--  ${PROJECT_ALL_LIBRARIES} ${TOOLS}
-+  ${PROJECT_ALL_LIBRARIES}
-   NAMESPACE ${PROJECT_NAME}::
-   FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake")
- 
-@@ -44,13 +44,7 @@ export (TARGETS
+@@ -56,13 +56,7 @@ export (TARGETS
  # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
  # path to the root from there.  (Note that the whole install tree can
  # be relocated.)
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index e948114cd65649..3b7bd3f51fa256 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_sourceforge (
     OUT_SOURCE_PATH SOURCE_PATH
     REPO geographiclib
     REF distrib
-    FILENAME "GeographicLib-1.51.tar.gz"
-    SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
+    FILENAME "GeographicLib-1.52.tar.gz"
+    SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859
     PATCHES cxx-library-only.patch
 )
 
diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json
index 18deaa7714082e..df18eaf32021b4 100644
--- a/ports/geographiclib/vcpkg.json
+++ b/ports/geographiclib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "geographiclib",
-  "version-string": "1.51",
+  "version": "1.52",
   "description": "GeographicLib, a C++ library for performing geographic conversions",
   "homepage": "https://geographiclib.sourceforge.io",
   "features": {
diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL
deleted file mode 100644
index 8ffcc93dd99d51..00000000000000
--- a/ports/halide/CONTROL
+++ /dev/null
@@ -1,64 +0,0 @@
-Source: halide
-Version: 11.0.1
-Homepage: https://github.com/halide/Halide
-Description: Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.
-Supports: !uwp
-Default-Features: jit
-Build-Depends: llvm[enable-rtti,tools,clang]
-
-Feature: jit
-Description: Include targets required for jit compilation
-Build-Depends: halide[core,target-x86] (x86|x64), halide[core,target-arm] (arm&!arm64), halide[core,target-aarch64] (arm64), halide[target-all] (!x86&!x64&!arm&!arm64)
-
-Feature: target-all
-Description: Include all targets
-Build-Depends: halide[core,target-aarch64,target-amdgpu,target-arm,target-d3d12compute,target-hexagon,target-metal,target-mips,target-nvptx,target-opencl,target-opengl,target-powerpc,target-riscv,target-x86]
-
-Feature: target-aarch64
-Description: Include AArch64 target
-Build-Depends: llvm[core,target-aarch64]
-
-Feature: target-amdgpu
-Description: Include AMDGPU target
-Build-Depends: llvm[core,target-amdgpu]
-
-Feature: target-arm
-Description: Include ARM target
-Build-Depends: llvm[core,target-arm]
-
-Feature: target-d3d12compute
-Description: Include Direct3D 12 Compute target
-
-Feature: target-hexagon
-Description: Include Hexagon target
-Build-Depends: llvm[core,target-hexagon]
-
-Feature: target-metal
-Description: Include Metal target
-
-Feature: target-mips
-Description: Include Mips target
-Build-Depends: llvm[core,target-mips]
-
-Feature: target-nvptx
-Description: Include NVPTX target
-Build-Depends: llvm[core,target-nvptx]
-
-Feature: target-opencl
-Description: Include OpenCL-C target
-
-Feature: target-opengl
-Description: Include OpenGL/GLSL target
-
-Feature: target-powerpc
-Description: Include PowerPC target
-Build-Depends: llvm[core,target-powerpc]
-
-Feature: target-riscv
-Description: Include RISCV target
-Build-Depends: llvm[core,target-riscv]
-
-Feature: target-x86
-Description: Include X86 target
-Build-Depends: llvm[core,target-x86]
-
diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake
index b8e08adda471ef..486726c289e395 100644
--- a/ports/halide/portfile.cmake
+++ b/ports/halide/portfile.cmake
@@ -1,37 +1,32 @@
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
-# Halide distributes some loadable modules that belong in lib on all platforms.
-# CMake defaults module DLLs into the lib folder, which is incompatible with
-# vcpkg’s current policy. This sidesteps that issue, a bit bluntly.
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO halide/Halide
-    REF 85c1b91c47ce15aab0d9502d955e48615f3bcee0  # v11.0.1
-    SHA512 3bfdf9fc82d56d099cf74b6683c0017724c1c4ae791e824f5ef3b4d4c1dcb52dd5adddb740ccf6b073b71fcbb748238f42040071ddb64c155f8fdc2709b8121d
-    HEAD_REF release/11.x
+    REF 5dabcaa9effca1067f907f6c8ea212f3d2b1d99a  # v12.0.1
+    SHA512 5ab44703850885561337e23d8b538a5adfe1611e24e8daa4a1313756b4f9dfeb54e89bf8400d46a3340c00234402681b4f44ba3ed5322027fd6cb5dfbd525acd
+    HEAD_REF release/12.x
 )
 
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    target-aarch64 TARGET_AARCH64
-    target-amdgpu TARGET_AMDGPU
-    target-arm TARGET_ARM
-    target-d3d12compute TARGET_D3D12COMPUTE
-    target-hexagon TARGET_HEXAGON
-    target-metal TARGET_METAL
-    target-mips TARGET_MIPS
-    target-nvptx TARGET_NVPTX
-    target-opencl TARGET_OPENCL
-    target-opengl TARGET_OPENGL
-    target-powerpc TARGET_POWERPC
-    target-riscv TARGET_RISCV
-    target-x86 TARGET_X86
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        target-aarch64 TARGET_AARCH64
+        target-amdgpu TARGET_AMDGPU
+        target-arm TARGET_ARM
+        target-d3d12compute TARGET_D3D12COMPUTE
+        target-hexagon TARGET_HEXAGON
+        target-metal TARGET_METAL
+        target-mips TARGET_MIPS
+        target-nvptx TARGET_NVPTX
+        target-opencl TARGET_OPENCL
+        target-powerpc TARGET_POWERPC
+        target-riscv TARGET_RISCV
+        target-x86 TARGET_X86
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
         -DWITH_DOCS=NO
         -DWITH_PYTHON_BINDINGS=NO
@@ -40,10 +35,14 @@ vcpkg_configure_cmake(
         -DWITH_UTILS=NO
         -DCMAKE_INSTALL_LIBDIR=bin
         -DCMAKE_INSTALL_DATADIR=share/${PORT}
-        -DHALIDE_INSTALL_CMAKEDIR=share/${PORT}
+        -DHalide_INSTALL_CMAKEDIR=share/${PORT}
+        -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers
+        -DHalide_INSTALL_PLUGINDIR=bin
 )
 
-vcpkg_install_cmake()
+# ADD_BIN_TO_PATH needed to compile autoschedulers, 
+# which use Halide.dll (and deps) during the build.
+vcpkg_cmake_install(ADD_BIN_TO_PATH)
 
 vcpkg_copy_tools(
     TOOL_NAMES
@@ -54,9 +53,16 @@ vcpkg_copy_tools(
     AUTO_CLEAN
 )
 
-vcpkg_copy_pdbs()
+# Release mode MODULE targets in CMake don't get PDBs.
+# Exclude those to avoid warning with default globs.
+vcpkg_copy_pdbs(
+    BUILD_PATHS
+        "${CURRENT_PACKAGES_DIR}/bin/Halide.dll" 
+        "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll"
+)
 
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
+vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
diff --git a/ports/halide/usage b/ports/halide/usage
index 117e243b6c0507..591e497db458ef 100644
--- a/ports/halide/usage
+++ b/ports/halide/usage
@@ -11,4 +11,4 @@ The package halide provides CMake targets:
     target_link_libraries(main PRIVATE filter)
 
 For more information see:
-    https://github.com/halide/Halide/blob/v11.0.1/README_cmake.md
+    https://github.com/halide/Halide/blob/v12.0.1/README_cmake.md
diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json
new file mode 100644
index 00000000000000..baa99449ae8893
--- /dev/null
+++ b/ports/halide/vcpkg.json
@@ -0,0 +1,207 @@
+{
+  "name": "halide",
+  "version": "12.0.1",
+  "port-version": 1,
+  "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.",
+  "homepage": "https://github.com/halide/Halide",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "llvm",
+      "features": [
+        "clang",
+        "enable-rtti",
+        "tools"
+      ]
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "jit"
+  ],
+  "features": {
+    "jit": {
+      "description": "Include targets required for jit compilation",
+      "dependencies": [
+        {
+          "name": "halide",
+          "default-features": false,
+          "features": [
+            "target-aarch64"
+          ],
+          "platform": "arm64"
+        },
+        {
+          "name": "halide",
+          "default-features": false,
+          "features": [
+            "target-x86"
+          ],
+          "platform": "x86 | x64"
+        },
+        {
+          "name": "halide",
+          "default-features": false,
+          "features": [
+            "target-arm"
+          ],
+          "platform": "arm & !arm64"
+        },
+        {
+          "name": "halide",
+          "features": [
+            "target-all"
+          ],
+          "platform": "!x86 & !x64 & !arm & !arm64"
+        }
+      ]
+    },
+    "target-aarch64": {
+      "description": "Include AArch64 target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-aarch64"
+          ]
+        }
+      ]
+    },
+    "target-all": {
+      "description": "Include all targets",
+      "dependencies": [
+        {
+          "name": "halide",
+          "default-features": false,
+          "features": [
+            "target-aarch64",
+            "target-amdgpu",
+            "target-arm",
+            "target-d3d12compute",
+            "target-hexagon",
+            "target-metal",
+            "target-mips",
+            "target-nvptx",
+            "target-opencl",
+            "target-powerpc",
+            "target-riscv",
+            "target-x86"
+          ]
+        }
+      ]
+    },
+    "target-amdgpu": {
+      "description": "Include AMDGPU target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-amdgpu"
+          ]
+        }
+      ]
+    },
+    "target-arm": {
+      "description": "Include ARM target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-arm"
+          ]
+        }
+      ]
+    },
+    "target-d3d12compute": {
+      "description": "Include Direct3D 12 Compute target"
+    },
+    "target-hexagon": {
+      "description": "Include Hexagon target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-hexagon"
+          ]
+        }
+      ]
+    },
+    "target-metal": {
+      "description": "Include Metal target"
+    },
+    "target-mips": {
+      "description": "Include Mips target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-mips"
+          ]
+        }
+      ]
+    },
+    "target-nvptx": {
+      "description": "Include NVPTX target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-nvptx"
+          ]
+        }
+      ]
+    },
+    "target-opencl": {
+      "description": "Include OpenCL-C target"
+    },
+    "target-powerpc": {
+      "description": "Include PowerPC target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-powerpc"
+          ]
+        }
+      ]
+    },
+    "target-riscv": {
+      "description": "Include RISCV target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-riscv"
+          ]
+        }
+      ]
+    },
+    "target-x86": {
+      "description": "Include X86 target",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "target-x86"
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake
index 682991ae1a4b09..dd888973ab9ea6 100644
--- a/ports/json-dto/portfile.cmake
+++ b/ports/json-dto/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stiffstream/json_dto
-    REF a1375492e93cc698af60fe7937511ff28d87a5c8 # v.0.2.12
-    SHA512 d9306b7ea8b682ae7d76c6df518c64c444772c47b2b6750f5ebb609476aac5bd9ad529be802ad3348775e30169b0e86d8588aa897766d2f51c2f5186f7cb1354
+    REF 7fce92cd3bdacdcd0b41ed26d2cc981e3f70956e # v.0.2.13
+    SHA512 f678545cc60828ab76d6e8532ac9dbf8e4e68d873d0a98f17d62934dd0b3a3e255b38adf838b65a12e0d954edc7866eb6393f6783709f6f7fac29167886e7bf3
 )
 
 vcpkg_configure_cmake(
@@ -23,3 +23,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json
index b97740acaeb93e..8681bd20fc10e7 100644
--- a/ports/json-dto/vcpkg.json
+++ b/ports/json-dto/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "json-dto",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "A small header-only library for converting data between json representation and c++ structs.",
   "homepage": "https://github.com/Stiffstream/json_dto",
   "license": "BSD-3-Clause",
diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake
index 563224524f9692..4104d890a6bf88 100644
--- a/ports/libdatachannel/portfile.cmake
+++ b/ports/libdatachannel/portfile.cmake
@@ -34,4 +34,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libdatachannel)
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake DATACHANNEL_CONFIG)
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(Threads)
+find_dependency(OpenSSL)
+find_dependency(libjuice)
+${DATACHANNEL_CONFIG}")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json
index 7ba32db68fba45..903b994033788d 100644
--- a/ports/libdatachannel/vcpkg.json
+++ b/ports/libdatachannel/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libdatachannel",
   "version-semver": "0.12.2",
+  "port-version": 1,
   "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.",
   "homepage": "https://github.com/paullouisageneau/libdatachannel",
   "dependencies": [
diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt
index e1aa118e4fb79b..6f4ad1b57627a4 100644
--- a/ports/libopenmpt/CMakeLists.txt
+++ b/ports/libopenmpt/CMakeLists.txt
@@ -11,21 +11,11 @@ endif()
 
 find_package(ZLIB REQUIRED)
 
-find_path(MPG123_INCLUDE_DIR NAMES mpg123.h)
-find_library(MPG123_LIBRARY  NAMES mpg123 libmpg123)
+find_package(MPG123 REQUIRED)
+find_package(Vorbis REQUIRED)
+find_package(FLAC REQUIRED)
 
-find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
-find_path(OGG_INCLUDE_DIR ogg/ogg.h)
-
-find_library(OGG_LIBRARY NAMES ogg)
-find_library(VORBIS_LIBRARY NAMES vorbis)
-find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
-
-find_path(FLAC_INCLUDE_DIR FLAC/all.h)
-find_library(FLAC_LIBRARY NAMES FLAC flac)
-
-find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h)
-find_library(PORTAUDIO_LIBRARY NAMES portaudio)
+find_package(portaudio REQUIRED)
 
 set(
   lib_headers
@@ -52,11 +42,6 @@ include_directories(
   sounddsp
   soundlib
   openmpt123
-  ${MPG123_INCLUDE_DIR}
-  ${VORBIS_INCLUDE_DIR}
-  ${OGG_INCLUDE_DIR}
-  ${FLAC_INCLUDE_DIR}
-  ${PORTAUDIO_INCLUDE_DIR}
 )
 
 set(
@@ -242,28 +227,27 @@ endif()
 target_link_libraries(
   libopenmpt
   PRIVATE
-  ${OGG_LIBRARY}
-  ${MPG123_LIBRARY}
-  ${VORBISFILE_LIBRARY}
-  ${VORBIS_LIBRARY}
-  ${VORBISFILE_LIBRARY}
+  MPG123::libmpg123
+  Vorbis::vorbisfile
+  FLAC::FLAC
   ZLIB::ZLIB
 )
 
+if(BUILD_SHARED_LIBS)
+  set(PORTAUDIO_TARGET portaudio)
+else()
+  set(PORTAUDIO_TARGET portaudio_static)
+endif()
+
 target_link_libraries(
   openmpt123
   PRIVATE
   libopenmpt
-  ${OGG_LIBRARY}
-  ${MPG123_LIBRARY}
-  ${VORBISFILE_LIBRARY}
-  ${VORBIS_LIBRARY}
-  ${VORBISFILE_LIBRARY}
-  ${FLAC_LIBRARY}
-  ${PORTAUDIO_LIBRARY}
   Winmm
   ZLIB::ZLIB
+  ${PORTAUDIO_TARGET}
 )
+
 install(
   TARGETS libopenmpt
   RUNTIME DESTINATION bin
diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json
index 18c3bf100a1ca0..3668ed848b6a70 100644
--- a/ports/libopenmpt/vcpkg.json
+++ b/ports/libopenmpt/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libopenmpt",
   "version-string": "2017-01-28-cf2390140",
-  "port-version": 1,
+  "port-version": 2,
   "description": "a library to render tracker music",
   "homepage": "https://github.com/OpenMPT/openmpt",
   "supports": "!uwp",
diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
index fa1884a2e45646..53083d314e8229 100644
--- a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
+++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch
@@ -9,7 +9,7 @@ index 3c80458..e8d3bf5 100644
  	OCSPCHECK_SRC
  	http.c
 @@ -13,13 +11,27 @@ else()
-         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
+         set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c)
  endif()
  
 +check_function_exists(getopt HAVE_GETOPT)
diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch
index 7a5bf0038ec1ca..79d756622b42b4 100644
--- a/ports/libressl/0002-suppress-msvc-warnings.patch
+++ b/ports/libressl/0002-suppress-msvc-warnings.patch
@@ -3,7 +3,7 @@ index a6a7554..b20fd4b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -111,6 +111,11 @@ if(WIN32)
- 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
+ 	set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt)
  endif()
  
 +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
diff --git a/ports/libressl/CONTROL b/ports/libressl/CONTROL
deleted file mode 100644
index 2b7d62ec20a9a6..00000000000000
--- a/ports/libressl/CONTROL
+++ /dev/null
@@ -1,8 +0,0 @@
-Source: libressl
-Version: 2.9.1
-Port-Version: 3
-Description: LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.
-Supports: !(uwp|arm)
-
-Feature: tools
-Description: Build openssl and ocspcheck executables
diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake
index 7e37c207edd966..7483e02c880e92 100644
--- a/ports/libressl/portfile.cmake
+++ b/ports/libressl/portfile.cmake
@@ -6,8 +6,8 @@ endif()
 
 vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 
-set(LIBRESSL_VERSION 2.9.1)
-set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354)
+set(LIBRESSL_VERSION 3.3.3)
+set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f)
 
 vcpkg_download_distfile(
     LIBRESSL_SOURCE_ARCHIVE
@@ -26,7 +26,8 @@ vcpkg_extract_source_archive_ex(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    "tools" LIBRESSL_APPS
+    FEATURES
+        "tools" LIBRESSL_APPS
 )
 
 vcpkg_configure_cmake(
@@ -59,6 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/etc/ssl/certs"
+    "${CURRENT_PACKAGES_DIR}/debug/etc/ssl/certs"
     "${CURRENT_PACKAGES_DIR}/share/man"
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
@@ -68,7 +70,7 @@ vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic"))
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib")
     foreach(LIB ${LIBS})
         string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}")
diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json
new file mode 100644
index 00000000000000..59c18243c2fb50
--- /dev/null
+++ b/ports/libressl/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "libressl",
+  "version": "3.3.3",
+  "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.",
+  "supports": "!(uwp | arm)",
+  "features": {
+    "tools": {
+      "description": "Build openssl and ocspcheck executables"
+    }
+  }
+}
diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake
index 405b94670762ea..31bab78f790b65 100644
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@@ -12,6 +12,9 @@ if(LibXml2_FOUND)
     select_library_configurations(ICONV)
     select_library_configurations(CHARSET)
     list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES})
+    if(TARGET LibXml2::LibXml2)
+        target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB")
+    endif()
     if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         list(APPEND LIBXML2_LIBRARIES m)
     endif()
diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json
index 617e3a4a5b4a50..fbcd7b114e5841 100644
--- a/ports/libxml2/vcpkg.json
+++ b/ports/libxml2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxml2",
   "version-semver": "2.9.10",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
   "homepage": "https://xmlsoft.org/",
   "dependencies": [
diff --git a/ports/llvm/0001-add-msvc-options.patch b/ports/llvm/0001-add-msvc-options.patch
deleted file mode 100644
index be5ad818964b2b..00000000000000
--- a/ports/llvm/0001-add-msvc-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- llvm/cmake/modules/HandleLLVMOptions.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
-index 5ef22eb493ba..3e2f372e80c9 100644
---- a/llvm/cmake/modules/HandleLLVMOptions.cmake
-+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake
-@@ -426,6 +426,12 @@ if( MSVC )
- 
-   append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
- 
-+  # Some projects use the __cplusplus preprocessor macro to check support for
-+  # a particular version of the C++ standard. When this option is not specified
-+  # explicitly, macro's value is "199711L" that implies C++98 Standard.
-+  # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
-+  append("/Zc:__cplusplus" CMAKE_CXX_FLAGS)
-+
-   # Allow users to request PDBs in release mode. CMake offeres the
-   # RelWithDebInfo configuration, but it uses different optimization settings
-   # (/Ob1 vs /Ob2 or -O2 vs -O3). LLVM provides this flag so that users can get
-@@ -478,6 +484,10 @@ if( MSVC )
-       endif()
-     endif()
-   endif()
-+  # By default MSVC has a 2^16 limit on the number of sections in an object file,
-+  # but in many objects files need more than that. This flag is to increase the
-+  # number of sections.
-+  append("/bigobj" CMAKE_CXX_FLAGS)
- endif( MSVC )
- 
- # Warnings-as-errors handling for GCC-compatible compilers:
diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch
index 577785afdb2492..adf3c8ad01289e 100644
--- a/ports/llvm/0003-fix-openmp-debug.patch
+++ b/ports/llvm/0003-fix-openmp-debug.patch
@@ -1,9 +1,12 @@
+ openmp/runtime/src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
-index 81275c0483d..61468e048ec 100644
+index 822f9ca2b825..814e25864610 100644
 --- a/openmp/runtime/src/CMakeLists.txt
 +++ b/openmp/runtime/src/CMakeLists.txt
-@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS)
- add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
+@@ -157,7 +157,7 @@ else()
+ endif()
  
  set_target_properties(omp PROPERTIES
 -  PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}"
@@ -11,7 +14,7 @@ index 81275c0483d..61468e048ec 100644
    LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}"
    LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE}
  )
-@@ -215,7 +215,7 @@ if(WIN32)
+@@ -232,7 +232,7 @@ if(WIN32)
      # Create new import library that is just the previously created one + kmp_import.cpp
      add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp)
      set_target_properties(ompimp PROPERTIES
diff --git a/ports/llvm/0006-workaround-msvc-bug.patch b/ports/llvm/0006-workaround-msvc-bug.patch
deleted file mode 100644
index db1574b9ce43d3..00000000000000
--- a/ports/llvm/0006-workaround-msvc-bug.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
---- a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
-+++ b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp
-@@ -10,6 +10,17 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+// Disable optimizations to work around MSVC debug mode bug in 32-bit:
-+// https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html
-+// FIXME: Remove this when the issue is closed.
-+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_IX86)
-+// We have to disable runtime checks in order to enable optimizations. This is
-+// done for the entire file because the problem is actually observed in STL
-+// template functions.
-+#pragma runtime_checks("", off)
-+#pragma optimize("gs", on)
-+#endif
-+
- #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h"
- 
- using namespace llvm;
-diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
---- a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
-+++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
-@@ -406,3 +406,13 @@
-                                   32, 8, AtomicOrdering::NotAtomic }));
-   }
- }
-+
-+// This code sequence doesn't do anything, but it covers a previously uncovered
-+// codepath that used to crash in MSVC x86_32 debug mode.
-+TEST(LegalizerInfoTest, MSVCDebugMiscompile) {
-+  const LLT S1 = LLT::scalar(1);
-+  const LLT P0 = LLT::pointer(0, 32);
-+  LegalizerInfo LI;
-+  auto Builder = LI.getActionDefinitionsBuilder(TargetOpcode::G_PTRTOINT);
-+  (void)Builder.legalForCartesianProduct({S1}, {P0});
-+}
-
diff --git a/ports/llvm/0008-fix-libcxx-install.patch b/ports/llvm/0008-fix-libcxx-install.patch
index 3af957eaf59480..ec4019dc2f86f4 100644
--- a/ports/llvm/0008-fix-libcxx-install.patch
+++ b/ports/llvm/0008-fix-libcxx-install.patch
@@ -2,17 +2,17 @@
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
-index 2001c09761d9..e17de934534f 100644
+index 9965104cb5b2..0d2a33c6b33c 100644
 --- a/libcxx/src/CMakeLists.txt
 +++ b/libcxx/src/CMakeLists.txt
-@@ -364,9 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY)
-   # NOTE: This install command must go after the cxx install command otherwise
-   # it will not be executed after the library symlinks are installed.
-   if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
--    # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
--    # after we required CMake 3.0.
--    install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
-+    install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
-       DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR}
-       COMPONENT libcxx)
-   endif()
+@@ -372,9 +372,7 @@ endif()
+ # NOTE: This install command must go after the cxx install command otherwise
+ # it will not be executed after the library symlinks are installed.
+ if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
+-  # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
+-  # after we required CMake 3.0.
+-  install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
++  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
+     DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR}
+     COMPONENT libcxx)
+ endif()
diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0009-fix-tools-install-path.patch
index eb6c75bd62d2ab..b544feec08ede3 100644
--- a/ports/llvm/0009-fix-tools-install-path.patch
+++ b/ports/llvm/0009-fix-tools-install-path.patch
@@ -74,10 +74,10 @@ index ec0702d76f18..9a34a09921b1 100644
    endforeach()
  
 diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
-index 22edb974bac7..60f69d358fb9 100644
+index dd3d33439299..ded0b5530ad9 100644
 --- a/clang/tools/scan-view/CMakeLists.txt
 +++ b/clang/tools/scan-view/CMakeLists.txt
-@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW)
+@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW)
                         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
      list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
      install(PROGRAMS bin/${BinFile}
@@ -100,10 +100,10 @@ index 62f2de0cb15c..38dc821c76de 100644
  
  add_custom_target(hmaptool ALL DEPENDS ${Depends})
 diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
-index 7fe8b7e9f406..b338dddd0850 100644
+index ba36a234babf..1197a8d8ff32 100644
 --- a/flang/cmake/modules/AddFlang.cmake
 +++ b/flang/cmake/modules/AddFlang.cmake
-@@ -120,7 +120,7 @@ macro(add_flang_tool name)
+@@ -119,7 +119,7 @@ macro(add_flang_tool name)
  
      install(TARGETS ${name}
        ${export_to_flangtargets}
@@ -113,24 +113,24 @@ index 7fe8b7e9f406..b338dddd0850 100644
  
      if(NOT LLVM_ENABLE_IDE)
 diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
-index f3af6e8312fe..aa58108b332b 100644
+index 2e5350aecdc6..b4ab145846b5 100644
 --- a/flang/tools/f18/CMakeLists.txt
 +++ b/flang/tools/f18/CMakeLists.txt
-@@ -58,7 +58,7 @@ endforeach()
+@@ -63,12 +63,12 @@ endforeach()
  
  add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
  
 -install(TARGETS f18 DESTINATION bin)
 +install(TARGETS f18 DESTINATION tools/llvm)
  
- set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${CMAKE_BINARY_DIR}/tools/flang/bin/flang @ONLY)
-@@ -68,4 +68,4 @@ set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY)
- 
--install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
-+install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION tools/llvm RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
+ # This flang shell script will only work in a POSIX shell.
+ if (NOT WIN32)
+   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
+     DESTINATION ${CMAKE_BINARY_DIR}/bin
+     FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
+-  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
++  install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm)
+ endif()
 diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
 index 23df41312403..86f4eafeed07 100644
 --- a/lld/cmake/modules/AddLLD.cmake
@@ -145,7 +145,7 @@ index 23df41312403..86f4eafeed07 100644
  
      if(NOT CMAKE_CONFIGURATION_TYPES)
 diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
-index e6f72fcd3488..0e5a2c81e825 100644
+index 5cff736ff57f..32f43bc1c9be 100644
 --- a/lld/tools/lld/CMakeLists.txt
 +++ b/lld/tools/lld/CMakeLists.txt
 @@ -21,7 +21,7 @@ target_link_libraries(lld
@@ -156,7 +156,7 @@ index e6f72fcd3488..0e5a2c81e825 100644
 +  RUNTIME DESTINATION tools/llvm)
  
  if(NOT LLD_SYMLINKS_TO_CREATE)
-   set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld)
+   set(LLD_SYMLINKS_TO_CREATE
 diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
 index 4ed5c647c5d2..cb31901dddbb 100644
 --- a/lldb/cmake/modules/AddLLDB.cmake
diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0010-fix-libffi.patch
new file mode 100644
index 00000000000000..e98825595d3c69
--- /dev/null
+++ b/ports/llvm/0010-fix-libffi.patch
@@ -0,0 +1,16 @@
+ llvm/cmake/config-ix.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index 818fafbce148..66fc9f509ac7 100644
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI )
+     message(FATAL_ERROR "libffi includes are not found.")
+   endif()
+ 
+-  find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR})
++  find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR})
+   if( NOT FFI_LIBRARY_PATH )
+     message(FATAL_ERROR "libffi is not found.")
+   endif()
diff --git a/ports/llvm/0011-fix-libxml2.patch b/ports/llvm/0011-fix-libxml2.patch
new file mode 100644
index 00000000000000..b5deff09f9b60f
--- /dev/null
+++ b/ports/llvm/0011-fix-libxml2.patch
@@ -0,0 +1,34 @@
+ clang/tools/c-index-test/CMakeLists.txt | 6 +-----
+ lldb/cmake/modules/LLDBConfig.cmake     | 2 +-
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
+index ceef4b086..40b9e9955 100644
+--- a/clang/tools/c-index-test/CMakeLists.txt
++++ b/clang/tools/c-index-test/CMakeLists.txt
+@@ -40,11 +40,7 @@ set_target_properties(c-index-test
+ 
+ # If libxml2 is available, make it available for c-index-test.
+ if (CLANG_HAVE_LIBXML)
+-  if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}))
+-    include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})
+-  else()
+-    include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
+-  endif()
++  include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS})
+   target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES})
+ endif()
+ 
+diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
+index 2fdf1502d..beeeeb9b1 100644
+--- a/lldb/cmake/modules/LLDBConfig.cmake
++++ b/lldb/cmake/modules/LLDBConfig.cmake
+@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA)
+ endif()
+ 
+ if (LLDB_ENABLE_LIBXML2)
+-  include_directories(${LIBXML2_INCLUDE_DIR})
++  include_directories(${LIBXML2_INCLUDE_DIRS})
+ endif()
+ 
+ include_directories(BEFORE
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
index 356a25bf1792bf..c242f99e489629 100644
--- a/ports/llvm/portfile.cmake
+++ b/ports/llvm/portfile.cmake
@@ -1,4 +1,4 @@
-set(LLVM_VERSION "11.1.0")
+set(LLVM_VERSION "12.0.0")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -6,18 +6,18 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llvm/llvm-project
     REF llvmorg-${LLVM_VERSION}
-    SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
+    SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
     HEAD_REF master
     PATCHES
-        0001-add-msvc-options.patch     # Fixed in LLVM 12.0.0
         0002-fix-install-paths.patch    # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc.
         0003-fix-openmp-debug.patch
         0004-fix-dr-1734.patch
         0005-fix-tools-path.patch
-        0006-workaround-msvc-bug.patch  # Fixed in LLVM 12.0.0
         0007-fix-compiler-rt-install-path.patch
         0008-fix-libcxx-install.patch
         0009-fix-tools-install-path.patch
+        0010-fix-libffi.patch
+        0011-fix-libxml2.patch
 )
 
 vcpkg_check_features(
@@ -43,6 +43,25 @@ list(APPEND FEATURE_OPTIONS
     -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON
 )
 
+# Force enable or disable external libraries
+set(llvm_external_libraries
+    zlib
+    libxml2
+)
+foreach(external_library IN LISTS llvm_external_libraries)
+    string(TOLOWER "enable-${external_library}" feature_name)
+    string(TOUPPER "LLVM_ENABLE_${external_library}" define_name)
+    if(feature_name IN_LIST FEATURES)
+        list(APPEND FEATURE_OPTIONS
+            -D${define_name}=FORCE_ON
+        )
+    else()
+        list(APPEND FEATURE_OPTIONS
+            -D${define_name}=OFF
+        )
+    endif()
+endforeach()
+
 # By default assertions are enabled for Debug configuration only.
 if("enable-assertions" IN_LIST FEATURES)
     # Force enable assertions for all configurations.
@@ -119,9 +138,6 @@ if("libcxxabi" IN_LIST FEATURES)
     list(APPEND LLVM_ENABLE_PROJECTS "libcxxabi")
 endif()
 if("libunwind" IN_LIST FEATURES)
-    if(VCPKG_TARGET_IS_WINDOWS)
-        message(FATAL_ERROR "Building libunwind with MSVC is not supported. Disable it until issues are fixed.")
-    endif()
     list(APPEND LLVM_ENABLE_PROJECTS "libunwind")
 endif()
 if("lld" IN_LIST FEATURES)
@@ -204,9 +220,6 @@ vcpkg_configure_cmake(
         -DLLVM_BUILD_EXAMPLES=OFF
         -DLLVM_INCLUDE_TESTS=OFF
         -DLLVM_BUILD_TESTS=OFF
-        # Disable optional dependencies to libxml2 and zlib.
-        -DLLVM_ENABLE_LIBXML2=OFF
-        -DLLVM_ENABLE_ZLIB=OFF
         # Force TableGen to be built with optimization. This will significantly improve build time.
         -DLLVM_OPTIMIZED_TABLEGEN=ON
         "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}"
diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json
index 4590e5111dcd05..06ef3712bba345 100644
--- a/ports/llvm/vcpkg.json
+++ b/ports/llvm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "llvm",
-  "version-string": "11.1.0",
+  "version-string": "12.0.0",
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "supports": "!uwp",
@@ -42,9 +42,9 @@
             "disable-assertions",
             "disable-clang-static-analyzer",
             "enable-bindings",
-            "enable-rtti",
             "enable-terminfo",
-            "enable-threads"
+            "enable-threads",
+            "enable-zlib"
           ]
         }
       ]
@@ -122,6 +122,12 @@
         "libffi"
       ]
     },
+    "enable-libxml2": {
+      "description": "Build with LibXml2.",
+      "dependencies": [
+        "libxml2"
+      ]
+    },
     "enable-rtti": {
       "description": "Build LLVM with run-time type information."
     },
@@ -131,6 +137,12 @@
     "enable-threads": {
       "description": "Use threads if available."
     },
+    "enable-zlib": {
+      "description": "Build with ZLib.",
+      "dependencies": [
+        "zlib"
+      ]
+    },
     "flang": {
       "description": "Include Fortran front end.",
       "dependencies": [
diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL
deleted file mode 100644
index 8ad3e5474f40e4..00000000000000
--- a/ports/mesa/CONTROL
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: mesa
-Version: 20.2.2
-Port-Version: 1
-Homepage: https://www.mesa3d.org/
-Description: Mesa - The 3D Graphics Library
-Build-Depends: zlib, zstd, tool-meson
-Default-Features: default-features
-Supports: !(windows&arm)
-
-Feature: default-features
-Description: Platform dependent default features
-Build-Depends: mesa[core,llvm](x64), mesa[core,opengl], mesa[core,gles1], mesa[core,gles2]
-
-Feature: llvm
-Description: Build with llvmpipe
-Build-Depends: llvm[core]
-
-Feature: gles1
-Description: Build support for OpenGL ES 1.x
-Build-Depends: mesa[core]
-
-Feature: gles2
-Description: Build support for OpenGL ES 2.x and 3.x
-Build-Depends: mesa[core]
-
-Feature: opengl
-Description: Build support for OpenGL (all versions)
-Build-Depends: mesa[core]
-
-Feature: egl
-Description: Build support for EGL platform
-Build-Depends: mesa[core]
\ No newline at end of file
diff --git a/ports/mesa/dual-osmesa-part2.patch b/ports/mesa/dual-osmesa-part2b.patch
similarity index 100%
rename from ports/mesa/dual-osmesa-part2.patch
rename to ports/mesa/dual-osmesa-part2b.patch
diff --git a/ports/mesa/dual-osmesa.patch b/ports/mesa/dual-osmesa.patch
deleted file mode 100644
index 8acebe64b57d7b..00000000000000
--- a/ports/mesa/dual-osmesa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/include/meson.build b/include/meson.build
-index a64d9373a92..22c50eb5eb7 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -89,7 +89,7 @@ if with_egl
-   )
- endif
- 
--if with_osmesa != 'none'
-+if with_osmesa != []
-   install_headers('GL/osmesa.h', subdir : 'GL')
- endif
- 
-diff --git a/meson.build b/meson.build
-index 898d025f066..d73818e7ce5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -444,7 +444,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3)
-   error('Vulkan drivers require dri3 for X11 support')
- endif
- if with_dri
--  if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic'
-+  if with_glx == 'disabled' and not with_egl and not with_gbm and not with_osmesa.contains('classic')
-     error('building dri drivers require at least one windowing system or classic osmesa')
-   endif
- endif
-@@ -1508,8 +1508,8 @@ else
-   dep_unwind = null_dep
- endif
- 
--if with_osmesa != 'none'
--  if with_osmesa == 'gallium' and not with_gallium_softpipe
-+if with_osmesa != []
-+  if with_osmesa.contains('gallium') and not with_gallium_softpipe
-     error('OSMesa gallium requires gallium softpipe or llvmpipe.')
-   endif
-   if host_machine.system() == 'windows'
-@@ -1710,10 +1710,10 @@ lines = ['',
-                                                     with_gles2 ? 'yes' : 'no'),
- ]
- 
--if with_osmesa != 'none'
-+if with_osmesa != []
-   lines += ''
-   suffix = ''
--  if with_osmesa == 'gallium'
-+  if with_osmesa.contains('gallium')
-     suffix = '(Gallium)'
-   endif
-   lines += 'OSMesa:          lib' + osmesa_lib_name + suffix
-diff --git a/meson_options.txt b/meson_options.txt
-index 626baf3d5c2..cb3dc3b383f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -295,9 +295,9 @@ option(
- )
- option(
-   'osmesa',
--  type : 'combo',
--  value : 'none',
--  choices : ['none', 'classic', 'gallium'],
-+  type : 'array',
-+  value : [],
-+  choices : ['classic', 'gallium'],
-   description : 'Build OSmesa.'
- )
- option(
-diff --git a/src/mesa/meson.build b/src/mesa/meson.build
-index fa5c54cc6fb..f7b223862fa 100644
---- a/src/mesa/meson.build
-+++ b/src/mesa/meson.build
-@@ -744,7 +744,7 @@ libmesa_gallium = static_library(
- )
- 
- subdir('drivers/dri')
--if with_osmesa == 'classic'
-+if with_osmesa.contains('classic')
-   subdir('drivers/osmesa')
- endif
- if with_glx == 'xlib'
diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake
index 9461dc2c598740..0409a61d825f91 100644
--- a/ports/mesa/portfile.cmake
+++ b/ports/mesa/portfile.cmake
@@ -1,14 +1,14 @@
 # Build-Depends: From X Window PR: zstd, drm (!windows), elfutils (!windows), wayland (!windows), wayland-protocols (!windows), xdamage, xshmfence (!windows), x11, xcb, xfixes, xext, xxf86vm, xrandr, xv, xvmc (!windows), egl-registry, opengl-registry, tool-meson
 # Required LLVM modules: LLVM (modules: bitwriter, core, coroutines, engine, executionengine, instcombine, mcdisassembler, mcjit, scalaropts, transformutils) found: YES 
 
-#patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches
-set(PATCHES dual-osmesa.patch
-            dual-osmesa-part2.patch
-            swravx512.patch
-            )
+# Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches
+set(PATCHES
+    # Fix swrAVX512 build
+    swravx512-post-static-link.patch
+)
 
 vcpkg_check_linkage(ONLY_DYNAMIC_CRT)
-IF(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_WINDOWS)
     set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # some parts of this port can only build as a shared library.
 endif()
 
@@ -16,10 +16,10 @@ vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mesa/mesa
-    REF  df2977f871fc70ebd6be48c180d117189b5861b5 #v20.2.2
-    SHA512 6c51d817fe265ea6405c4e8afbb516f30cf697d00cf39f162473ea8a59c202bcdfbfe4b6f7c4a6fd2d4e98eb4a1604cb5e0a02558338bf415e53fe5421cbfbbe
-    HEAD_REF master # branch name
-    PATCHES ${PATCHES} #patch name
+    REF mesa-21.1.2 
+    SHA512 746ef292dd93ddd23ab34e18e87196db63302defd99357f31ac24876003c75b32cfa8ed38d0292271cd9142a056f6a6549ffcd0f086d0c69c4ff83ac7195188c
+    HEAD_REF master
+    PATCHES ${PATCHES}
 ) 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
@@ -115,9 +115,7 @@ list(APPEND MESA_OPTIONS -Dvalgrind=disabled)
 list(APPEND MESA_OPTIONS -Dglvnd=false)
 list(APPEND MESA_OPTIONS -Dglx=disabled)
 list(APPEND MESA_OPTIONS -Dgbm=disabled)
-#list(APPEND MESA_OPTIONS -Dosmesa=['gallium','classic']) # classic has compiler errors. 
-list(APPEND MESA_OPTIONS -Dosmesa=['gallium'])
-
+list(APPEND MESA_OPTIONS -Dosmesa=true)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     list(APPEND MESA_OPTIONS -Dshared-swr=false)
@@ -160,9 +158,9 @@ endif()
 
 list(APPEND MESA_OPTIONS -Dshared-glapi=enabled)  #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2
 
-
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND MESA_OPTIONS -Dplatforms=['windows'])
+    list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled)
 endif()
 
 vcpkg_configure_meson(
diff --git a/ports/mesa/swravx512.patch b/ports/mesa/swravx512-post-static-link.patch
similarity index 87%
rename from ports/mesa/swravx512.patch
rename to ports/mesa/swravx512-post-static-link.patch
index c1085252f1b2df..ac88d9bd738c58 100644
--- a/ports/mesa/swravx512.patch
+++ b/ports/mesa/swravx512-post-static-link.patch
@@ -1,17 +1,8 @@
 diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
-index 2fad60365a3..dce7f656d64 100644
+index 11ea7d3f43e..f34e88b1eec 100644
 --- a/src/gallium/drivers/swr/meson.build
 +++ b/src/gallium/drivers/swr/meson.build
-@@ -249,7 +249,7 @@ endif
- 
- if with_swr_arches.contains('knl')
-   swr_knl_args = cpp.first_supported_argument(
--    '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512',
-+    '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512',
-   )
-   if swr_knl_args == []
-     error('Cannot find KNL support for swr.')
-@@ -274,7 +274,7 @@ endif
+@@ -213,7 +213,7 @@ endif
  
  if with_swr_arches.contains('skx')
    swr_skx_args = cpp.first_supported_argument(
@@ -20,3 +11,12 @@ index 2fad60365a3..dce7f656d64 100644
    )
    if swr_skx_args == []
      error('Cannot find SKX support for swr.')
+@@ -252,7 +252,7 @@ endif
+ 
+ if with_swr_arches.contains('knl')
+   swr_knl_args = cpp.first_supported_argument(
+-    '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512',
++    '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512',
+   )
+   if swr_knl_args == []
+     error('Cannot find KNL support for swr.')
diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json
new file mode 100644
index 00000000000000..60db1d7a724c59
--- /dev/null
+++ b/ports/mesa/vcpkg.json
@@ -0,0 +1,99 @@
+{
+  "name": "mesa",
+  "version": "21.1.2",
+  "description": "Mesa - The 3D Graphics Library",
+  "homepage": "https://www.mesa3d.org/",
+  "supports": "!(windows & arm)",
+  "dependencies": [
+    "tool-meson",
+    "zlib",
+    "zstd"
+  ],
+  "default-features": [
+    "default-features"
+  ],
+  "features": {
+    "default-features": {
+      "description": "Platform dependent default features",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "gles1"
+          ]
+        },
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "gles2"
+          ]
+        },
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ]
+        },
+        {
+          "name": "mesa",
+          "default-features": false,
+          "features": [
+            "llvm"
+          ],
+          "platform": "x64"
+        }
+      ]
+    },
+    "egl": {
+      "description": "Build support for EGL platform",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false
+        }
+      ]
+    },
+    "gles1": {
+      "description": "Build support for OpenGL ES 1.x",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false
+        }
+      ]
+    },
+    "gles2": {
+      "description": "Build support for OpenGL ES 2.x and 3.x",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false
+        }
+      ]
+    },
+    "llvm": {
+      "description": "Build with llvmpipe",
+      "dependencies": [
+        {
+          "name": "llvm",
+          "default-features": false,
+          "features": [
+            "libclc"
+          ]
+        }
+      ]
+    },
+    "opengl": {
+      "description": "Build support for OpenGL (all versions)",
+      "dependencies": [
+        {
+          "name": "mesa",
+          "default-features": false
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 6472ce1a20fca9..54a225a02e5a46 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,6 +1,6 @@
 Source: mongo-c-driver
 Version: 1.16.1
-Port-Version: 4
+Port-Version: 5
 Build-Depends: libbson, openssl (!windows), zlib
 Description: Client library written in C for MongoDB.
 Homepage: https://github.com/mongodb/mongo-c-driver
diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake
index 9ddf3a6b41da61..eca359bd6dc728 100644
--- a/ports/mongo-c-driver/portfile.cmake
+++ b/ports/mongo-c-driver/portfile.cmake
@@ -85,20 +85,28 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP)
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a
-            ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a)
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a
-            ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a)
+    if(NOT VCPKG_TARGET_IS_WINDOWS)
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+            file(RENAME
+                ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a
+                ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a)
+        endif()
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+            file(RENAME
+                ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a
+                ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a)
+        endif()
     else()
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib
-            ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib)
-        file(RENAME
-            ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib
-            ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib)
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+            file(RENAME
+                ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib
+                ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib)
+        endif()
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+            file(RENAME
+                ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib
+                ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib)
+        endif()
     endif()
 
     # drop the __declspec(dllimport) when building static
diff --git a/ports/morton-nd/CONTROL b/ports/morton-nd/CONTROL
index e6866779ecc869..34bd160e57f36b 100644
--- a/ports/morton-nd/CONTROL
+++ b/ports/morton-nd/CONTROL
@@ -1,4 +1,4 @@
 Source: morton-nd
-Version: 3.0.0
+Version: 4.0.0
 Homepage: https://github.com/kevinhartman/morton-nd
 Description: header-only constexpr library for fast Morton encoding/decoding in N dimensions.
diff --git a/ports/morton-nd/portfile.cmake b/ports/morton-nd/portfile.cmake
index 46aa5bef5ecdbe..bd2d6dd0018d0e 100644
--- a/ports/morton-nd/portfile.cmake
+++ b/ports/morton-nd/portfile.cmake
@@ -3,9 +3,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kevinhartman/morton-nd
-    REF v3.0.0
-    SHA512 659c903c0c4a4ee4179d01950a952fe0c40d2c426063c10515ae5d2ad13ec8ca6b83d8de50c9eb86dd3c2c3747e1594d832f0c28cd6d414703baf9a7ab2f1f36
-    HEAD_REF master
+    REF v4.0.0
+    SHA512 19dc51ae5d7fc868625a9c9f0dddec95a77fdeac714300033008f096bc3a83f146738e525e8a0ec541903263355a7fec84b1873d8eacfca4b93d3cd8945653da
+    HEAD_REF main
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/mpg123/0001-fix-checkcpuarch-path.patch b/ports/mpg123/0001-fix-checkcpuarch-path.patch
new file mode 100644
index 00000000000000..d6d3bc4771e05e
--- /dev/null
+++ b/ports/mpg123/0001-fix-checkcpuarch-path.patch
@@ -0,0 +1,13 @@
+diff --git a/ports/cmake/cmake/CheckCPUArch.cmake b/ports/cmake/cmake/CheckCPUArch.cmake
+index 84dab8a..925aa09 100644
+--- a/ports/cmake/cmake/CheckCPUArch.cmake
++++ b/ports/cmake/cmake/CheckCPUArch.cmake
+@@ -2,7 +2,7 @@ macro(_CHECK_CPU_ARCH ARCH ARCH_DEFINES VARIABLE)
+     if(NOT DEFINED HAVE_${VARIABLE})
+         message(STATUS "Check CPU architecture is ${ARCH}")
+         set(CHECK_CPU_ARCH_DEFINES ${ARCH_DEFINES})
+-        configure_file(${PROJECT_SOURCE_DIR}/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY)
++        configure_file(${PROJECT_SOURCE_DIR}/cmake/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY)
+         try_compile(HAVE_${VARIABLE} "${PROJECT_BINARY_DIR}"
+             "${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c")
+         if(HAVE_${VARIABLE})
diff --git a/ports/mpg123/0001-fix-x86-build.patch b/ports/mpg123/0001-fix-x86-build.patch
deleted file mode 100644
index 9c098c67926984..00000000000000
--- a/ports/mpg123/0001-fix-x86-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h
-index e37386a..b474e7f 100644
---- a/src/libmpg123/mangle.h
-+++ b/src/libmpg123/mangle.h
-@@ -85,6 +85,10 @@
- #define ASM_VALUE(a) MANGLE_MACROCAT($,a)
- #endif
- 
-+#if defined(_WIN32) && !defined(_WIN64)
-+#define OPT_X86
-+#endif
-+
- /* Enable position-independent code for certain platforms. */
- 
- #if defined(OPT_X86)
-@@ -130,7 +134,7 @@ Lpic_base: \
- /* Dummies for everyone else. */
- #define LOCAL_VAR(a) a
- #define GLOBAL_VAR ASM_NAME
--#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object.
-+#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object.
- #define FUNC ASM_NAME
- #define EXTERNAL_FUNC ASM_NAME
- #define GET_GOT
-diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
-index f2bc362..07e81cd 100644
---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
-+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
-@@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_
- </Command>
-     </PreLinkEvent>
-     <Lib>
--      <AdditionalDependencies>Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies)</AdditionalDependencies>
-       <AdditionalLibraryDirectories>$(IntDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-       <Verbose>true</Verbose>
-     </Lib>
diff --git a/ports/mpg123/0002-fix-libmpg123-uwp-build.patch b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch
new file mode 100644
index 00000000000000..ab37d023862426
--- /dev/null
+++ b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch
@@ -0,0 +1,21 @@
+diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
+index b843152..b8ff89b 100644
+--- a/ports/cmake/src/CMakeLists.txt
++++ b/ports/cmake/src/CMakeLists.txt
+@@ -39,8 +39,6 @@ check_include_file("termios.h" HAVE_TERMIOS)
+ check_include_file("unistd.h" HAVE_UNISTD_H)
+ check_include_file("windows.h" HAVE_WINDOWS_H)
+ 
+-check_symbol_exists(strerror "string.h" HAVE_STRERROR)
+-
+ function(check_m)
+     set(CMAKE_REQUIRED_LIBRARIES m)
+     check_function_exists(sin HAVE_M)
+@@ -59,6 +57,7 @@ check_function_exists(shmget HAVE_SHMGET)
+ check_function_exists(shmat HAVE_SHMAT)
+ check_function_exists(shmdt HAVE_SHMDT)
+ check_function_exists(shmctl HAVE_SHMCTL)
++check_function_exists(strerror HAVE_STRERROR)
+ 
+ search_libs(gethostbyname GETHOSTBYNAME_LIB nsl socket network)
+ search_libs(socket SOCKET_LIB socket)
diff --git a/ports/mpg123/0003-fix-libout123-uwp-build.patch b/ports/mpg123/0003-fix-libout123-uwp-build.patch
new file mode 100644
index 00000000000000..2302c4283d276f
--- /dev/null
+++ b/ports/mpg123/0003-fix-libout123-uwp-build.patch
@@ -0,0 +1,266 @@
+diff --git a/ports/cmake/CMakeLists.txt b/ports/cmake/CMakeLists.txt
+index b5008da..8e6309a 100644
+--- a/ports/cmake/CMakeLists.txt
++++ b/ports/cmake/CMakeLists.txt
+@@ -5,6 +5,13 @@ read_api_version(MPG123_VERSION API_VERSION OUTAPI_VERSION SYNAPI_VERSION)
+ 
+ project(mpg123 VERSION ${MPG123_VERSION} LANGUAGES C ASM)
+ 
++option(BUILD_LIBOUT123 "build libout123" ON)
++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++    message(WARNING "Output module is not implemented for '${CMAKE_SYSTEM_NAME}' platform.")
++    message(WARNING "To prevent build errors 'BUILD_LIBOUT123' option is set to OFF.")
++    set(BUILD_LIBOUT123 OFF)
++endif()
++
+ include(cmake/search_libs.cmake)
+ include(CMakePackageConfigHelpers)
+ include(GNUInstallDirs)
+@@ -34,17 +41,28 @@ set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
+ set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
+ set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libmpg123.pc.in" libmpg123.pc @ONLY)
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY)
++if(BUILD_LIBOUT123)
++    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY)
++endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libsyn123.pc.in" libsyn123.pc @ONLY)
+ 
+ install(
+     FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/libmpg123.pc"
+-        "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc"
+         "${CMAKE_CURRENT_BINARY_DIR}/libsyn123.pc"
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ install(
+     FILES
+         "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/mpg123.1"
+-        "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1"
+     DESTINATION "${CMAKE_INSTALL_MANDIR}")
++
++if(BUILD_LIBOUT123)
++    install(
++        FILES
++            "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc"
++        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
++    install(
++        FILES
++            "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1"
++        DESTINATION "${CMAKE_INSTALL_MANDIR}")
++endif()
+diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
+index b843152..3945c7e 100644
+--- a/ports/cmake/src/CMakeLists.txt
++++ b/ports/cmake/src/CMakeLists.txt
+@@ -194,112 +194,114 @@ endif()
+ 
+ # Modules
+ 
+-if(CHECK_MODULES)
+-    list(FIND CHECK_MODULES alsa ALSA_REQUIRED)
+-    list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED)
+-    list(FIND CHECK_MODULES pulse PULSE_REQUIRED)
+-    list(FIND CHECK_MODULES jack JACK_REQUIRED)
+-    list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED)
+-    list(FIND CHECK_MODULES win32 WIN32_REQUIRED)
+-    list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED)
+-    set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found")
+-endif()
+-
+-if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1)
+-    find_package(ALSA)
+-    if(TARGET ALSA::ALSA)
+-        list(APPEND OUTPUT_MODULES alsa)
+-    elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1)
+-        message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}")
++if(BUILD_LIBOUT123)
++    if(CHECK_MODULES)
++        list(FIND CHECK_MODULES alsa ALSA_REQUIRED)
++        list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED)
++        list(FIND CHECK_MODULES pulse PULSE_REQUIRED)
++        list(FIND CHECK_MODULES jack JACK_REQUIRED)
++        list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED)
++        list(FIND CHECK_MODULES win32 WIN32_REQUIRED)
++        list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED)
++        set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found")
+     endif()
+-endif()
+ 
+-if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1)
+-    if(APPLE)
+-        find_library(AUDIO_TOOLBOX AudioToolbox)
+-        list(APPEND OUTPUT_MODULES coreaudio)
+-    elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1)
+-        message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}")
++    if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1)
++        find_package(ALSA)
++        if(TARGET ALSA::ALSA)
++            list(APPEND OUTPUT_MODULES alsa)
++        elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1)
++            message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}")
++        endif()
+     endif()
+-endif()
+ 
+-find_package(PkgConfig)
+-if(PKG_CONFIG_FOUND)
+-    if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1)
+-        pkg_search_module(PULSE libpulse-simple)
+-        if(PULSE_FOUND)
+-            list(APPEND OUTPUT_MODULES pulse)
+-        elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1)
+-            message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}")
++    if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1)
++        if(APPLE)
++            find_library(AUDIO_TOOLBOX AudioToolbox)
++            list(APPEND OUTPUT_MODULES coreaudio)
++        elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1)
++            message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}")
+         endif()
+     endif()
+ 
+-    if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1)
+-        pkg_search_module(JACK jack)
+-        if(JACK_FOUND)
+-            list(APPEND OUTPUT_MODULES jack)
+-        elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1)
+-            message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}")
++    find_package(PkgConfig)
++    if(PKG_CONFIG_FOUND)
++        if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1)
++            pkg_search_module(PULSE libpulse-simple)
++            if(PULSE_FOUND)
++                list(APPEND OUTPUT_MODULES pulse)
++            elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1)
++                message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}")
++            endif()
++        endif()
++
++        if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1)
++            pkg_search_module(JACK jack)
++            if(JACK_FOUND)
++                list(APPEND OUTPUT_MODULES jack)
++            elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1)
++                message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}")
++            endif()
+         endif()
+-    endif()
+ 
+-    if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1)
+-        pkg_search_module(TINYALSA tinyalsa)
+-        if(TINYALSA_FOUND)
+-            list(APPEND OUTPUT_MODULES tinyalsa)
+-        elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1)
+-            message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}")
++        if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1)
++            pkg_search_module(TINYALSA tinyalsa)
++            if(TINYALSA_FOUND)
++                list(APPEND OUTPUT_MODULES tinyalsa)
++            elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1)
++                message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}")
++            endif()
+         endif()
+     endif()
+-endif()
+ 
+-if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1)
+-    if(HAVE_WINDOWS_H)
+-        set(WIN32_LIBRARIES winmm)
+-        list(APPEND OUTPUT_MODULES win32)
+-    elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1)
+-        message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}")
++    if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1)
++        if(HAVE_WINDOWS_H)
++            set(WIN32_LIBRARIES winmm)
++            list(APPEND OUTPUT_MODULES win32)
++        elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1)
++            message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}")
++        endif()
+     endif()
+-endif()
+ 
+-if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1)
+-    set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h")
+-    check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI)
+-    if(HAVE_WASAPI)
+-        set(WIN32_WASAPI_LIBRARIES ole32 avrt)
+-        list(APPEND OUTPUT_MODULES win32_wasapi)
+-    elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1)
+-        message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}")
++    if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1)
++        set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h")
++        check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI)
++        if(HAVE_WASAPI)
++            set(WIN32_WASAPI_LIBRARIES ole32 avrt)
++            list(APPEND OUTPUT_MODULES win32_wasapi)
++        elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1)
++            message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}")
++        endif()
+     endif()
+-endif()
+ 
+-if(CHECK_MODULES)
+-    list(REMOVE_AT CHECK_MODULES
+-        ${ALSA_REQUIRED}
+-        ${COREAUDIO_REQUIRED}
+-        ${PULSE_REQUIRED}
+-        ${JACK_REQUIRED}
+-        ${TINYALSA_REQUIRED}
+-        ${WIN32_REQUIRED}
+-        ${WIN32_WASAPI_REQUIRED})
+-    list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH)
+-    if(NOT CHECK_MODULES_LENGTH EQUAL 0)
+-        message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}")
++    if(CHECK_MODULES)
++        list(REMOVE_AT CHECK_MODULES
++            ${ALSA_REQUIRED}
++            ${COREAUDIO_REQUIRED}
++            ${PULSE_REQUIRED}
++            ${JACK_REQUIRED}
++            ${TINYALSA_REQUIRED}
++            ${WIN32_REQUIRED}
++            ${WIN32_WASAPI_REQUIRED})
++        list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH)
++        if(NOT CHECK_MODULES_LENGTH EQUAL 0)
++            message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}")
++        endif()
+     endif()
+-endif()
+ 
+-if(NOT OUTPUT_MODULES)
+-    set(DEFAULT_OUTPUT_MODULE dummy)
+-    set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
+-else()
+-    list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE)
+-    set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module")
+-    if(BUILD_SHARED_LIBS)
+-        string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}")
+-    else()
++    if(NOT OUTPUT_MODULES)
++        set(DEFAULT_OUTPUT_MODULE dummy)
+         set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
++    else()
++        list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE)
++        set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module")
++        if(BUILD_SHARED_LIBS)
++            string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}")
++        else()
++            set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE})
++        endif()
++        set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES})
+     endif()
+-    set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES})
+ endif()
+ 
+ option(ACCURATE_ROUNDING "use rounding instead of fast truncation for integer output, where possible" ON)
+@@ -362,7 +364,9 @@ add_compile_options(
+ 
+ add_subdirectory("compat")
+ add_subdirectory("libmpg123")
+-add_subdirectory("libout123")
++if(BUILD_LIBOUT123)
++    add_subdirectory("libout123")
++endif()
+ add_subdirectory("libsyn123")
+ 
+ if(UNIX)
diff --git a/ports/mpg123/0004-fix-libsyn123-uwp-build.patch b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch
new file mode 100644
index 00000000000000..803296dedeb491
--- /dev/null
+++ b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch
@@ -0,0 +1,52 @@
+diff --git a/src/libmpg123/sample.h b/src/libmpg123/sample.h
+index 4d244fe..ed3ef86 100644
+--- a/src/libmpg123/sample.h
++++ b/src/libmpg123/sample.h
+@@ -171,7 +171,7 @@ static inline int16_t ftoi16(float x)
+ ( (u >= 2147483648UL) \
+ 	?	(int32_t)((uint32_t)u - (uint32_t)2147483648UL) \
+ 	:	((u == 0) \
+-		?	(int32_t)-2147483648UL \
++		?	-(int32_t)2147483648UL \
+ 		:	-(int32_t)((uint32_t)2147483648UL - u) ) \
+ )
+ 
+diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c
+index b92f7f2..3552ffa 100644
+--- a/src/libsyn123/resample.c
++++ b/src/libsyn123/resample.c
+@@ -2005,7 +2005,7 @@ syn123_resample_intotal_64(long inrate, long outrate, int64_t outs)
+ 	// First offset is -inrate.
+ 	// You may want to work it out for yourself. Or trust me;-)
+ 	int err;
+-	uint64_t vtot = muloffdiv64(outs, vinrate, -vinrate, voutrate, &err, NULL);
++	uint64_t vtot = muloffdiv64(outs, vinrate, -(int64_t)vinrate, voutrate, &err, NULL);
+ 	if(err)
+ 		return SYN123_OVERFLOW;
+ 	if(vtot == UINT64_MAX)
+diff --git a/src/libsyn123/sampleconv.c b/src/libsyn123/sampleconv.c
+index 6e8fb3f..7179957 100644
+--- a/src/libsyn123/sampleconv.c
++++ b/src/libsyn123/sampleconv.c
+@@ -21,6 +21,8 @@
+ #include "syn123_int.h"
+ #include "sample.h"
+ #include "debug.h"
++// Avoid conflict with pragmas in isnan() and friends.
++#undef warning
+ 
+ /* Conversions between native byte order encodings. */
+ 
+diff --git a/src/libsyn123/volume.c b/src/libsyn123/volume.c
+index de018a2..a80851d 100644
+--- a/src/libsyn123/volume.c
++++ b/src/libsyn123/volume.c
+@@ -12,6 +12,8 @@
+ #define NO_SMAX
+ #include "syn123_int.h"
+ #include "debug.h"
++// Avoid conflict with pragmas in isnan() and friends.
++#undef warning
+ 
+ static const double db_min = -SYN123_DB_LIMIT;
+ static const double db_max =  SYN123_DB_LIMIT;
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index eea5769e1575c8..dd12ddc0d595e5 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -1,26 +1,13 @@
-set(MPG123_VERSION 1.26.5)
-set(MPG123_HASH 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a)
+set(MPG123_VERSION 1.28.0)
+set(MPG123_HASH 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77)
 
-#architecture detection
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-   set(MPG123_ARCH Win32)
-   set(MPG123_CONFIGURATION _x86)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-   set(MPG123_ARCH x64)
-   set(MPG123_CONFIGURATION _x86)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-   set(MPG123_ARCH ARM)
-   set(MPG123_CONFIGURATION _Generic)
-elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-   set(MPG123_ARCH ARM64)
-   set(MPG123_CONFIGURATION _Generic)
-else()
-   message(FATAL_ERROR "unsupported architecture")
-endif()
-
-#linking
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(MPG123_CONFIGURATION_SUFFIX _Dll)
+set(PATCHES "")
+if(VCPKG_TARGET_IS_UWP)
+    set(PATCHES
+        0002-fix-libmpg123-uwp-build.patch
+        0003-fix-libout123-uwp-build.patch
+        0004-fix-libsyn123-uwp-build.patch
+    )
 endif()
 
 vcpkg_from_sourceforge(
@@ -30,60 +17,25 @@ vcpkg_from_sourceforge(
     FILENAME "mpg123-${MPG123_VERSION}.tar.bz2"
     SHA512 ${MPG123_HASH}
     PATCHES
-        0001-fix-x86-build.patch
+        0001-fix-checkcpuarch-path.patch
+        ${PATCHES}
 )
 
 include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
 yasm_tool_helper(APPEND_TO_PATH)
 
-macro(read_api_version)
-    file(READ "${SOURCE_PATH}/configure.ac" configure_ac)
-    string(REGEX MATCH "API_VERSION=([0-9]+)" result ${configure_ac})
-    set(API_VERSION ${CMAKE_MATCH_1})
-endmacro()
-
-if(VCPKG_TARGET_IS_UWP)
-    vcpkg_install_msbuild(
-        SOURCE_PATH ${SOURCE_PATH}
-        PROJECT_SUBPATH ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj
-        OPTIONS /p:UseEnv=True
-        PLATFORM ${MPG123_ARCH}
-        RELEASE_CONFIGURATION Release_uwp
-        DEBUG_CONFIGURATION Debug_uwp
-    )
-
-    file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/mpg123.h
-        ${SOURCE_PATH}/src/libmpg123/fmt123.h
-        DESTINATION ${CURRENT_PACKAGES_DIR}/include
-    )
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
 
-    read_api_version()
-    configure_file(
-        ${SOURCE_PATH}/src/libmpg123/mpg123.h.in
-        ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY
-    )
-
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_install_msbuild(
-        SOURCE_PATH ${SOURCE_PATH}
-        PROJECT_SUBPATH ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
-        OPTIONS /p:UseEnv=True
-        RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX}
-        DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX}
-    )
-
-    file(INSTALL
-        ${SOURCE_PATH}/ports/MSVC++/mpg123.h
-        ${SOURCE_PATH}/src/libmpg123/fmt123.h
-        DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    vcpkg_configure_cmake(
+        SOURCE_PATH ${SOURCE_PATH}/ports/cmake
+        OPTIONS -DUSE_MODULES=OFF
     )
+    vcpkg_install_cmake()
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+    vcpkg_fixup_pkgconfig()
 
-    read_api_version()
-    configure_file(
-        ${SOURCE_PATH}/src/libmpg123/mpg123.h.in
-        ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY
-    )
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX)
     set(MPG123_OPTIONS
diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json
index 1661997476cdd7..e699f891557b0e 100644
--- a/ports/mpg123/vcpkg.json
+++ b/ports/mpg123/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mpg123",
-  "version": "1.26.5",
+  "version": "1.28.0",
   "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).",
   "homepage": "https://sourceforge.net/projects/mpg123/",
   "dependencies": [
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index cd7b732c001604..547f7ba5daf086 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version-string": "1.1.1k",
-  "port-version": 5,
+  "port-version": 6,
   "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.",
   "homepage": "https://www.openssl.org"
 }
diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 7a3bf08ed57c4b..3065abddc6f04f 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED)
     set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared)
 endif()
 
+if(OPENSSL_NO_AUTOLOAD_CONFIG)
+    set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config)
+endif()
+
 set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS})
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake
index 542a16c2b8a300..7269aedcca508f 100644
--- a/ports/protobuf/vcpkg-cmake-wrapper.cmake
+++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake
@@ -11,6 +11,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
     cmake_policy(POP)
 endif()
 
-find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH)
+find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH)
 
 _find_package(${ARGS})
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 5f1926a088ef4d..0e85e376c0ca9e 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "protobuf",
   "version-semver": "3.15.8",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Protocol Buffers - Google's data interchange format",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "dependencies": [
diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt
index 5b54f6e208a621..7ccc0828a1f31b 100644
--- a/ports/recast/CMakeLists.txt
+++ b/ports/recast/CMakeLists.txt
@@ -1,14 +1,6 @@
 cmake_minimum_required(VERSION 3.8)
 project(recast)
 
-include_directories(
-  DebugUtils/Include
-  Detour/Include
-  DetourCrowd/Include
-  DetourTileCache/Include
-  Recast/Include
-)
-
 set(SRC
   DebugUtils/Source/DebugDraw.cpp
   DebugUtils/Source/DetourDebugDraw.cpp
@@ -42,12 +34,30 @@ set(SRC
 
 add_library(recast ${SRC})
 
+target_include_directories(
+  recast PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DebugUtils/Include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Detour/Include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourCrowd/Include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/DetourTileCache/Include>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Recast/Include>
+  $<INSTALL_INTERFACE:include>
+  $<INSTALL_INTERFACE:include/Detour/Include>
+  $<INSTALL_INTERFACE:include/DetourCrowd/Include>
+  $<INSTALL_INTERFACE:include/DetourTileCache/Include>
+  $<INSTALL_INTERFACE:include/Recast/Include>
+  $<INSTALL_INTERFACE:include/DebugUtils/Include>
+)
+
 install(
   TARGETS recast
+  EXPORT unofficial-recast-config
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
 
+install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast)
+
 if(NOT DISABLE_INSTALL_HEADERS)
   install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils)
   install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour)
diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL
deleted file mode 100644
index 3726b99d501307..00000000000000
--- a/ports/recast/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: recast
-Version: 1.5.1-3
-Homepage: https://github.com/recastnavigation/recastnavigation
-Description: Navigation-mesh Toolset for Games
diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake
index 3b6038e41c5b92..11484caa16b9d1 100644
--- a/ports/recast/portfile.cmake
+++ b/ports/recast/portfile.cmake
@@ -8,16 +8,18 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-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_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/recast RENAME copyright)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast)
 
 vcpkg_copy_pdbs()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json
new file mode 100644
index 00000000000000..5abe9f93b06f5d
--- /dev/null
+++ b/ports/recast/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "recast",
+  "version": "1.5.1",
+  "port-version": 4,
+  "description": "Navigation-mesh Toolset for Games",
+  "homepage": "https://github.com/recastnavigation/recastnavigation",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch
new file mode 100644
index 00000000000000..4a39a8a5a1aa96
--- /dev/null
+++ b/ports/rmlui/add-robin-hood.patch
@@ -0,0 +1,38 @@
+diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake
+index 9c3042c..c3820df 100644
+--- a/CMake/FileList.cmake
++++ b/CMake/FileList.cmake
+@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp
+-    ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h
+     ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62432f1..d9287c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN )
+ 	message("-- Can SVG plugin be enabled - yes - lunasvg library found")
+ endif()
+ 
++find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h)
++include_directories(${ROBIN_HOOD_INCLUDE_DIR})
+ 
+ if(NOT BUILD_FRAMEWORK)
+ #===================================
+diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h
+index dc42753..5249e1d 100644
+--- a/Include/RmlUi/Config/Config.h
++++ b/Include/RmlUi/Config/Config.h
+@@ -57,7 +57,7 @@
+ #else
+ #include "../Core/Containers/chobo/flat_map.hpp"
+ #include "../Core/Containers/chobo/flat_set.hpp"
+-#include "../Core/Containers/robin_hood.h"
++#include <robin_hood.h>
+ #endif	// RMLUI_NO_THIRDPARTY_CONTAINERS
+ 
+ namespace Rml {
diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake
new file mode 100644
index 00000000000000..cf9ec6f057002d
--- /dev/null
+++ b/ports/rmlui/portfile.cmake
@@ -0,0 +1,56 @@
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO mikke89/RmlUi
+	REF 4.1
+	SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01
+	HEAD_REF master
+	PATCHES
+		add-robin-hood.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+	FEATURES 
+		lua             BUILD_LUA_BINDINGS
+	INVERTED_FEATURES
+		freetype        NO_FONT_INTERFACE_DEFAULT
+)
+
+# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port)
+file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h)
+
+vcpkg_cmake_configure(
+	SOURCE_PATH ${SOURCE_PATH}
+	OPTIONS
+		${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(
+	CONFIG_PATH  lib/RmlUi/cmake
+)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE 
+	${CURRENT_PACKAGES_DIR}/debug/include
+	${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi
+	${CURRENT_PACKAGES_DIR}/lib/RmlUi
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h
+		"#if !defined RMLUI_STATIC_LIB"
+		"#if 0"
+	)
+	vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h
+		"#if !defined RMLUI_STATIC_LIB"
+		"#if 0"
+	)
+	if ("lua" IN_LIST FEATURES)
+		vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h
+			"#if !defined RMLUI_STATIC_LIB"
+			"#if 0"
+		)
+	endif()
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json
new file mode 100644
index 00000000000000..9b42867c63570c
--- /dev/null
+++ b/ports/rmlui/vcpkg.json
@@ -0,0 +1,34 @@
+{
+  "name": "rmlui",
+  "version": "4.1",
+  "maintainers": "Michael R. P. Ragazzon <mikke89@users.noreply.github.com>",
+  "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.",
+  "homepage": "https://github.com/mikke89/RmlUi",
+  "documentation": "https://mikke89.github.io/RmlUiDoc/",
+  "license": "MIT",
+  "dependencies": [
+    "robin-hood-hashing",
+    "vcpkg-cmake",
+    "vcpkg-cmake-config"
+  ],
+  "default-features": [
+    "freetype"
+  ],
+  "features": {
+    "freetype": {
+      "description": "Include font engine based on FreeType",
+      "dependencies": [
+        {
+          "name": "freetype",
+          "default-features": false
+        }
+      ]
+    },
+    "lua": {
+      "description": "Build Lua bindings",
+      "dependencies": [
+        "lua"
+      ]
+    }
+  }
+}
diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake
index f24241a3f9475d..b458c9067f7209 100644
--- a/ports/seal/portfile.cmake
+++ b/ports/seal/portfile.cmake
@@ -31,7 +31,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.6")
 
 if("hexl" IN_LIST FEATURES)
     vcpkg_fixup_pkgconfig(SKIP_CHECK)
diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json
index ef5b166a57de3f..f7a7928dd8e3ee 100644
--- a/ports/seal/vcpkg.json
+++ b/ports/seal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "seal",
   "version-semver": "3.6.6",
+  "port-version": 1,
   "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.",
   "homepage": "https://github.com/microsoft/SEAL",
   "supports": "!windows | (windows & static)",
diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake
index 706d212d21b471..e810d504ced2b7 100644
--- a/ports/sentry-native/portfile.cmake
+++ b/ports/sentry-native/portfile.cmake
@@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.9/sentry-native.zip"
-    FILENAME "sentry-native-0.4.9.zip"
-    SHA512 152e3c6cfc7a72421f088f0e9853f016b62e2c22c580edb6255355648d293a31507974bc5c12ef3c0cd721d07797b9948f53ecafa1482d3264504cafac1fe8a3
+    URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.10/sentry-native.zip"
+    FILENAME "sentry-native-0.4.10.zip"
+    SHA512 fd7aa8de707b19dfc3704e3f1d73bb35aa65cf26e95df0baf2061ce756232b76b26d406ffc11b53e57d949f5f14899265095d8d4d3f8ff4777cdeceeca5b6f94
 )
 
 vcpkg_extract_source_archive_ex(
diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json
index cca64cbfbf2e91..131b08ce3b6f0f 100644
--- a/ports/sentry-native/vcpkg.json
+++ b/ports/sentry-native/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sentry-native",
-  "version-semver": "0.4.9",
-  "port-version": 1,
+  "version-semver": "0.4.10",
   "description": "Sentry SDK for C, C++ and native applications.",
   "homepage": "https://sentry.io/",
   "supports": "!(arm | (arm64 & !osx) | uwp)",
diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL
deleted file mode 100644
index e25840834342e1..00000000000000
--- a/ports/simage/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: simage
-Version: 1.8.0
-Port-Version: 1
-Description: Image file format library abstraction layer
-Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx)
-Homepage: https://github.com/coin3d/simage
diff --git a/ports/simage/disable-cpackd.patch b/ports/simage/disable-cpackd.patch
deleted file mode 100644
index 6fd227a62a5bb6..00000000000000
--- a/ports/simage/disable-cpackd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 775037a..e3deb01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -627,4 +627,4 @@ install(EXPORT ${PROJECT_NAME}
- 
- # ############################################################################
- # New CPACK section, please see the README file inside cpack.d directory.
--add_subdirectory(cpack.d)
-+#add_subdirectory(cpack.d)
diff --git a/ports/simage/disable-examples.patch b/ports/simage/disable-examples.patch
deleted file mode 100644
index dc9236c97f5449..00000000000000
--- a/ports/simage/disable-examples.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 775037a..fbd81b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -482,23 +489,23 @@ endif()
- # Build examples
- # ############################################################################
- 
--set(SIMAGE_EXAMPLE_SOURCE
--  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c
-+#set(SIMAGE_EXAMPLE_SOURCE
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c
- #  ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build
--  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c
--)
--
--foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
--  get_filename_component(_example ${_source} NAME_WE)
--  add_executable(${_example} ${_source})
--  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
--  target_link_libraries(${_example} simage)
--  if(UNIX)
--    target_link_libraries(${_example} m)
--  endif()
--endforeach()
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c
-+#)
-+
-+#foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
-+#  get_filename_component(_example ${_source} NAME_WE)
-+#  add_executable(${_example} ${_source})
-+#  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
-+#  target_link_libraries(${_example} simage)
-+#  if(UNIX)
-+#    target_link_libraries(${_example} m)
-+#  endif()
-+#endforeach()
- 
- # ############################################################################
- # Build tests
diff --git a/ports/simage/disable-tests.patch b/ports/simage/disable-tests.patch
deleted file mode 100644
index 46790227fa21df..00000000000000
--- a/ports/simage/disable-tests.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 775037a..b82734a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -504,25 +511,25 @@ endforeach()
- # Build tests
- # ############################################################################
- 
--enable_testing()
--
--add_executable(loaders tests/loaders.c)
--target_link_libraries(loaders simage)
--target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
--if(UNIX)
--  target_link_libraries(loaders m)
--endif()
--
--add_test(
--  loaders
--  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga
--  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif
--)
-+#enable_testing()
-+
-+#add_executable(loaders tests/loaders.c)
-+#target_link_libraries(loaders simage)
-+#target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)
-+#if(UNIX)
-+#  target_link_libraries(loaders m)
-+#endif()
-+
-+#add_test(
-+#  loaders
-+#  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga
-+#  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif
-+#)
- 
- # Add a target to generate API documentation with Doxygen
- if(SIMAGE_BUILD_DOCUMENTATION)
diff --git a/ports/simage/link-flac-library.patch b/ports/simage/link-flac-library.patch
deleted file mode 100644
index 7b8e35a10c28ae..00000000000000
--- a/ports/simage/link-flac-library.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 775037a..2de9b9f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -108,6 +108,10 @@ find_package(Jasper)
- find_package(OggVorbis)
- find_package(Sndfile)
- 
-+if(SNDFILE_FOUND)
-+  find_package(FLAC)
-+endif()
-+
- if(APPLE AND SIMAGE_USE_CGIMAGE)
-   check_cxx_source_compiles("
-     #include <CoreFoundation/CoreFoundation.h>
-@@ -467,6 +471,9 @@ endif()
- if(SNDFILE_FOUND)
-   target_include_directories(simage PRIVATE ${SNDFILE_INCLUDE_DIRS})
-   target_link_libraries(simage PRIVATE ${SNDFILE_LIBRARIES})
-+  if(FLAC_FOUND)
-+    target_link_libraries(simage PRIVATE ${FLAC_LIBRARIES})
-+  endif()
- endif()
- 
- if(TIFF_FOUND)
-diff --git a/FindFLAC.cmake b/FindFLAC.cmake
-new file mode 100644
-index 0000000..ce40a11
---- /dev/null
-+++ b/FindFLAC.cmake
-@@ -0,0 +1,29 @@
-+include(FindPackageHandleStandardArgs)
-+
-+find_path(FLAC_INCLUDE_DIR FLAC/all.h)
-+
-+mark_as_advanced(FLAC_INCLUDE_DIR)
-+
-+set(FLAC_INCLUDE_DIRS ${FLAC_INCLUDE_DIR})
-+
-+find_library(FLAC_LIBRARY NAMES FLAC)
-+
-+mark_as_advanced(
-+	FLAC_INCLUDE_DIR
-+	FLAC_LIBRARY
-+)
-+
-+set(FLAC_LIBRARIES ${FLAC_LIBRARY})
-+
-+find_package_handle_standard_args(
-+	FLAC
-+	DEFAULT_MSG
-+	FLAC_INCLUDE_DIRS
-+	FLAC_LIBRARIES
-+)
-+
-+if(FLAC_FOUND AND NOT TARGET FLAC::FLAC)
-+	add_library(FLAC::FLAC UNKNOWN IMPORTED)
-+	set_target_properties(FLAC::FLAC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}")
-+	set_property(TARGET FLAC::FLAC APPEND PROPERTY IMPORTED_LOCATION "${FLAC_LIBRARY}")
-+endif()
diff --git a/ports/simage/link-math-library.patch b/ports/simage/link-math-library.patch
deleted file mode 100644
index 4ffe98bf1aba39..00000000000000
--- a/ports/simage/link-math-library.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4a978dd..e7abd57 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -454,6 +454,9 @@ endif()
- if(PNG_FOUND)
-   target_include_directories(simage PRIVATE ${PNG_INCLUDE_DIR})
-   target_link_libraries(simage PRIVATE ${PNG_LIBRARIES})
-+  if(UNIX)
-+    target_link_libraries(simage PRIVATE m)
-+  endif()
- endif()
- 
- if(SIMAGE_QIMAGE_SUPPORT)
diff --git a/ports/simage/link-ogg-library.patch b/ports/simage/link-ogg-library.patch
deleted file mode 100644
index 752754411bfbe2..00000000000000
--- a/ports/simage/link-ogg-library.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/FindOggVorbis.cmake b/FindOggVorbis.cmake
-index a33e63e..7e2708b 100644
---- a/FindOggVorbis.cmake
-+++ b/FindOggVorbis.cmake
-@@ -28,10 +28,10 @@ mark_as_advanced(
- 
- set(
- 	OGGVORBIS_LIBRARIES
--	${OGG_LIBRARY}
- 	${VORBIS_LIBRARY}
- 	${VORBISFILE_LIBRARY}
- 	${VORBISENC_LIBRARY}
-+	${OGG_LIBRARY}
- )
- 
- find_package_handle_standard_args(
diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake
index 6b890c8a5c75b3..6868fb16e13bc3 100644
--- a/ports/simage/portfile.cmake
+++ b/ports/simage/portfile.cmake
@@ -1,64 +1,79 @@
+vcpkg_fail_port_install(ON_TARGET "uwp")
+
+set(SIMAGE_VERSION 1.8.1)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Coin3D/simage
-    REF simage-1.8.0
-    SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c
+    REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1
+    SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1
     HEAD_REF master
-    PATCHES
-        disable-cpackd.patch
-        disable-examples.patch
-        disable-tests.patch
-        link-flac-library.patch
-        link-math-library.patch
-        link-ogg-library.patch
-        potentially-uninitialized-local-pointer-variable.patch
+    PATCHES requies-all-dependencies.patch
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(SIMAGE_BUILD_SHARED_LIBS OFF)
-else()
-    set(SIMAGE_BUILD_SHARED_LIBS ON)
-endif()
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMAGE_BUILD_SHARED_LIBS)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMAGE_USE_STATIC_LIBS)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNTIME)
 
-set(OSX_OR_WINDOWS OFF)
-if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX)
-    set(OSX_OR_WINDOWS ON)
-endif()
 
-if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
-    set(SIMAGE_USE_AVIENC ON)
-    set(SIMAGE_USE_GDIPLUS ON)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        oggvorbis   SIMAGE_OGGVORBIS_SUPPORT
+        sndfile     SIMAGE_LIBSNDFILE_SUPPORT
+)
+
+# Depends on the platform
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(SIMAGE_ON_WIN ON)
+    set(SIMAGE_ON_NON_WIN OFF)
 else()
-    set(SIMAGE_USE_AVIENC OFF)
-    set(SIMAGE_USE_GDIPLUS OFF)
+    set(SIMAGE_ON_WIN OFF)
+    set(SIMAGE_ON_NON_WIN ON)
 endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS}
-        -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC}
-        -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS}
-        -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS}
-        -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS}
-        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS}
-        -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS}
-        -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS}
+    OPTIONS ${FEATURE_OPTIONS}
+        -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS}
+        -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS}
+        -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME}
+        -DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN}
+        -DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN}
+        # Available on Linux, OSX and Windows without gdiplus
+        -DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN}
+        -DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN}
+        -DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN}
+        -DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN}
+        -DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN}
+        #
+        -DSIMAGE_USE_CGIMAGE=OFF
+        -DSIMAGE_USE_QIMAGE=OFF
+        -DSIMAGE_USE_QT6=OFF
+        -DSIMAGE_USE_QT5=OFF
+        -DSIMAGE_USE_CPACK=OFF
+        -DSIMAGE_LIBJASPER_SUPPORT=OFF
+        -DSIMAGE_EPS_SUPPORT=OFF
+        -DSIMAGE_MPEG2ENC_SUPPORT=OFF
+        -DSIMAGE_PIC_SUPPORT=OFF
+        -DSIMAGE_RGB_SUPPORT=OFF
+        -DSIMAGE_XWD_SUPPORT=OFF
+        -DSIMAGE_TGA_SUPPORT=OFF
+        -DSIMAGE_BUILD_MSVC_MP=OFF
+        -DSIMAGE_BUILD_EXAMPLES=OFF
+        -DSIMAGE_BUILD_TESTS=OFF
+        -DSIMAGE_BUILD_DOCUMENTATION=OFF
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-1.8.0)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION})
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+    vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN)
 endif()
 
 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/${PORT}" RENAME copyright)
diff --git a/ports/simage/potentially-uninitialized-local-pointer-variable.patch b/ports/simage/potentially-uninitialized-local-pointer-variable.patch
deleted file mode 100644
index 1b74a2f89878cd..00000000000000
--- a/ports/simage/potentially-uninitialized-local-pointer-variable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/examples/img2avi.c b/examples/img2avi.c
-index 7a5ca96..d0ee057 100644
---- a/examples/img2avi.c
-+++ b/examples/img2avi.c
-@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
-   int first;
-   int width;
-   int height;
--  s_movie * movie;
-+  s_movie * movie = NULL;
-   s_params * params;
-   s_image *image;
-   char formatbuf[20];
-diff --git a/mpeg2enc/putvlc.c b/mpeg2enc/putvlc.c
-index 6a84fbd..b373fea 100644
---- a/mpeg2enc/putvlc.c
-+++ b/mpeg2enc/putvlc.c
-@@ -103,7 +103,7 @@ void
- simpeg_encode_putAC(simpeg_encode_context * context,int run, int signed_level, int vlcformat)
- {
-   int level, len;
--  VLCtable *ptab;
-+  VLCtable *ptab = NULL;
- 
-   level = (signed_level<0) ? -signed_level : signed_level; /* abs(signed_level) */
- 
diff --git a/ports/simage/requies-all-dependencies.patch b/ports/simage/requies-all-dependencies.patch
new file mode 100644
index 00000000000000..ef0536a960c65e
--- /dev/null
+++ b/ports/simage/requies-all-dependencies.patch
@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d869715..073a73f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,10 +117,10 @@ endif()
+ # On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF.
+ # see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about
+ if(SIMAGE_USE_GDIPLUS)
+-  find_package(GdiPlus)
++  find_package(GdiPlus REQUIRED)
+ endif()
+ if(SIMAGE_USE_AVIENC)
+-  find_package(Vfw)
++  find_package(Vfw REQUIRED)
+ endif()
+ 
+ # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA.
+@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT)
+   find_package(Ogg REQUIRED)
+   find_package(Vorbis REQUIRED)
+   if(OGG_FOUND)
+-    find_package(Opus)
++    find_package(Opus REQUIRED)
+   endif()
+ endif()
+ 
+@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD
+   if(SIMAGE_TIFF_SUPPORT)
+     find_package(TIFF REQUIRED)
+     if(TIFF_FOUND)
+-      find_package(LibLZMA)
+-      find_package(Zstd)
++      find_package(LibLZMA REQUIRED)
++      find_package(Zstd REQUIRED)
+     endif()
+   endif()
+ 
diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json
new file mode 100644
index 00000000000000..2b50a2c6dc19f6
--- /dev/null
+++ b/ports/simage/vcpkg.json
@@ -0,0 +1,118 @@
+{
+  "name": "simage",
+  "version-semver": "1.8.1",
+  "description": "Image file format library abstraction layer",
+  "homepage": "https://github.com/coin3d/simage",
+  "supports": "!uwp",
+  "default-features": [
+    "all"
+  ],
+  "features": {
+    "all": {
+      "description": "Enable all features",
+      "dependencies": [
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "oggvorbis"
+          ]
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "sndfile"
+          ]
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "giflib"
+          ],
+          "platform": "!windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "jpeg"
+          ],
+          "platform": "!windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "png"
+          ],
+          "platform": "!windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "tiff"
+          ],
+          "platform": "!windows"
+        },
+        {
+          "name": "simage",
+          "default-features": false,
+          "features": [
+            "zlib"
+          ],
+          "platform": "!windows"
+        }
+      ]
+    },
+    "giflib": {
+      "description": "Enable support for GIF images",
+      "dependencies": [
+        "giflib"
+      ]
+    },
+    "jpeg": {
+      "description": "Enable support for JPEG images",
+      "dependencies": [
+        "libjpeg-turbo"
+      ]
+    },
+    "oggvorbis": {
+      "description": "Enable support for ogg/vorbis extensions",
+      "dependencies": [
+        "libogg",
+        "libvorbis",
+        "opus"
+      ]
+    },
+    "png": {
+      "description": "Enable support for PNG images",
+      "dependencies": [
+        "libpng"
+      ]
+    },
+    "sndfile": {
+      "description": "Use libsndfile to load/save sampled sound",
+      "dependencies": [
+        "libflac",
+        "libsndfile"
+      ]
+    },
+    "tiff": {
+      "description": "Enable support for TIFF images",
+      "dependencies": [
+        "liblzma",
+        "tiff",
+        "zstd"
+      ]
+    },
+    "zlib": {
+      "description": "Enable support for zlib library",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake
new file mode 100644
index 00000000000000..ce37b7ce7e4f40
--- /dev/null
+++ b/ports/sleef/portfile.cmake
@@ -0,0 +1,29 @@
+# x86: Reports ICE(Internal Compiler Error) for x86-windows/release.
+#      see ${SOURCE_PATH}/src/libm/sleefsimddp.c
+# uwp: codegen fails
+vcpkg_fail_port_install(ON_TARGET "uwp")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO shibatch/sleef
+    REF 3.5.1
+    SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DBUILD_LIBM=ON
+        -DBUILD_DFT=ON
+        -DBUILD_QUAD=ON
+        -DBUILD_GNUABILIBS=${VCPKG_TARGET_IS_LINUX}
+        -DBUILD_TESTS=OFF
+        -DBUILD_INLINE_HEADERS=OFF
+)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json
new file mode 100644
index 00000000000000..dcd74f6fc96250
--- /dev/null
+++ b/ports/sleef/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "sleef",
+  "version": "3.5.1",
+  "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT",
+  "homepage": "https://sleef.org/",
+  "license": "BSL-1.0",
+  "supports": "!uwp & !(arm & windows)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL
deleted file mode 100644
index bd7b036a8d09e9..00000000000000
--- a/ports/socket-io-client/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: socket-io-client
-Version: 1.6.1-1
-Description: C++11 implementation of Socket.IO client
-Build-Depends: boost, rapidjson, websocketpp
diff --git a/ports/socket-io-client/fix-error-C3321.patch b/ports/socket-io-client/fix-error-C3321.patch
new file mode 100644
index 00000000000000..6a36e9d979f87d
--- /dev/null
+++ b/ports/socket-io-client/fix-error-C3321.patch
@@ -0,0 +1,13 @@
+diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
+index f78aea4..6780e26 100644
+--- a/src/internal/sio_client_impl.cpp
++++ b/src/internal/sio_client_impl.cpp
+@@ -286,7 +286,7 @@ namespace sio
+         if(ec || m_con.expired())
+         {
+             if (ec != asio::error::operation_aborted)
+-                LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl){};
++                LOG("ping exit,con is expired?"<<m_con.expired()<<",ec:"<<ec.message()<<endl);
+             return;
+         }
+         packet p(packet::frame_ping);
diff --git a/ports/socket-io-client/fix-file-not-found.patch b/ports/socket-io-client/fix-file-not-found.patch
new file mode 100644
index 00000000000000..a7fbdb1e3a48c9
--- /dev/null
+++ b/ports/socket-io-client/fix-file-not-found.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19c5e54..ca8a00d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,16 +31,20 @@ add_definitions(
+     -D_WEBSOCKETPP_CPP11_FUNCTIONAL_
+ )
+ 
++find_package(websocketpp CONFIG REQUIRED)
++find_package(asio CONFIG REQUIRED)
++find_package(RapidJSON CONFIG REQUIRED)
++
+ add_library(sioclient ${ALL_SRC})
+ target_include_directories(sioclient PRIVATE 
+     ${CMAKE_CURRENT_LIST_DIR}/src 
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp 
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
+ )
+ 
+ set_property(TARGET sioclient PROPERTY CXX_STANDARD 11)
+ set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON)
++target_link_libraries(sioclient PRIVATE websocketpp::websocketpp)
++target_link_libraries(sioclient PRIVATE asio asio::asio)
++target_link_libraries(sioclient PRIVATE rapidjson)
+ 
+ if(BUILD_SHARED_LIBS)
+ set_target_properties(sioclient
+@@ -56,9 +60,6 @@ if(OPENSSL_FOUND)
+ add_library(sioclient_tls ${ALL_SRC})
+ target_include_directories(sioclient_tls PRIVATE
+     ${CMAKE_CURRENT_LIST_DIR}/src 
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp 
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include
+-    ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include
+     ${OPENSSL_INCLUDE_DIR}
+ )
+ 
diff --git a/ports/socket-io-client/fix-install.patch b/ports/socket-io-client/fix-install.patch
deleted file mode 100644
index 2c9cc0e820023e..00000000000000
--- a/ports/socket-io-client/fix-install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c2fad3..3f322b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,13 +72,11 @@ list(APPEND TARGET_LIBRARIES sioclient_tls)
- endif()
- 
- install(FILES ${ALL_HEADERS} 
--    DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/include"
-+    DESTINATION include
- )
- 
- install(TARGETS ${TARGET_LIBRARIES}
--    DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
--)
--
--install(FILES ${Boost_LIBRARIES} 
--    DESTINATION "${CMAKE_CURRENT_LIST_DIR}/build/lib/${CMAKE_BUILD_TYPE}"
-+    RUNTIME DESTINATION bin
-+    LIBRARY DESTINATION lib
-+    ARCHIVE DESTINATION lib
- )
diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake
index 6f2041ae2cebb7..7b81118ba8ff3b 100644
--- a/ports/socket-io-client/portfile.cmake
+++ b/ports/socket-io-client/portfile.cmake
@@ -3,12 +3,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO socketio/socket.io-client-cpp
-    REF 1.6.1
-    SHA512 01c9c172e58a16b25af07c6bde593507792726aca28a9b202ed9531d51cd7e77c7e7d536102e50265d66de96e9708616075902dfdcfc72983758755381bad707
+    REF 3.0.0
+    SHA512 42735d73d24546b37332d649a2633f4a1b6e004b016c45d53bd8e230a157753bb319c80a59721865b9c3dcc588b4eec3cdf4ae9f7fc2cdf290b6bb07c866552c
     HEAD_REF master
-    PATCHES fix-install.patch
+    PATCHES
+        fix-file-not-found.patch
+        fix-error-C3321.patch
 )
 
+file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzstd.cmake")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -18,5 +22,4 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/socket-io-client/copyright COPYONLY)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json
new file mode 100644
index 00000000000000..6ecf8b90b43fd5
--- /dev/null
+++ b/ports/socket-io-client/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "socket-io-client",
+  "version": "3.0.0",
+  "description": "C++11 implementation of Socket.IO client",
+  "homepage": "https://github.com/socketio/socket.io-client-cpp",
+  "dependencies": [
+    "asio",
+    "rapidjson",
+    "websocketpp"
+  ]
+}
diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake
index 1af8b142b0735a..0d95db43a76aab 100644
--- a/ports/spdlog/portfile.cmake
+++ b/ports/spdlog/portfile.cmake
@@ -21,6 +21,7 @@ vcpkg_cmake_configure(
         -DSPDLOG_FMT_EXTERNAL=ON
         -DSPDLOG_INSTALL=ON
         -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED}
+        -DSPDLOG_BUILD_EXAMPLE=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json
index aa24c34b7246c4..21f33d83defaac 100644
--- a/ports/spdlog/vcpkg.json
+++ b/ports/spdlog/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "spdlog",
   "version-semver": "1.8.5",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Very fast, header only, C++ logging library",
   "homepage": "https://github.com/gabime/spdlog",
   "dependencies": [
diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt
index a485d119d53dfb..ae53c40f2a6251 100644
--- a/ports/tbb/CMakeLists.txt
+++ b/ports/tbb/CMakeLists.txt
@@ -1,13 +1,9 @@
 project(tbb CXX)
 
-option(DISABLE_EXCEPTIONS "Set exceptions=0 for make to turn off exception support in TBB" OFF)
 file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src)
 
 include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED)
-if(DISABLE_EXCEPTIONS)
-    set(DISABLE_EXCEPTIONS_ARG exceptions=0)
-endif()
 if(NOT BUILD_SHARED_LIBS)
     set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc)
 endif()
@@ -30,7 +26,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   endif()
 endif()
 
-tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${DISABLE_EXCEPTIONS_ARG} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
+tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT})
 
 set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir)
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index ea2bdc140dea17..b089a3e7d91707 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,6 +1,6 @@
 Source: tbb
 Version: 2020_U3
-Port-Version: 4
+Port-Version: 5
 Homepage: https://github.com/01org/tbb
 Description: Intel's Threading Building Blocks.
 Supports: !(uwp|arm|arm64) | linux | osx
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index ada16a7d7138ad..bf65511b788943 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -14,22 +14,11 @@ vcpkg_from_github(
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-if (TBB_DISABLE_EXCEPTIONS)
-    message(STATUS "Building TBB with exception-handling constructs disabled because TBB_DISABLE_EXCEPTIONS is set to ON.")
-else()
-    message(STATUS "TBB uses exception-handling constructs by default (if supported by the compiler). This use can be disabled with 'SET(TBB_DISABLE_EXCEPTIONS ON)' in your custom triplet.")
-endif()
 
 if (NOT VCPKG_TARGET_IS_WINDOWS)
-    if (TBB_DISABLE_EXCEPTIONS)
-        set(DISABLE_EXCEPTIONS ON)
-    else()
-        set(DISABLE_EXCEPTIONS OFF)
-    endif()
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         PREFER_NINJA
-        OPTIONS -DDISABLE_EXCEPTIONS=${DISABLE_EXCEPTIONS}
     )
 
     vcpkg_install_cmake()
@@ -73,10 +62,6 @@ else()
             string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE"
                         "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}")
         endif()
-        if (TBB_DISABLE_EXCEPTIONS)
-            string(REPLACE "<PreprocessorDefinitions>%(PreprocessorDefinitions)<\/PreprocessorDefinitions>"
-                        "<PreprocessorDefinitions>TBB_USE_EXCEPTIONS=0;%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" SLN_CONFIGURE "${SLN_CONFIGURE}")
-        endif()
         file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}")
     endmacro()
 
diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json
index 96fef2d0973832..387a20c909c0ac 100644
--- a/ports/tgui/vcpkg.json
+++ b/ports/tgui/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tgui",
   "version-date": "2021-04-19",
-  "port-version": 1,
+  "port-version": 2,
   "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.",
   "homepage": "https://tgui.eu",
   "default-features": [
@@ -35,7 +35,16 @@
       ]
     },
     "tool": {
-      "description": "Build GUI builder"
+      "description": "Build GUI builder",
+      "dependencies": [
+        {
+          "name": "tgui",
+          "features": [
+            "sdl2",
+            "sfml"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL
index c3962f4b49e55f..8b905405668846 100644
--- a/ports/vc/CONTROL
+++ b/ports/vc/CONTROL
@@ -1,6 +1,5 @@
 Source: vc
-Version: 1.4.1
-Port-Version: 1
+Version: 1.4.2
 Homepage: https://github.com/VcDevel/Vc
 Description: SIMD Vector Classes for C++ .
 Supports: !arm64
diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake
index 7853834d1a61b8..3b51c814190784 100644
--- a/ports/vc/portfile.cmake
+++ b/ports/vc/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm64")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  VcDevel/Vc 
-    REF 1.4.1
-    SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
+    REF 1.4.2
+    SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf
     HEAD_REF 1.4
     PATCHES
         "correct_cmake_config_path.patch"
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
index 8e2ac9ec664858..ffda714e3fe066 100644
--- a/ports/vcpkg-cmake/vcpkg.json
+++ b/ports/vcpkg-cmake/vcpkg.json
@@ -1,5 +1,5 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2021-02-28",
-  "port-version": 3
+  "version-date": "2021-06-25",
+  "port-version": 4
 }
diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
index acc6f365547aa8..beffd32b0519ba 100644
--- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
+++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -251,6 +251,7 @@ function(vcpkg_cmake_configure)
     endif()
 
 
+    list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string)
     list(APPEND arg_OPTIONS
         "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
@@ -274,7 +275,7 @@ function(vcpkg_cmake_configure)
         "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
         "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
         "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
-        "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
+        "-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}"
         "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
         "-DCMAKE_INSTALL_BINDIR:STRING=bin"
         "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
@@ -289,7 +290,8 @@ function(vcpkg_cmake_configure)
     # Sets configuration variables for macOS builds
     foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
         if(DEFINED VCPKG_${config_var})
-            list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
+            list(JOIN VCPKG_${config_var} "\;" config_var_value)
+            list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}")
         endif()
     endforeach()
 
diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 83ef7e27c30408..0c126d886c65b2 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -14,9 +14,9 @@ jobs:
     value: /mnt/vcpkg-ci
   - name: VCPKG_DOWNLOADS
     value: /mnt/vcpkg-ci/downloads
-  - group: azblob-test-sas-group
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - bash: df -h
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 19612c3cc88ecc..2e9f05d6379dcd 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -17,8 +17,9 @@ jobs:
   - group: osx-2021-04-16
   - name: BINARY_SOURCE_STUB
     value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - bash: df -h
diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml
index d440ef7fa82189..93690e957df794 100644
--- a/scripts/azure-pipelines/windows-unstable/job.yml
+++ b/scripts/azure-pipelines/windows-unstable/job.yml
@@ -14,6 +14,9 @@ jobs:
     value: D:\
   - name: VCPKG_DOWNLOADS
     value: D:\downloads
+  - group: vcpkg-asset-caching-credentials
+  - name: X_VCPKG_ASSET_SOURCES
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - task: DownloadBuildArtifacts@0
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index a822888ab7afee..ed5a0a405040bf 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -14,9 +14,9 @@ jobs:
     value: D:\
   - name: VCPKG_DOWNLOADS
     value: D:\downloads
-  - group: azblob-test-sas-group
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - task: PowerShell@2
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 37cab340fbeb02..6ffcddddcecf21 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-19/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
+& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-29/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 Write-Host ""
 
 if ($LASTEXITCODE -ne 0)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 4ee1c11eb6194a..0c612cff2af07e 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -278,8 +278,8 @@ else
 fi
 
 # Do the build
-vcpkgToolReleaseTag="2021-06-19"
-vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef"
+vcpkgToolReleaseTag="2021-06-29"
+vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b"
 vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
 baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 58d3da956a0a10..a25f0f716c1d7b 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -609,29 +609,48 @@ endfunction()
 #
 # Note that this function requires CMake 3.14 for policy CMP0087
 function(x_vcpkg_install_local_dependencies)
-    if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp")
-        cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION;COMPONENT" "TARGETS")
+    if(CMAKE_VERSION VERSION_LESS "3.14")
+        message(FATAL_ERROR "x_vcpkg_install_local_dependencies and X_VCPKG_APPLOCAL_DEPS_INSTALL require at least CMake 3.14
+(current version: ${CMAKE_VERSION})"
+        )
+    endif()
+
+    cmake_parse_arguments(PARSE_ARGV 0 arg
+        ""
+        "DESTINATION;COMPONENT"
+        "TARGETS"
+    )
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+    if(NOT DEFINED arg_DESTINATION)
+        message(FATAL_ERROR "DESTINATION must be specified")
+    endif()
+
+    if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$")
+        # Install CODE|SCRIPT allow the use of generator expressions
+        cmake_policy(SET CMP0087 NEW)
+
         z_vcpkg_set_powershell_path()
-        if(NOT IS_ABSOLUTE "${__VCPKG_APPINSTALL_DESTINATION}")
-            set(__VCPKG_APPINSTALL_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}")
+        if(NOT IS_ABSOLUTE "${arg_DESTINATION}")
+            set(arg_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${arg_DESTINATION}")
         endif()
-        if(__VCPKG_APPINSTALL_COMPONENT)
-            set(__VCPKG_APPINSTALL_COMPONENT COMPONENT ${__VCPKG_APPINSTALL_COMPONENT})
+
+        set(component_param "")
+        if(DEFINED arg_COMPONENT)
+            set(component_param COMPONENT "${arg_COMPONENT}")
         endif()
-        foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS)
-            get_target_property(TARGETTYPE "${TARGET}" TYPE)
-            if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY")
-                # Install CODE|SCRIPT allow the use of generator expressions
-                if(POLICY CMP0087)
-                    cmake_policy(SET CMP0087 NEW)
-                endif()
-                install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\")
+
+        foreach(target IN LISTS arg_TARGETS)
+            get_target_property(target_type "${target}" TYPE)
+            if(NOT target_type STREQUAL "INTERFACE_LIBRARY")
+                install(CODE "message(\"-- Installing app dependencies for ${target}...\")
                     execute_process(COMMAND \"${Z_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\"
-                        -targetBinary \"${__VCPKG_APPINSTALL_DESTINATION}/$<TARGET_FILE_NAME:${TARGET}>\"
+                        -targetBinary \"${arg_DESTINATION}/$<TARGET_FILE_NAME:${target}>\"
                         -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin\"
                         -OutVariable out)"
-                    ${__VCPKG_APPINSTALL_COMPONENT}
-                    )
+                    ${component_param}
+                )
             endif()
         endforeach()
     endif()
@@ -644,41 +663,43 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL)
 
         if(ARGV0 STREQUAL "TARGETS")
             # Will contain the list of targets
-            set(PARSED_TARGETS "")
+            set(parsed_targets "")
 
             # Destination - [RUNTIME] DESTINATION argument overrides this
-            set(DESTINATION "bin")
+            set(destination "bin")
+
+            set(component_param "")
 
             # Parse arguments given to the install function to find targets and (runtime) destination
-            set(MODIFIER "") # Modifier for the command in the argument
-            set(LAST_COMMAND "") # Last command we found to process
-            foreach(ARG IN LISTS ARGS)
-                if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES")
-                    set(MODIFIER "${ARG}")
+            set(modifier "") # Modifier for the command in the argument
+            set(last_command "") # Last command we found to process
+            foreach(arg IN LISTS ARGS)
+                if(arg MATCHES "^(ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES)$")
+                    set(modifier "${arg}")
                     continue()
                 endif()
-                if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT")
-                    set(LAST_COMMAND "${ARG}")
+                if(arg MATCHES "^(TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT)$")
+                    set(last_command "${arg}")
                     continue()
                 endif()
 
-                if(LAST_COMMAND STREQUAL "TARGETS")
-                    list(APPEND PARSED_TARGETS "${ARG}")
+                if(last_command STREQUAL "TARGETS")
+                    list(APPEND parsed_targets "${arg}")
                 endif()
 
-                if(LAST_COMMAND STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME"))
-                    set(DESTINATION "${ARG}")
+                if(last_command STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME"))
+                    set(destination "${arg}")
                 endif()
-                if(LAST_COMMAND STREQUAL "COMPONENT")
-                    set(COMPONENT "${ARG}")
+                if(last_command STREQUAL "COMPONENT")
+                    set(component_param "COMPONENT" "${arg}")
                 endif()
             endforeach()
 
-            # COMPONENT is optional only set it when it's been set by the install rule
-            if(COMPONENT)
-                set(COMPONENT "COMPONENT" ${COMPONENT})
-            endif()
-            x_vcpkg_install_local_dependencies(TARGETS "${PARSED_TARGETS}" DESTINATION "${DESTINATION}" ${COMPONENT})
+            x_vcpkg_install_local_dependencies(
+                TARGETS ${parsed_targets}
+                DESTINATION "${destination}"
+                ${component_param}
+            )
         endif()
     endfunction()
 endif()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 9c25fd9d76720b..668d0e0f2416bb 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -826,8 +826,8 @@ live555:x64-windows-static-md=fail
 live555:x86-windows=fail
 llgl:arm-uwp=fail
 llgl:x64-uwp=fail
-llvm:arm-uwp=fail
 llvm:arm64-windows=fail
+llvm:arm-uwp=fail
 llvm:x64-uwp=fail
 lmdb:arm-uwp=fail
 lmdb:x64-uwp=fail
@@ -894,6 +894,7 @@ memorymodule:x64-osx=fail
 memorymodule:x64-uwp=fail
 # Due to static crt.
 mesa:x64-windows-static=fail
+mesa:x64-windows-static-md=fail
 # Missing dependent libraries.
 mesa:x64-linux=fail
 mesa:x64-osx=fail
@@ -1029,9 +1030,6 @@ nativefiledialog:arm-uwp=fail
 nativefiledialog:x64-uwp=fail
 nethost:x64-uwp=fail
 nethost:arm-uwp=fail
-nettle:x64-windows-static=skip
-nettle:x64-windows-static-md=skip
-nettle:x64-windows=skip
 ngspice:x64-windows-static=fail
 nng:arm-uwp=fail
 nng:x64-uwp=fail
@@ -1467,6 +1465,7 @@ skia:arm-uwp=fail
 skia:x64-linux=fail
 skia:x64-uwp=fail
 skia:x86-windows=fail
+sleef:x86-windows=fail
 slikenet:arm-uwp=fail
 slikenet:x64-uwp=fail
 smpeg2:arm-uwp=fail
@@ -1794,9 +1793,5 @@ dimcli:x64-windows-static=fail
 # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11.
 cppgraphqlgen:x64-osx=fail
 
-# Visual Studio 2019 version 16.10's XAML compiler seems to be crashing processing this port
-simage:x64-uwp=fail
-simage:arm-uwp=fail
-
 # Changes in Python have broken tensorflow on our osx hardware
 tensorflow-cc:x64-osx=fail
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index fdf054e43ee975..1eb50e852b9699 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -231,7 +231,7 @@ function(vcpkg_configure_cmake)
         endif()
     endif()
 
-
+    list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string)
     list(APPEND arg_OPTIONS
         "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
         "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
@@ -255,7 +255,7 @@ function(vcpkg_configure_cmake)
         "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
         "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
         "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
-        "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
+        "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}"
         "-DCMAKE_INSTALL_LIBDIR:STRING=lib"
         "-DCMAKE_INSTALL_BINDIR:STRING=bin"
         "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
@@ -272,7 +272,8 @@ function(vcpkg_configure_cmake)
     # Sets configuration variables for macOS builds
     foreach(config_var  INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
         if(DEFINED VCPKG_${config_var})
-            list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
+            list(JOIN VCPKG_${config_var} "\;" config_var_value)
+            list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}")
         endif()
     endforeach()
 
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
index 86b42a17348703..d1b87d454a0848 100644
--- a/scripts/cmake/vcpkg_configure_make.cmake
+++ b/scripts/cmake/vcpkg_configure_make.cmake
@@ -385,6 +385,8 @@ function(vcpkg_configure_make)
             _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
             _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}")
             _vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}")
+            _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
+            _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}")
             if(VCPKG_DETECTED_CMAKE_AR)
                 _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "${VCPKG_DETECTED_CMAKE_AR}")
             else()
@@ -791,8 +793,10 @@ function(vcpkg_configure_make)
         unset(_link_path)
         unset(_lib_env_vars)
 
-        if(VCPKG_TARGET_IS_WINDOWS)
+        if(CMAKE_HOST_WIN32)
             set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}")
+        elseif(VCPKG_TARGET_IS_WINDOWS)
+            set(command "${base_cmd}" -c "${CONFIGURE_ENV} $@" -- "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}})
         else()
             set(command "${base_cmd}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}})
         endif()
diff --git a/scripts/vcpkg_completion.zsh b/scripts/vcpkg_completion.zsh
new file mode 100644
index 00000000000000..ee499f67161567
--- /dev/null
+++ b/scripts/vcpkg_completion.zsh
@@ -0,0 +1,9 @@
+
+_vcpkg_completions()
+{
+  local vcpkg_executable=${COMP_WORDS[0]}
+  local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)}
+  COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null))
+}
+
+complete -F _vcpkg_completions vcpkg
diff --git a/triplets/community/arm-windows-static.cmake b/triplets/community/arm-windows-static.cmake
new file mode 100644
index 00000000000000..9ba5feed79f78d
--- /dev/null
+++ b/triplets/community/arm-windows-static.cmake
@@ -0,0 +1,3 @@
+set(VCPKG_TARGET_ARCHITECTURE arm)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
diff --git a/versions/a-/asio.json b/versions/a-/asio.json
index abb5129252526a..658bbdd9af9d03 100644
--- a/versions/a-/asio.json
+++ b/versions/a-/asio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8",
+      "version": "1.18.2",
+      "port-version": 0
+    },
     {
       "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc",
       "version": "1.18.1",
diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json
index 807881050df8b7..7025c509f3b16e 100644
--- a/versions/b-/bzip2.json
+++ b/versions/b-/bzip2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1",
+      "version-semver": "1.0.8",
+      "port-version": 2
+    },
     {
       "git-tree": "5a1b1b8d666b9ef64e8596e4716c2e2f654f4532",
       "version-string": "1.0.8",
diff --git a/versions/baseline.json b/versions/baseline.json
index 0848eb077935b3..a200b7aee8824e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -165,8 +165,8 @@
       "port-version": 0
     },
     "asio": {
-      "baseline": "1.18.1",
-      "port-version": 1
+      "baseline": "1.18.2",
+      "port-version": 0
     },
     "asiosdk": {
       "baseline": "2.3.3",
@@ -1090,7 +1090,7 @@
     },
     "bzip2": {
       "baseline": "1.0.8",
-      "port-version": 1
+      "port-version": 2
     },
     "c-ares": {
       "baseline": "1.17.1",
@@ -1325,7 +1325,7 @@
       "port-version": 0
     },
     "cnl": {
-      "baseline": "2019-06-23",
+      "baseline": "1.1.7",
       "port-version": 0
     },
     "coin": {
@@ -1562,7 +1562,7 @@
     },
     "curl": {
       "baseline": "7.74.0",
-      "port-version": 7
+      "port-version": 8
     },
     "curlpp": {
       "baseline": "2018-06-15-3",
@@ -1749,7 +1749,7 @@
       "port-version": 0
     },
     "drogon": {
-      "baseline": "1.6.0",
+      "baseline": "1.7.1",
       "port-version": 0
     },
     "dtl": {
@@ -1982,7 +1982,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4",
-      "port-version": 5
+      "port-version": 6
     },
     "ffnvcodec": {
       "baseline": "10.0.26.0",
@@ -2054,7 +2054,7 @@
     },
     "fmt": {
       "baseline": "7.1.3",
-      "port-version": 4
+      "port-version": 5
     },
     "folly": {
       "baseline": "2020.10.19.00",
@@ -2221,7 +2221,7 @@
       "port-version": 3
     },
     "geographiclib": {
-      "baseline": "1.51",
+      "baseline": "1.52",
       "port-version": 0
     },
     "geos": {
@@ -2457,8 +2457,8 @@
       "port-version": 0
     },
     "halide": {
-      "baseline": "11.0.1",
-      "port-version": 0
+      "baseline": "12.0.1",
+      "port-version": 1
     },
     "happly": {
       "baseline": "2021-03-19",
@@ -2773,7 +2773,7 @@
       "port-version": 1
     },
     "json-dto": {
-      "baseline": "0.2.12",
+      "baseline": "0.2.13",
       "port-version": 0
     },
     "json-schema-validator": {
@@ -3078,7 +3078,7 @@
     },
     "libdatachannel": {
       "baseline": "0.12.2",
-      "port-version": 0
+      "port-version": 1
     },
     "libdatrie": {
       "baseline": "0.2.10-3",
@@ -3406,7 +3406,7 @@
     },
     "libopenmpt": {
       "baseline": "2017-01-28-cf2390140",
-      "port-version": 1
+      "port-version": 2
     },
     "libopusenc": {
       "baseline": "0.2.1",
@@ -3501,8 +3501,8 @@
       "port-version": 0
     },
     "libressl": {
-      "baseline": "2.9.1",
-      "port-version": 3
+      "baseline": "3.3.3",
+      "port-version": 0
     },
     "librsvg": {
       "baseline": "2.40.20",
@@ -3539,8 +3539,8 @@
     "libsigcpp-3": {
       "baseline": "3.0.3",
       "port-version": 1
-    }, 
-	"libsmb2": {
+    },
+    "libsmb2": {
       "baseline": "2021-04-29",
       "port-version": 0
     },
@@ -3710,7 +3710,7 @@
     },
     "libxml2": {
       "baseline": "2.9.10",
-      "port-version": 7
+      "port-version": 8
     },
     "libxmlmm": {
       "baseline": "0.6.0",
@@ -3777,7 +3777,7 @@
       "port-version": 1
     },
     "llvm": {
-      "baseline": "11.1.0",
+      "baseline": "12.0.0",
       "port-version": 0
     },
     "lmdb": {
@@ -3961,8 +3961,8 @@
       "port-version": 0
     },
     "mesa": {
-      "baseline": "20.2.2",
-      "port-version": 1
+      "baseline": "21.1.2",
+      "port-version": 0
     },
     "meschach": {
       "baseline": "1.2b-3",
@@ -4078,7 +4078,7 @@
     },
     "mongo-c-driver": {
       "baseline": "1.16.1",
-      "port-version": 4
+      "port-version": 5
     },
     "mongo-cxx-driver": {
       "baseline": "3.4.0-5",
@@ -4105,7 +4105,7 @@
       "port-version": 0
     },
     "morton-nd": {
-      "baseline": "3.0.0",
+      "baseline": "4.0.0",
       "port-version": 0
     },
     "mosquitto": {
@@ -4137,7 +4137,7 @@
       "port-version": 0
     },
     "mpg123": {
-      "baseline": "1.26.5",
+      "baseline": "1.28.0",
       "port-version": 0
     },
     "mpi": {
@@ -4606,7 +4606,7 @@
     },
     "openssl": {
       "baseline": "1.1.1k",
-      "port-version": 5
+      "port-version": 6
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
@@ -4986,7 +4986,7 @@
     },
     "protobuf": {
       "baseline": "3.15.8",
-      "port-version": 2
+      "port-version": 3
     },
     "protobuf-c": {
       "baseline": "1.3.2-2",
@@ -5469,8 +5469,8 @@
       "port-version": 1
     },
     "recast": {
-      "baseline": "1.5.1-3",
-      "port-version": 0
+      "baseline": "1.5.1",
+      "port-version": 4
     },
     "redis-plus-plus": {
       "baseline": "1.2.3",
@@ -5524,6 +5524,10 @@
       "baseline": "0.3.0",
       "port-version": 0
     },
+    "rmlui": {
+      "baseline": "4.1",
+      "port-version": 0
+    },
     "roaring": {
       "baseline": "2019-03-05-2",
       "port-version": 0
@@ -5690,7 +5694,7 @@
     },
     "seal": {
       "baseline": "3.6.6",
-      "port-version": 0
+      "port-version": 1
     },
     "secp256k1": {
       "baseline": "2017-19-10",
@@ -5705,8 +5709,8 @@
       "port-version": 0
     },
     "sentry-native": {
-      "baseline": "0.4.9",
-      "port-version": 1
+      "baseline": "0.4.10",
+      "port-version": 0
     },
     "septag-sx": {
       "baseline": "2019-05-07-2",
@@ -5769,8 +5773,8 @@
       "port-version": 0
     },
     "simage": {
-      "baseline": "1.8.0",
-      "port-version": 1
+      "baseline": "1.8.1",
+      "port-version": 0
     },
     "simde": {
       "baseline": "0.7.0",
@@ -5796,6 +5800,10 @@
       "baseline": "1.13.0",
       "port-version": 0
     },
+    "sleef": {
+      "baseline": "3.5.1",
+      "port-version": 0
+    },
     "slikenet": {
       "baseline": "2019-10-22-2",
       "port-version": 0
@@ -5833,7 +5841,7 @@
       "port-version": 3
     },
     "socket-io-client": {
-      "baseline": "1.6.1-1",
+      "baseline": "3.0.0",
       "port-version": 0
     },
     "sockpp": {
@@ -5922,7 +5930,7 @@
     },
     "spdlog": {
       "baseline": "1.8.5",
-      "port-version": 2
+      "port-version": 3
     },
     "spectra": {
       "baseline": "0.9.0",
@@ -6090,7 +6098,7 @@
     },
     "tbb": {
       "baseline": "2020_U3",
-      "port-version": 4
+      "port-version": 5
     },
     "tcl": {
       "baseline": "core-9-0-a1",
@@ -6146,7 +6154,7 @@
     },
     "tgui": {
       "baseline": "2021-04-19",
-      "port-version": 1
+      "port-version": 2
     },
     "theia": {
       "baseline": "0.8",
@@ -6493,16 +6501,16 @@
       "port-version": 0
     },
     "vc": {
-      "baseline": "1.4.1",
-      "port-version": 1
+      "baseline": "1.4.2",
+      "port-version": 0
     },
     "vcglib": {
       "baseline": "1.0.1",
       "port-version": 0
     },
     "vcpkg-cmake": {
-      "baseline": "2021-02-28",
-      "port-version": 3
+      "baseline": "2021-06-25",
+      "port-version": 4
     },
     "vcpkg-cmake-config": {
       "baseline": "2021-05-22",
diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json
index 9f2ab96483c086..dc0a2ce0168c5b 100644
--- a/versions/c-/cnl.json
+++ b/versions/c-/cnl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54",
+      "version-string": "1.1.7",
+      "port-version": 0
+    },
     {
       "git-tree": "4778a9818faef4bfac563accbca398763a725cfc",
       "version-string": "2019-06-23",
diff --git a/versions/c-/curl.json b/versions/c-/curl.json
index dfca5d4c4a0045..e0b511bb645e8b 100644
--- a/versions/c-/curl.json
+++ b/versions/c-/curl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028",
+      "version": "7.74.0",
+      "port-version": 8
+    },
     {
       "git-tree": "2184d79bb98ed36af015203385175cade013d8af",
       "version": "7.74.0",
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index fad0fff2c3f229..309d7689d78652 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b",
+      "version-string": "1.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a",
       "version-string": "1.6.0",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index a39b1d79a8f05f..14c7c2f68b7c56 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29",
+      "version": "4.4",
+      "port-version": 6
+    },
     {
       "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94",
       "version": "4.4",
diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json
index 69976a238ea7fc..13c7be1723249b 100644
--- a/versions/f-/fmt.json
+++ b/versions/f-/fmt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d",
+      "version": "7.1.3",
+      "port-version": 5
+    },
     {
       "git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe",
       "version": "7.1.3",
diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json
index dd034bcd511365..8fd320c34ee033 100644
--- a/versions/g-/geographiclib.json
+++ b/versions/g-/geographiclib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90",
+      "version": "1.52",
+      "port-version": 0
+    },
     {
       "git-tree": "eafff91d7abd708bd49584dc4070e091d427e333",
       "version-string": "1.51",
diff --git a/versions/h-/halide.json b/versions/h-/halide.json
index ba54cd36986d1d..8a2628d869f258 100644
--- a/versions/h-/halide.json
+++ b/versions/h-/halide.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "512cb4dd40ca40afbf0c6a35f7bdc595589a0b10",
+      "version": "12.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "50e2c4835a57bb4a172c4b82b2a0e0a3077088ab",
+      "version": "12.0.1",
+      "port-version": 0
+    },
     {
       "git-tree": "eea72c77e90fcc209eafe9906f8b035ec64af984",
       "version-string": "11.0.1",
diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json
index eea4d02cff5ff2..d04ece23db4d60 100644
--- a/versions/j-/json-dto.json
+++ b/versions/j-/json-dto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a4576b8566a843cf16e9a38143d1a99ae832d130",
+      "version": "0.2.13",
+      "port-version": 0
+    },
     {
       "git-tree": "9a981571e3da6bf7df6ad44cb3ee5f816134c5f9",
       "version": "0.2.12",
diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json
index 2b289cd5d9c467..ea8a70416a8504 100644
--- a/versions/l-/libdatachannel.json
+++ b/versions/l-/libdatachannel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a13526e9cfc5bfca3aa00e95afa184b498890f69",
+      "version-semver": "0.12.2",
+      "port-version": 1
+    },
     {
       "git-tree": "dd3107dd99419236f97e299ce4b61c2379a08f55",
       "version-semver": "0.12.2",
diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json
index d97f5018173262..30e4512e13ead9 100644
--- a/versions/l-/libopenmpt.json
+++ b/versions/l-/libopenmpt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "465b2d6e597952e0ef962af05dce08769dba11e7",
+      "version-string": "2017-01-28-cf2390140",
+      "port-version": 2
+    },
     {
       "git-tree": "a6579258d2dab9e661a439e241ff20f2427b918e",
       "version-string": "2017-01-28-cf2390140",
diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json
index 62ab6a809d3ef2..c8d28210087c96 100644
--- a/versions/l-/libressl.json
+++ b/versions/l-/libressl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a",
+      "version": "3.3.3",
+      "port-version": 0
+    },
     {
       "git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1",
       "version-string": "2.9.1",
diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json
index 3675ab5183614a..6fe34d800a2f9e 100644
--- a/versions/l-/libxml2.json
+++ b/versions/l-/libxml2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1",
+      "version-semver": "2.9.10",
+      "port-version": 8
+    },
     {
       "git-tree": "f86ba7081b940af77e935875fbdf9cbf69446b9f",
       "version-semver": "2.9.10",
diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json
index fb9e68ce977683..843314d7c9c96e 100644
--- a/versions/l-/llvm.json
+++ b/versions/l-/llvm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6597ffba14111050d8e68af4852ea5766c81a78c",
+      "version-string": "12.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7b30e5aa5227b4af185b967afbe34e84cf8c7638",
       "version-string": "11.1.0",
diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json
index b28bb72de859e0..aeb14f4b6cb1fd 100644
--- a/versions/m-/mesa.json
+++ b/versions/m-/mesa.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "58f52d4a0724c6d4d393b48e232ca323d8670df6",
+      "version": "21.1.2",
+      "port-version": 0
+    },
     {
       "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a",
       "version-string": "20.2.2",
diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json
index ae610504943f88..033ff1e25338d8 100644
--- a/versions/m-/mongo-c-driver.json
+++ b/versions/m-/mongo-c-driver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7",
+      "version-string": "1.16.1",
+      "port-version": 5
+    },
     {
       "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01",
       "version-string": "1.16.1",
diff --git a/versions/m-/morton-nd.json b/versions/m-/morton-nd.json
index 9ae9a06d431d46..d21bc7c5418717 100644
--- a/versions/m-/morton-nd.json
+++ b/versions/m-/morton-nd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "949f90299960d91f4cfd457a093dd70c5e285782",
+      "version-string": "4.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "acdac4e47f9b91d7a7dd27aa9689f029fdd43895",
       "version-string": "3.0.0",
diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json
index 60740511bea295..098759f80d31ab 100644
--- a/versions/m-/mpg123.json
+++ b/versions/m-/mpg123.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b34c661c7e28355ade113c330d1c3b93a77a4e13",
+      "version": "1.28.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6e185d93bd44a85eda8d650c24df2f96da710d56",
       "version": "1.26.5",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 281a232db0cb6e..21a4dfb25adc98 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3",
+      "version-string": "1.1.1k",
+      "port-version": 6
+    },
     {
       "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7",
       "version-string": "1.1.1k",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 7ce8bc35fdf464..547ba83f2e6606 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12",
+      "version-semver": "3.15.8",
+      "port-version": 3
+    },
     {
       "git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73",
       "version-semver": "3.15.8",
diff --git a/versions/r-/recast.json b/versions/r-/recast.json
index d4fcf997122c22..82f778cd71bafd 100644
--- a/versions/r-/recast.json
+++ b/versions/r-/recast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e",
+      "version": "1.5.1",
+      "port-version": 4
+    },
     {
       "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c",
       "version-string": "1.5.1-3",
diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json
new file mode 100644
index 00000000000000..f3c15b656f8e82
--- /dev/null
+++ b/versions/r-/rmlui.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2",
+      "version": "4.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/s-/seal.json b/versions/s-/seal.json
index 53e227f6dae866..56f081d64ba5ed 100644
--- a/versions/s-/seal.json
+++ b/versions/s-/seal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "89d120a6c3ac5306d90e29913048b518dc5a2c9b",
+      "version-semver": "3.6.6",
+      "port-version": 1
+    },
     {
       "git-tree": "e487b9120a78480800a1fd914477acf03f677919",
       "version-semver": "3.6.6",
diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json
index f85102c8e50735..995604ea7dfcf1 100644
--- a/versions/s-/sentry-native.json
+++ b/versions/s-/sentry-native.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "487eaee55f15e263063288c15aab12d296ac598f",
+      "version-semver": "0.4.10",
+      "port-version": 0
+    },
     {
       "git-tree": "8200b5e337c4e6074c67a6a2398fa7bbbb3c2e4b",
       "version-semver": "0.4.9",
diff --git a/versions/s-/simage.json b/versions/s-/simage.json
index e245aca0bee948..d20b1cd9065457 100644
--- a/versions/s-/simage.json
+++ b/versions/s-/simage.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1",
+      "version-semver": "1.8.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339",
       "version-string": "1.8.0",
diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json
new file mode 100644
index 00000000000000..304db6224f9952
--- /dev/null
+++ b/versions/s-/sleef.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "0c195bd94ab64769463a4891db9d140fa37508a4",
+      "version": "3.5.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json
index 478d1ca54a033e..d81657ab177c61 100644
--- a/versions/s-/socket-io-client.json
+++ b/versions/s-/socket-io-client.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05",
+      "version": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "72d40d2e1c52ff3be1a8ac23f9f45baeed8cbe58",
       "version-string": "1.6.1-1",
diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json
index 533df0dca00405..f0dd94172b7e08 100644
--- a/versions/s-/spdlog.json
+++ b/versions/s-/spdlog.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f74643a7b8056237da08c41a653f5b0592870906",
+      "version-semver": "1.8.5",
+      "port-version": 3
+    },
     {
       "git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b",
       "version-semver": "1.8.5",
diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json
index 2655af3fd20897..71c441dbf8051e 100644
--- a/versions/t-/tbb.json
+++ b/versions/t-/tbb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0",
+      "version-string": "2020_U3",
+      "port-version": 5
+    },
     {
       "git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9",
       "version-string": "2020_U3",
diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json
index 184813be079cae..f04e637e79f05e 100644
--- a/versions/t-/tgui.json
+++ b/versions/t-/tgui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345",
+      "version-date": "2021-04-19",
+      "port-version": 2
+    },
     {
       "git-tree": "354b5135bda4bcef9c5e7cbfeaff3d457b336e8c",
       "version-date": "2021-04-19",
diff --git a/versions/v-/vc.json b/versions/v-/vc.json
index 8777c912d0eac4..11a39281256508 100644
--- a/versions/v-/vc.json
+++ b/versions/v-/vc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "510cde85ec14ef88187857247829183c1c275f63",
+      "version-string": "1.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "1ab229fb781ff549e05917c4ec46a1fcd6bd1a3a",
       "version-string": "1.4.1",
diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
index 1f1fb408b63923..96d5eb75da9fca 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d",
+      "version-date": "2021-06-25",
+      "port-version": 4
+    },
     {
       "git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420",
       "version-date": "2021-02-28",