Patch Tuesday for September 2025 + macOS 15.6.1 (#47326)

2025-09-24 12:10:55 -07:00 · 2025-09-24 12:10:55 -07:00 · 2626652f01
parent a3476c776e
commit 2626652f01
130 changed files with 1094 additions and 400 deletions
--- a/ports/awlib/fix-mac-build.patch
+++ b/ports/awlib/fix-mac-build.patch
@ -1,5 +1,5 @@
 diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h
-index 98469732..65e82aac 100644
+index 9846973..65e82aa 100644
 --- a/io/include/aw/io/mmap_file.h
 +++ b/io/include/aw/io/mmap_file.h
@@ -83,18 +83,18 @@ using win32::file_mapping;
@ -30,8 +30,26 @@ index 98469732..65e82aac 100644
 		return file_mode::read|file_mode::write;
 	}
 
+diff --git a/types/include/aw/types/bits/variant_dispatch.h b/types/include/aw/types/bits/variant_dispatch.h
+index 9d5dc3b..95a9394 100644
+--- a/types/include/aw/types/bits/variant_dispatch.h
+++ b/types/include/aw/types/bits/variant_dispatch.h
+@@ -71,11 +71,11 @@ struct vh_recursive {
+ 		if constexpr (Length_left > 0)
+ 		{
+ 			if (index < Mid)
+-				return vh_recursive<Start,Mid,Ts...>::template dispatch(index, storage, f);
+				return vh_recursive<Start,Mid,Ts...>::dispatch(index, storage, f);
+ 		}
+ 
+ 		if constexpr (Length_right > 1)
+-			return vh_recursive<Mid+1,End,Ts...>::template dispatch(index, storage, f);
+			return vh_recursive<Mid+1,End,Ts...>::dispatch(index, storage, f);
+ 
+ 		_unreachable();
+ 	}
 diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h
-index 82f46934..b38c46a9 100644
+index 82f4693..b38c46a 100644
 --- a/types/include/aw/types/byte_buffer.h
 +++ b/types/include/aw/types/byte_buffer.h
@@ -8,6 +8,7 @@
@ -42,3 +60,16 @@ index 82f46934..b38c46a9 100644
 #include <memory>
 namespace aw {
 /**
+diff --git a/types/include/aw/types/containers/queue.h b/types/include/aw/types/containers/queue.h
+index af8f13b..8398e8c 100644
+--- a/types/include/aw/types/containers/queue.h
+++ b/types/include/aw/types/containers/queue.h
+@@ -96,7 +96,7 @@ protected:
+ 	queue_base(queue_base&& other, Allocator const& alloc) noexcept
+ 		: impl(alloc)
+ 	{
+-		if (alloc == other.alloc)
+		if (alloc == static_cast<Allocator&>(other.impl))
+ 			impl.swap(other.impl);
+ 		else
+ 			create_storage(other.allocated_size());
--- a/ports/awlib/vcpkg.json
+++ b/ports/awlib/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "awlib",
  "version-date": "2024-04-06",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Cross-platform utility library",
  "homepage": "https://github.com/absurdworlds/awlib",
  "license": "LGPL-3.0-or-later",
@ -21,6 +21,13 @@
      "description": "Build graphics library",
      "supports": "!uwp",
      "dependencies": [
+        {
+          "name": "awlib",
+          "default-features": false,
+          "features": [
+            "hudf"
+          ]
+        },
        "glfw3",
        "libpng"
      ]
--- a/ports/clblas/fix-cmake-4.diff
+++ b/ports/clblas/fix-cmake-4.diff
@ -0,0 +1,58 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 75df37a..4e31cd3 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -103,19 +103,19 @@ else( )
+ endif( )
+ 
+ # Define a version for the code
+-if( NOT DEFINED clBLAS_VERSION_MAJOR )
+-    set( clBLAS_VERSION_MAJOR 2 )
+if( NOT DEFINED CLBLAS_VERSION_MAJOR )
+    set( CLBLAS_VERSION_MAJOR 2 )
+ endif( )
+ 
+-if( NOT DEFINED clBLAS_VERSION_MINOR )
+-    set( clBLAS_VERSION_MINOR 12 )
+if( NOT DEFINED CLBLAS_VERSION_MINOR )
+    set( CLBLAS_VERSION_MINOR 12 )
+ endif( )
+ 
+-if( NOT DEFINED clBLAS_VERSION_PATCH )
+-    set( clBLAS_VERSION_PATCH 0 )
+if( NOT DEFINED CLBLAS_VERSION_PATCH )
+    set( CLBLAS_VERSION_PATCH 0 )
+ endif( )
+ 
+-set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}")
+set( clBLAS_VERSION "${CLBLAS_VERSION_MAJOR}.${CLBLAS_VERSION_MINOR}.${CLBLAS_VERSION_PATCH}")
+ 
+ # Increment this if we break backward compatibility.
+ set( clBLAS_SOVERSION 2 )
+@@ -425,9 +425,9 @@ endif( )
+ 
+ set( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${clBLAS_VERSION}-${CMAKE_HOST_SYSTEM_NAME}-Source")
+ 
+-set( CPACK_PACKAGE_VERSION_MAJOR ${clBLAS_VERSION_MAJOR} )
+-set( CPACK_PACKAGE_VERSION_MINOR ${clBLAS_VERSION_MINOR} )
+-set( CPACK_PACKAGE_VERSION_PATCH ${clBLAS_VERSION_PATCH} )
+set( CPACK_PACKAGE_VERSION_MAJOR ${CLBLAS_VERSION_MAJOR} )
+set( CPACK_PACKAGE_VERSION_MINOR ${CLBLAS_VERSION_MINOR} )
+set( CPACK_PACKAGE_VERSION_PATCH ${CLBLAS_VERSION_PATCH} )
+ set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL implementation of a BLAS library")
+ set( CPACK_PACKAGE_VENDOR "Neutral")
+ set( CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/;/\\\\.svn/;/\\\\.git/" )
+diff --git a/src/clBLAS.version.h.in b/src/clBLAS.version.h.in
+index a05cbce..ab22a87 100644
+--- a/src/clBLAS.version.h.in
+++ b/src/clBLAS.version.h.in
+@@ -17,6 +17,6 @@
+ 
+ /* the configured version and settings for clblas
+  */
+-#define clblasVersionMajor @clBLAS_VERSION_MAJOR@
+-#define clblasVersionMinor @clBLAS_VERSION_MINOR@
+-#define clblasVersionPatch @clBLAS_VERSION_PATCH@
+#define clblasVersionMajor @CLBLAS_VERSION_MAJOR@
+#define clblasVersionMinor @CLBLAS_VERSION_MINOR@
+#define clblasVersionPatch @CLBLAS_VERSION_PATCH@
--- a/ports/clblas/portfile.cmake
+++ b/ports/clblas/portfile.cmake
@ -8,6 +8,7 @@ vcpkg_from_github(
        cmake.patch
        Fix-BuildDLL.patch
        abs-arm.patch
+        fix-cmake-4.diff # https://github.com/clMathLibraries/clBLAS/pull/364
 )

 # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names
--- a/ports/clblas/vcpkg.json
+++ b/ports/clblas/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "clblas",
  "version": "2.12",
-  "port-version": 7,
+  "port-version": 8,
  "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.",
  "license": "Apache-2.0",
  "supports": "!(windows & arm)",
--- a/ports/clockutils/disable-werror.diff
+++ b/ports/clockutils/disable-werror.diff
@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c77383..0c8029b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -64,13 +64,13 @@ set (CLANG_FLAGS "-Wstring-plus-int")
+ IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+ 	set (CMAKE_CXX_FLAGS_DEBUG		"${CXX_FLAGS} ${CLANG_FLAGS} -g")
+ 	set (CMAKE_CXX_FLAGS_MINSIZEREL		"${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG")
+-	set (CMAKE_CXX_FLAGS_RELEASE		"${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror")
+-	set (CMAKE_CXX_FLAGS_RELWITHDEBINFO	"${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g -Werror")
+	set (CMAKE_CXX_FLAGS_RELEASE		"${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG")
+	set (CMAKE_CXX_FLAGS_RELWITHDEBINFO	"${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g")
+ ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+ 	set (CMAKE_CXX_FLAGS_DEBUG		"${CXX_FLAGS} -g")
+ 	set (CMAKE_CXX_FLAGS_MINSIZEREL		"${CXX_FLAGS} -0s -DNDEBUG")
+-	set (CMAKE_CXX_FLAGS_RELEASE		"${CXX_FLAGS} -O3 -DNDEBUG -Werror")
+-	set (CMAKE_CXX_FLAGS_RELWITHDEBINFO	"${CXX_FLAGS} -O2 -g -Werror")
+	set (CMAKE_CXX_FLAGS_RELEASE		"${CXX_FLAGS} -O3 -DNDEBUG")
+	set (CMAKE_CXX_FLAGS_RELWITHDEBINFO	"${CXX_FLAGS} -O2 -g")
+ ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
+ 	set (CXX_FLAGS "/MP /W4 /wd4127 /D_WINSOCK_DEPRECATED_NO_WARNINGS /DNOMINMAX")
+ 	set (CMAKE_CXX_FLAGS_DEBUG		"${CMAKE_CXX_FLAGS_DEBUG} ${CXX_FLAGS}")
--- a/ports/clockutils/portfile.cmake
+++ b/ports/clockutils/portfile.cmake
@ -8,6 +8,7 @@ vcpkg_from_github(
        fix-warningC4643.patch
        add-missing-thread-header.patch
        cmake4.patch
+        disable-werror.diff
 )

 set(SHARED_FLAG OFF)
--- a/ports/clockutils/vcpkg.json
+++ b/ports/clockutils/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "clockutils",
  "version": "1.1.1",
-  "port-version": 3,
+  "port-version": 4,
  "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.",
  "homepage": "https://github.com/ClockworkOrigins/clockUtils",
  "license": "MIT",
--- a/ports/colmap/fix-variable-names.diff
+++ b/ports/colmap/fix-variable-names.diff
@ -0,0 +1,35 @@
+diff --git a/src/thirdparty/PoissonRecon/Ply.h b/src/thirdparty/PoissonRecon/Ply.h
+index 699381f..6cb07d6 100644
+--- a/src/thirdparty/PoissonRecon/Ply.h
+++ b/src/thirdparty/PoissonRecon/Ply.h
+@@ -340,7 +340,7 @@ public:
+ 	PlyOrientedVertex( void ) { ; }
+ 	PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; }
+   	PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); }
+-	PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); }
+	PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); }
+ 	template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); }
+ 	template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); }
+ 	PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; }
+@@ -386,7 +386,7 @@ public:
+ 		}
+ 
+ 	  	_PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); }
+-		_PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); }
+		_PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); }
+ 		template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); }
+ 		template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); }
+ 		_PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; }
+diff --git a/src/thirdparty/PoissonRecon/SparseMatrix.inl b/src/thirdparty/PoissonRecon/SparseMatrix.inl
+index c181d82..0a5e59e 100755
+--- a/src/thirdparty/PoissonRecon/SparseMatrix.inl
+++ b/src/thirdparty/PoissonRecon/SparseMatrix.inl
+@@ -195,7 +195,7 @@ void SparseMatrix< T >::SetRowSize( int row , int count )
+ template<class T>
+ void SparseMatrix<T>::SetZero()
+ {
+-	Resize(this->m_N, this->m_M);
+	Resize(this->rows, this->_maxEntriesPerRow);
+ }
+ 
+ template<class T>
--- a/ports/colmap/portfile.cmake
+++ b/ports/colmap/portfile.cmake
@ -10,6 +10,7 @@ vcpkg_from_github(
    PATCHES
        no-glu.diff
        fix-flann.patch
+        fix-variable-names.diff # from https://github.com/colmap/colmap/commit/203bf36c2d5e805f0eb26d8b7a2b8572e7b134e1
 )

 if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))
--- a/ports/colmap/vcpkg.json
+++ b/ports/colmap/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "colmap",
  "version": "3.11.1",
-  "port-version": 3,
+  "port-version": 4,
  "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
  "homepage": "https://colmap.github.io/",
  "license": "BSD-3-Clause",
--- a/ports/corrade/missing-headers.diff
+++ b/ports/corrade/missing-headers.diff
@ -0,0 +1,69 @@
+diff --git a/src/Corrade/PluginManager/AbstractManager.h b/src/Corrade/PluginManager/AbstractManager.h
+index c8ef531..3d2e3dd 100644
+--- a/src/Corrade/PluginManager/AbstractManager.h
+++ b/src/Corrade/PluginManager/AbstractManager.h
+@@ -29,6 +29,10 @@
+  * @brief Class @ref Corrade::PluginManager::AbstractManager, macro @ref CORRADE_PLUGIN_VERSION, @ref CORRADE_PLUGIN_REGISTER()
+  */
+ 
+#include <string>
+#include <vector>
+#include <utility>
+
+ #include "Corrade/Containers/EnumSet.h"
+ #include "Corrade/Containers/Pointer.h"
+ #include "Corrade/PluginManager/PluginManager.h"
+diff --git a/src/Corrade/PluginManager/AbstractPlugin.h b/src/Corrade/PluginManager/AbstractPlugin.h
+index b22deee..4f5738f 100644
+--- a/src/Corrade/PluginManager/AbstractPlugin.h
+++ b/src/Corrade/PluginManager/AbstractPlugin.h
+@@ -29,6 +29,10 @@
+  * @brief Class @ref Corrade::PluginManager::AbstractPlugin
+  */
+ 
+#include <string>
+#include <vector>
+#include <utility>
+
+ #include "Corrade/Containers/Pointer.h"
+ #include "Corrade/PluginManager/PluginManager.h"
+ #include "Corrade/PluginManager/visibility.h"
+diff --git a/src/Corrade/Utility/Arguments.h b/src/Corrade/Utility/Arguments.h
+index 84d856d..ea801be 100644
+--- a/src/Corrade/Utility/Arguments.h
+++ b/src/Corrade/Utility/Arguments.h
+@@ -31,6 +31,7 @@
+ 
+ #include <string>
+ #include <utility>
+#include <vector>
+ 
+ #include "Corrade/Containers/Array.h"
+ #include "Corrade/Utility/ConfigurationValue.h"
+diff --git a/src/Corrade/Utility/Directory.h b/src/Corrade/Utility/Directory.h
+index 21c1e1a..8d9bde6 100644
+--- a/src/Corrade/Utility/Directory.h
+++ b/src/Corrade/Utility/Directory.h
+@@ -30,6 +30,9 @@
+  */
+ 
+ #include <initializer_list>
+#include <string>
+#include <utility>
+#include <vector>
+ 
+ #include "Corrade/Containers/Containers.h"
+ #include "Corrade/Containers/EnumSet.h"
+diff --git a/src/Corrade/Utility/Resource.h b/src/Corrade/Utility/Resource.h
+index e08c03d..6ce48b0 100644
+--- a/src/Corrade/Utility/Resource.h
+++ b/src/Corrade/Utility/Resource.h
+@@ -30,6 +30,8 @@
+  */
+ 
+ #include <utility>
+#include <string>
+#include <vector>
+ 
+ #include "Corrade/Containers/ArrayView.h"
+ #include "Corrade/Utility/StlForwardString.h"
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@ -8,6 +8,7 @@ vcpkg_from_github(
        fix-vs2019.patch
        build-corrade-rc-always.patch
        clang-16.patch
+        missing-headers.diff
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
--- a/ports/corrade/vcpkg.json
+++ b/ports/corrade/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "corrade",
  "version-string": "2020.06",
-  "port-version": 8,
+  "port-version": 9,
  "description": "C++11/C++14 multiplatform utility library.",
  "homepage": "https://magnum.graphics/corrade/",
  "dependencies": [
--- a/ports/cpprealm/disable-werror.diff
+++ b/ports/cpprealm/disable-werror.diff
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8b0675..e7dd3f3 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -119,7 +119,7 @@ target_link_libraries(cpprealm PUBLIC Realm::ObjectStore)
+ set(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT_PATH})
+ 
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Werror)
+    target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Wno-changes-meaning)
+ endif()
+ 
+ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
--- a/ports/cpprealm/missing-cstdint.diff
+++ b/ports/cpprealm/missing-cstdint.diff
@ -0,0 +1,12 @@
+diff --git a/include/cpprealm/internal/bridge/realm.hpp b/include/cpprealm/internal/bridge/realm.hpp
+index 38703d1..827c71d 100644
+--- a/include/cpprealm/internal/bridge/realm.hpp
+++ b/include/cpprealm/internal/bridge/realm.hpp
+@@ -27,6 +27,7 @@
+ #include <optional>
+ #include <string>
+ #include <vector>
+#include <cstdint>
+ 
+ namespace realm {
+     class Realm;
--- a/ports/cpprealm/portfile.cmake
+++ b/ports/cpprealm/portfile.cmake
@ -4,6 +4,10 @@ vcpkg_from_github(
    REF "v${VERSION}"
    SHA512 "cf975741b5a4a68a40845c53d8584d871acff03c7a212e71a67799801979e0514de2a449aa5d78137f2d7f42e113c5df7c97e9f8c5fb6371e95c46f29ab2b246"
    HEAD_REF "main"
+    PATCHES
+        missing-cstdint.diff # https://github.com/realm/realm-cpp/pull/247
+        disable-werror.diff
+        remove-overzealous-template.diff # https://github.com/realm/realm-cpp/pull/248
 )

 if(NOT VCPKG_BUILD_TYPE)
--- a/ports/cpprealm/remove-overzealous-template.diff
+++ b/ports/cpprealm/remove-overzealous-template.diff
@ -0,0 +1,22 @@
+diff --git a/include/cpprealm/schema.hpp b/include/cpprealm/schema.hpp
+index 7494d60..7479c3c 100644
+--- a/include/cpprealm/schema.hpp
+++ b/include/cpprealm/schema.hpp
+@@ -253,7 +253,7 @@ namespace realm {
+ 
+                 if constexpr (N + 1 == sizeof...(Properties)) {
+                     if (property_name == std::string_view(names[N])) {
+-                        auto ptr = managed<Class, void>::template unmanaged_to_managed_pointer(property.ptr);
+                        auto ptr = managed<Class, void>::unmanaged_to_managed_pointer(property.ptr);
+                         if constexpr (std::is_pointer_v<typename P::Result>) {
+                             return (cls.*ptr);
+                         } else {
+@@ -263,7 +263,7 @@ namespace realm {
+                     return variant_t{};
+                 } else {
+                     if (property_name == std::string_view(names[N])) {
+-                        auto ptr = managed<Class, void>::template unmanaged_to_managed_pointer(property.ptr);
+                        auto ptr = managed<Class, void>::unmanaged_to_managed_pointer(property.ptr);
+                         if constexpr (std::is_pointer_v<typename P::Result>) {
+                             return (cls.*ptr);
+                         } else {
--- a/ports/cpprealm/vcpkg.json
+++ b/ports/cpprealm/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "cpprealm",
  "version": "2.2.0",
+  "port-version": 1,
  "description": "Realm is a mobile database that runs directly inside phones, tablets or wearables.",
  "homepage": "https://github.com/realm/realm-cpp",
  "license": "Apache-2.0",
--- a/ports/dbow3/add-cstdint.diff
+++ b/ports/dbow3/add-cstdint.diff
@ -0,0 +1,19 @@
+diff --git a/Lib/include/DBow3/BowVector.h b/Lib/include/DBow3/BowVector.h
+index cdbf517..90862b9 100644
+--- a/Lib/include/DBow3/BowVector.h
+++ b/Lib/include/DBow3/BowVector.h
+@@ -10,13 +10,11 @@
+ #ifndef __D_T_BOW_VECTOR__
+ #define __D_T_BOW_VECTOR__
+ 
+#include <cstdint>
+ #include <map>
+ #include <vector>
+ #include <ostream>
+ #include "exports.h"
+-#if _WIN32
+-#include <cstdint>
+-#endif
+ namespace DBoW3 {
+ 
+ /// Id of words
--- a/ports/dbow3/portfile.cmake
+++ b/ports/dbow3/portfile.cmake
@ -13,8 +13,9 @@ vcpkg_from_github(
    REF c5ae539abddcef43ef64fa130555e2d521098369
    SHA512 a1b35d2a524a23c367180574f7ddbcad73161c7fda6c3e7973273ab86092d9c6d89df28925a8e53691cd894f2d6588832604a0dbdba478557695806907bf36eb
    PATCHES
-      "${REMOVE_DYNAMIC_EXCEPTION_SPECS}"
-      fix_cmake.patch
+        "${REMOVE_DYNAMIC_EXCEPTION_SPECS}"
+        fix_cmake.patch
+        add-cstdint.diff # https://github.com/rmsalinas/DBow3/pull/55
 )

 vcpkg_cmake_configure(
--- a/ports/dbow3/vcpkg.json
+++ b/ports/dbow3/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "dbow3",
  "version": "1.0.0",
-  "port-version": 3,
+  "port-version": 4,
  "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.",
  "homepage": "https://github.com/rmsalinas/DBow3",
  "license": "BSD-3-Clause",
--- a/ports/embree3/portfile.cmake
+++ b/ports/embree3/portfile.cmake
@ -1,3 +1,8 @@
+vcpkg_download_distfile(OPERATOR_FIX
+    URLS https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d.diff?full_index=1
+    FILENAME embree3-operator-fix-cda4cf1919bb2a748e78915fbd6e421a1056638d.diff
+    SHA512 3b8492f136b8616da3c21deea32df0629c48d2e0d9b92d418c04570cb71c4c29e280b63f5447a70479ba3bcef989132ea9ccfa20793f46595554ac04f65fe3bd
+)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
@ -9,6 +14,7 @@ vcpkg_from_github(
        no-runtime-install.patch
        001-downgrade-find-package-tbb-2020.patch
        avoid-library-conflicts.diff
+        "${OPERATOR_FIX}"
 )

 string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB)
--- a/ports/embree3/vcpkg.json
+++ b/ports/embree3/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "embree3",
  "version": "3.13.5",
-  "port-version": 5,
+  "port-version": 6,
  "description": "High Performance Ray Tracing Kernels.",
  "homepage": "https://github.com/embree/embree",
  "license": "Apache-2.0",
--- a/ports/hareflow/fix-missing-headers.diff
+++ b/ports/hareflow/fix-missing-headers.diff
@ -0,0 +1,12 @@
+diff --git a/include/hareflow/detail/accumulator.h b/include/hareflow/detail/accumulator.h
+index 1c1e0c5..6470870 100644
+--- a/include/hareflow/detail/accumulator.h
+++ b/include/hareflow/detail/accumulator.h
+@@ -6,6 +6,7 @@
+ #include <chrono>
+ #include <condition_variable>
+ #include <vector>
+#include <stdexcept>
+ 
+ #include "hareflow/detail/internal_types.h"
+ 
--- a/ports/hareflow/portfile.cmake
+++ b/ports/hareflow/portfile.cmake
@ -6,6 +6,7 @@ vcpkg_from_github(
    HEAD_REF main
    PATCHES
        fix-asio-error.patch
+        fix-missing-headers.diff
 )

 if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
--- a/ports/hareflow/vcpkg.json
+++ b/ports/hareflow/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "hareflow",
  "version-semver": "0.1.1",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Hareflow: A RabbitMQ C++ stream client.",
  "homepage": "https://github.com/coveooss/hareflow",
  "license": "Apache-2.0",
--- a/ports/irrlicht/fix-osx-compilation-2.diff
+++ b/ports/irrlicht/fix-osx-compilation-2.diff
@ -0,0 +1,22 @@
+diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
+index 60da342..6bf2e30 100644
+--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
+++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
+@@ -642,7 +642,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
+ 						NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias,
+ 						NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)(CreationParams.Stencilbuffer?1:0),
+ 						NSOpenGLPFADoubleBuffer,
+-						(NSOpenGLPixelFormatAttribute)nil
+						(NSOpenGLPixelFormatAttribute)0
+ 					};
+ 
+ 					if (CreationParams.AntiAlias<2)
+@@ -668,7 +668,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key)
+ 						{
+ 							// Third try without Doublebuffer
+ 							os::Printer::log("No doublebuffering available.", ELL_WARNING);
+-							windowattribs[14]=(NSOpenGLPixelFormatAttribute)nil;
+							windowattribs[14]=(NSOpenGLPixelFormatAttribute)0;
+ 						}
+ 
+ 						format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs];
--- a/ports/irrlicht/portfile.cmake
+++ b/ports/irrlicht/portfile.cmake
@ -7,6 +7,7 @@ vcpkg_from_sourceforge(
    PATCHES
        fix-encoding.patch
        fix-osx-compilation.patch
+        fix-osx-compilation-2.diff
 )

 if(VCPKG_TARGET_IS_LINUX)
--- a/ports/irrlicht/vcpkg.json
+++ b/ports/irrlicht/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "irrlicht",
  "version": "1.8.5",
-  "port-version": 1,
+  "port-version": 2,
  "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.",
  "homepage": "http://irrlicht.sourceforge.net",
  "supports": "!(android | uwp)",
--- a/ports/libgo/add-stdexcept.diff
+++ b/ports/libgo/add-stdexcept.diff
@ -0,0 +1,24 @@
+diff --git a/libgo/common/anys.h b/libgo/common/anys.h
+index e5b2219..80c22e3 100644
+--- a/libgo/common/anys.h
+++ b/libgo/common/anys.h
+@@ -7,6 +7,7 @@
+ #include <mutex>
+ #include <assert.h>
+ #include <memory>
+#include <stdexcept>
+ 
+ namespace co
+ {
+diff --git a/libgo/common/spinlock.h b/libgo/common/spinlock.h
+index b0adeb8..30789ad 100644
+--- a/libgo/common/spinlock.h
+++ b/libgo/common/spinlock.h
+@@ -1,6 +1,7 @@
+ #pragma once
+ #include "config.h"
+ #include <exception>
+#include <stdexcept>
+ 
+ namespace co
+ {
--- a/ports/libgo/portfile.cmake
+++ b/ports/libgo/portfile.cmake
@ -9,6 +9,7 @@ vcpkg_from_github(
    PATCHES
        cmake.patch
        Add-target-include-directory.patch
+        add-stdexcept.diff
 )

 vcpkg_from_github(
--- a/ports/libgo/vcpkg.json
+++ b/ports/libgo/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "libgo",
  "version": "3.1",
-  "port-version": 5,
+  "port-version": 6,
  "description": "The best stackful coroutine by c++11.",
  "homepage": "https://github.com/yyzybb537/libgo",
  "license": "MIT",
--- a/ports/licensepp/add-stdint.diff
+++ b/ports/licensepp/add-stdint.diff
@ -0,0 +1,12 @@
+diff --git a/license++/license.h b/license++/license.h
+index 677529e..0c50876 100644
+--- a/license++/license.h
+++ b/license++/license.h
+@@ -11,6 +11,7 @@
+ #ifndef License_h
+ #define License_h
+ 
+#include <stdint.h>
+ #include <string>
+ 
+ namespace licensepp {
--- a/ports/licensepp/portfile.cmake
+++ b/ports/licensepp/portfile.cmake
@ -9,6 +9,8 @@ vcpkg_from_github(
    PATCHES
        0001-use-old-pem-pack.patch
        0002-fix-compilation-macos.patch
+        add-stdint.diff
+        remove-werror.diff
 )

 file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake")
--- a/ports/licensepp/remove-werror.diff
+++ b/ports/licensepp/remove-werror.diff
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b6cce99..eae797a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@ if (APPLE)
+ endif()
+ 
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall")
+ endif()
+ 
+ # Check for cryptopp (static)
--- a/ports/licensepp/vcpkg.json
+++ b/ports/licensepp/vcpkg.json
@ -1,8 +1,9 @@
 {
  "name": "licensepp",
  "version-date": "2020-11-24",
+  "port-version": 1,
  "description": "Cross platform software licensing library",
-  "homepage": "https://github.com/zuhd-org/licensepp",
+  "homepage": "https://github.com/amrayn/licensepp",
  "supports": "!uwp",
  "dependencies": [
    {
--- a/ports/llgl/install.patch
+++ b/ports/llgl/install.patch
@ -1,113 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4c8b497..ff922fd6 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -729,8 +729,12 @@ else()
-     set(SUMMARY_LIBRARY_TYPE "Shared")
-     add_library(LLGL SHARED ${FilesLLGL})
- endif()
-+set(all_targets LLGL)
- 
-target_include_directories(LLGL PUBLIC ${PROJECT_INCLUDE_DIR})
-+include(GNUInstallDirs)
-+target_include_directories(LLGL INTERFACE
-+                           $<BUILD_INTERFACE:${PROJECT_INCLUDE_DIR}>
-+                           $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
- 
- if(LLGL_ANDROID_PLATFORM)
-     target_link_libraries(LLGL android log)
-@@ -763,6 +767,8 @@ if(LLGL_BUILD_RENDERER_NULL)
-     target_link_libraries(LLGL_Null LLGL ${OPENGL_LIBRARIES})
-     
-     ADD_DEFINE(LLGL_BUILD_RENDERER_NULL)
-+
-+    list(APPEND all_targets LLGL_Null)
- endif()
- 
- if(LLGL_BUILD_RENDERER_OPENGLES3)
-@@ -788,6 +794,8 @@ if(LLGL_BUILD_RENDERER_OPENGLES3)
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGLES3)
-         ADD_PROJECT_DEFINE(LLGL_OpenGLES3 LLGL_OPENGLES3)
-+
-+        list(APPEND all_targets LLGL_OpenGLES3)
-     else()
-         message("Missing OpenGLES -> LLGL_OpenGLES3 renderer will be excluded from project")
-     endif()
-@@ -816,6 +824,8 @@ if(LLGL_BUILD_RENDERER_OPENGL)
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGL)
-         ADD_PROJECT_DEFINE(LLGL_OpenGL LLGL_OPENGL)
-+
-+        list(APPEND all_targets LLGL_OpenGL)
-     else()
-         message("Missing OpenGL -> LLGL_OpenGL renderer will be excluded from project")
-     endif()
-@@ -838,6 +848,8 @@ if(NOT APPLE AND LLGL_BUILD_RENDERER_VULKAN)
-         target_link_libraries(LLGL_Vulkan LLGL ${Vulkan_LIBRARY})
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_VULKAN)
-+        
-+        list(APPEND all_targets LLGL_Vulkan)
-     else()
-         message("Missing Vulkan -> LLGL_Vulkan renderer will be excluded from project")
-     endif()
-@@ -869,6 +881,8 @@ if(APPLE AND LLGL_BUILD_RENDERER_METAL)
-         endif()
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_METAL)
-+        
-+        list(APPEND all_targets LLGL_Metal)
-     else()
-         message("Missing Metal/MetalKit -> LLGL_Metal renderer will be excluded from project")
-     endif()
-@@ -888,6 +902,8 @@ if(WIN32)
-         target_link_libraries(LLGL_Direct3D11 LLGL d3d11 dxgi D3DCompiler)
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D11)
-+        
-+        list(APPEND all_targets LLGL_Direct3D11)
-     endif()
-     
-     if(LLGL_BUILD_RENDERER_DIRECT3D12)
-@@ -904,6 +920,8 @@ if(WIN32)
-         target_compile_definitions(LLGL_Direct3D12 PUBLIC -DLLGL_DX_ENABLE_D3D12)
-         
-         ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D12)
-+        
-+        list(APPEND all_targets LLGL_Direct3D12)
-     endif()
- endif()
- 
-@@ -994,6 +1012,20 @@ if(WIN32 AND LLGL_BUILD_WRAPPER_CSHARP)
-     add_subdirectory(Wrapper/CSharp)
- endif()
- 
-+# Install targets
-+install(TARGETS ${all_targets} EXPORT LLGLTargets RUNTIME LIBRARY ARCHIVE)
-+# Install headers
-+install(DIRECTORY "${PROJECT_INCLUDE_DIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+# Install CMake config files
-+install(EXPORT LLGLTargets NAMESPACE LLGL:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LLGL")
-+include(CMakePackageConfigHelpers)
-+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
-+  "${CMAKE_CURRENT_BINARY_DIR}/LLGLConfig.cmake"
-+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLGL
-+)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LLGLConfig.cmake"
-+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LLGL"
-+)
- # Summary Information
- message("~~~ Build Summary ~~~")
- 
-diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-new file mode 100644
-index 00000000..aa67a9e4
--- /dev/null
-+++ b/cmake/Config.cmake.in
-@@ -0,0 +1,5 @@
-+@PACKAGE_INIT@
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/LLGLTargets.cmake")
-+
-+check_required_components(@PROJECT_NAME@)
--- a/ports/llgl/portfile.cmake
+++ b/ports/llgl/portfile.cmake
@ -1,3 +1,14 @@
+vcpkg_download_distfile(INSTALL_PATCH
+    URLS https://github.com/LukasBanana/LLGL/commit/7eea7e5aa7008f0549a03d322a567566d9282b62.diff?full_index=1
+    FILENAME llgl-install-7eea7e5aa7008f0549a03d322a567566d9282b62.diff
+    SHA512 c627f4c0e7239c38e81d6c691b2c12bbb0ff8b8faf390c0832d5dea177b3034e1e2ddd232c0189b1bd0785bf0ac006e15983a712d871d021a124d583134a7212
+)
+
+vcpkg_download_distfile(ADD_CSTDINT_PATCH
+    URLS https://github.com/LukasBanana/LLGL/commit/95a613400fb7001306edbdb0c49cb32f8a284989.diff?full_index=1
+    FILENAME llgl-add-cstdint-95a613400fb7001306edbdb0c49cb32f8a284989.diff
+    SHA512 fa1b9f6a3199cecc9effd86171b1b4f12ae9e8b162e8638a63fa4d12cdfd20e93804b663f190b2a91d712f9387580f381d66f384b1f9fb4d1d959943bc39c44f
+)

 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
@ -6,7 +17,8 @@ vcpkg_from_github(
    SHA512 a6e11573759ced048cc9b9b97dd6abbfb70cbc29770e040b0472d529a1cff14e529b7ed62e647d9b318f6633a41918a29d66762da08e4b093582e1a45284e6d3
    HEAD_REF master
    PATCHES 
-        install.patch # See https://github.com/LukasBanana/LLGL/pull/81
+        "${INSTALL_PATCH}"
+        "${ADD_CSTDINT_PATCH}"
 )

 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
--- a/ports/llgl/vcpkg.json
+++ b/ports/llgl/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "llgl",
  "version-date": "2023-03-05",
+  "port-version": 1,
  "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.",
  "homepage": "https://github.com/LukasBanana/LLGL",
  "license": "BSD-3-Clause",
--- a/ports/magnum/007-missing-headers.diff
+++ b/ports/magnum/007-missing-headers.diff
@ -0,0 +1,40 @@
+diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h
+index 861a496..2d0436b 100644
+--- a/src/Magnum/Math/Vector.h
+++ b/src/Magnum/Math/Vector.h
+@@ -29,6 +29,8 @@
+  * @brief Class @ref Magnum::Math::Vector, function @ref Magnum::Math::dot(), @ref Magnum::Math::angle()
+  */
+ 
+#include <cstddef>
+#include <vector>
+ #include <utility>
+ #include <Corrade/Utility/Assert.h>
+ #ifndef CORRADE_NO_DEBUG
+diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h
+index 7223bd7..aae88c6 100644
+--- a/src/Magnum/MeshTools/CompressIndices.h
+++ b/src/Magnum/MeshTools/CompressIndices.h
+@@ -29,6 +29,8 @@
+  * @brief Function @ref Magnum::MeshTools::compressIndices()
+  */
+ 
+#include <cstddef>
+#include <vector>
+ #include <utility>
+ #include <Corrade/Containers/Containers.h>
+ 
+diff --git a/src/Magnum/MeshTools/GenerateNormals.h b/src/Magnum/MeshTools/GenerateNormals.h
+index 3dbf88b..71eadd0 100644
+--- a/src/Magnum/MeshTools/GenerateNormals.h
+++ b/src/Magnum/MeshTools/GenerateNormals.h
+@@ -29,6 +29,9 @@
+  * @brief Function @ref Magnum::MeshTools::generateFlatNormals(), @ref Magnum::MeshTools::generateFlatNormalsInto(), @ref Magnum::MeshTools::generateSmoothNormals(), @ref Magnum::MeshTools::generateSmoothNormalsInto()
+  */
+ 
+#include <cstddef>
+#include <utility>
+#include <vector>
+ #include "Magnum/Magnum.h"
+ #include "Magnum/MeshTools/visibility.h"
+ 
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@ -10,6 +10,7 @@ vcpkg_from_github(
        004-fix-FindOpenAL.patch
        005-fix-find-sdl2.patch
        006-fix-build.patch # From https://github.com/mosra/magnum/issues/642#issuecomment-2217261862
+        007-missing-headers.diff
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
--- a/ports/magnum/vcpkg.json
+++ b/ports/magnum/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "magnum",
  "version-string": "2020.06",
-  "port-version": 19,
+  "port-version": 20,
  "description": "C++11/C++14 graphics middleware for games and data visualization",
  "homepage": "https://magnum.graphics/",
  "license": null,
--- a/ports/manifold/portfile.cmake
+++ b/ports/manifold/portfile.cmake
@ -15,6 +15,7 @@ vcpkg_cmake_configure(
        -DMANIFOLD_CBIND=ON
        -DMANIFOLD_PYBIND=OFF
        -DMANIFOLD_JSBIND=OFF
+        -DMANIFOLD_STRICT=OFF
 )

 vcpkg_cmake_install()
--- a/ports/manifold/vcpkg.json
+++ b/ports/manifold/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "manifold",
  "version": "3.2.1",
+  "port-version": 1,
  "description": "Geometry library for topological robustness.",
  "homepage": "https://github.com/elalish/manifold",
  "license": "Apache-2.0",
--- a/ports/ms-ifc-sdk/portfile.cmake
+++ b/ports/ms-ifc-sdk/portfile.cmake
@ -1,9 +1,17 @@
+vcpkg_download_distfile(ADD_CSTDINT_FIX
+    URLS https://github.com/microsoft/ifc/commit/48659fbaed5f971aecb1a0c8264e0cb2e9fe235f.diff?full_index=1
+    FILENAME ms-ifc-sdk-cstdint-48659fbaed5f971aecb1a0c8264e0cb2e9fe235f.diff
+    SHA512 56b97bf7cfcc37ddf31bc6f4eabe579197a7e4d259ac3df4dbcf8fdd2263215b7c9a3b1905a223c73f0f7f92d3e4d782f069a88cf4d114674bc56d5980634a94
+)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO microsoft/ifc
    REF 0.43.1
    SHA512 c7ce8570d776f875c1a1fed929734ebc73b2cf25106e2a5e80625269f4f91d8106d19da34525cc4d7a694d750788d124e8e1ef082c54a13c9b34fe3da7f9e82d
    HEAD_REF main
+    PATCHES
+        "${ADD_CSTDINT_FIX}"
 )

 set(config_path share/cmake/Microsoft.IFC)
--- a/ports/ms-ifc-sdk/vcpkg.json
+++ b/ports/ms-ifc-sdk/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "ms-ifc-sdk",
  "version": "0.43.1",
+  "port-version": 1,
  "description": "SDK for the IFC specification at https://github.com/microsoft/ifc-spec",
  "homepage": "https://github.com/microsoft/ifc",
  "license": "Apache-2.0 WITH LLVM-exception",
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@ -1,11 +1,19 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+vcpkg_download_distfile(APPLE_CLANG_FIX
+    URLS https://github.com/nmslib/nmslib/commit/91a6095e7843ccd51e5ac6a85622256224118535.diff?full_index=1
+    FILENAME nmslib-apple-clang-fix-91a6095e7843ccd51e5ac6a85622256224118535.diff
+    SHA512 d1a19f456b01e56178d68dd6539759c0ecc39f248992a441ac46257014200c066527d096e60fb386913a13125044683b773e107602c969e9e2cfdd446b012143
+)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO nmslib/nmslib
    REF v2.1.1
    SHA512 62BBB965EA4BF1D416ED78231B1BA4B41C0F46327D7BE16D1F98095DB63EF0E0D893B70040009711BC9C68555B1B8C4038F5032ABD66B759E955E2CBB0553EC3
    HEAD_REF master
+    PATCHES
+        "${APPLE_CLANG_FIX}"
 )

 # TODO: check SSE and AVX availability and set corresponding tags
--- a/ports/nmslib/vcpkg.json
+++ b/ports/nmslib/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "nmslib",
  "version": "2.1.1",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.",
  "homepage": "https://github.com/searchivarius/nmslib",
  "supports": "!(arm | uwp)",
--- a/ports/orange-math/no-fmodf.diff
+++ b/ports/orange-math/no-fmodf.diff
@ -0,0 +1,13 @@
+diff --git a/include/omath/color.hpp b/include/omath/color.hpp
+index 69e554f..e710a54 100644
+--- a/include/omath/color.hpp
+++ b/include/omath/color.hpp
+@@ -95,7 +95,7 @@ namespace omath
+                 hsv_data.hue = 0.f;
+ 
+             else if (max == red)
+-                hsv_data.hue = 60.f * (std::fmodf(((green - blue) / delta), 6.f));
+                hsv_data.hue = 60.f * (std::fmod(static_cast<float>((green - blue) / delta), 6.f));
+             else if (max == green)
+                 hsv_data.hue = 60.f * (((blue - red) / delta) + 2.f);
+             else if (max == blue)
--- a/ports/orange-math/portfile.cmake
+++ b/ports/orange-math/portfile.cmake
@ -8,6 +8,8 @@ vcpkg_from_github(
    REF "v${VERSION}"
    SHA512 f3d94401e47294eb41cd3ab234cbb40a17dafe3b9a0a09f85e167d0f4f1caa1f3388b14fa5ae6f15283ba64006009791793b4857904d0f06ff56a60435dac7c9
    HEAD_REF master
+    PATCHES
+        no-fmodf.diff # https://github.com/orange-cpp/omath/pull/74
 )

 vcpkg_replace_string("${SOURCE_PATH}/include/omath/omath.hpp" [[#include "linear_algebra/matrix.hpp"]] "")
--- a/ports/orange-math/vcpkg.json
+++ b/ports/orange-math/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "orange-math",
  "version": "3.6.1",
+  "port-version": 1,
  "description": "General purpose math library",
  "homepage": "https://github.com/orange-cpp/omath",
  "license": "Zlib",
--- a/ports/pistache/portfile.cmake
+++ b/ports/pistache/portfile.cmake
@ -2,12 +2,20 @@ if(NOT VCPKG_TARGET_IS_LINUX)
    message(FATAL_ERROR "${PORT} currently only supports Linux platform.")
 endif()

+vcpkg_download_distfile(ADD_CSTDINT_PATCH
+    URLS https://github.com/pistacheio/pistache/commit/dabe9fcd3eaaa6b0b8723369b2565778341630c0.diff?full_index=1
+    FILENAME pistache-cstdint-dabe9fcd3eaaa6b0b8723369b2565778341630c0.diff
+    SHA512 1cef4b084050a5cb409a2f055e12f03184ad3cd07c8b896c38152f9c0c630d812a73fb78ccb3e7270ffe8001d877c3da173be06810744c2e0807a20e488ee66d
+)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO pistacheio/pistache
    REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31
    SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4
-    HEAD_REF master
+    HEAD_REF master 
+    PATCHES
+        "${ADD_CSTDINT_PATCH}"
 )

 vcpkg_configure_meson(
--- a/ports/pistache/vcpkg.json
+++ b/ports/pistache/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "pistache",
  "version-date": "2021-03-31",
-  "port-version": 3,
+  "port-version": 4,
  "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API",
  "homepage": "https://github.com/oktal/pistache",
  "supports": "linux",
--- a/ports/qt5-location/add-float-cast.diff
+++ b/ports/qt5-location/add-float-cast.diff
@ -0,0 +1,13 @@
+diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
+index ef669c6..6c6a35e 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp
+@@ -95,7 +95,7 @@ namespace mbgl {
+     PointAndCameraDistance project(const Point<float>& point, const mat4& matrix) {
+         vec4 pos = {{ point.x, point.y, 0, 1 }};
+         matrix::transformMat4(pos, pos, matrix);
+-        return {{ static_cast<float>(pos[0] / pos[3]), static_cast<float>(pos[1] / pos[3]) }, pos[3] };
+        return {{ static_cast<float>(pos[0] / pos[3]), static_cast<float>(pos[1] / pos[3]) }, static_cast<float>(pos[3]) };
+     }
+ 
+     float evaluateSizeForFeature(const ZoomEvaluatedSize& zoomEvaluatedSize, const PlacedSymbol& placedSymbol) {
--- a/ports/qt5-location/add-stdint.diff
+++ b/ports/qt5-location/add-stdint.diff
@ -0,0 +1,84 @@
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+index 1d5f4e8..fdfec87 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp
+@@ -7,6 +7,7 @@
+ 
+ #include <memory>
+ #include <mutex>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+index 551b5c8..e169aa3 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <exception>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+index a28c59a..8186483 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -3,6 +3,7 @@
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+index 4887058..e818922 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp
+@@ -8,6 +8,7 @@
+ #include <cstring>
+ #include <memory>
+ #include <algorithm>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
+index 12c0ad0..f4cccb8 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp
+@@ -2,6 +2,7 @@
+ 
+ #include <cstdint>
+ #include <array>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ 
+diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+index 13498cc..6b67df2 100644
+--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -5,6 +5,7 @@
+ #include <cassert>
+ #include <cstdlib>
+ #include <exception>
+#include <stdint.h>
+ 
+ // Polyfill needed by Qt when building for Android with GCC
+ #if defined(__ANDROID__) && defined(__GLIBCXX__)
+diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+index bc959c9..c53dca3 100644
+--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <mbgl/util/variant.hpp>
+#include <stdint.h>
+ 
+ namespace mbgl {
+ namespace gl {
--- a/ports/qt5-location/mapboxgl-gcc13.patch
+++ b/ports/qt5-location/mapboxgl-gcc13.patch
@ -1,34 +0,0 @@
-diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
-index a28c59a..92d928a 100644
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
-+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
-@@ -1,5 +1,6 @@
- #pragma once
-
-+#include <cstdint>
- #include <mapbox/geometry/geometry.hpp>
- #include <mapbox/geometry/point_arithmetic.hpp>
- #include <mapbox/geometry/for_each_point.hpp>
-diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
-index 13498cc..4dc82a8 100644
--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
-+++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
-@@ -4,6 +4,7 @@
- #include <string>
- #include <cassert>
- #include <cstdlib>
-+#include <cstdint>
- #include <exception>
-
- // Polyfill needed by Qt when building for Android with GCC
-diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
-index bc959c9..2fc62bb 100644
--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
-@@ -1,5 +1,6 @@
- #pragma once
-
-+#include <cstdint>
- #include <mbgl/util/variant.hpp>
-
- namespace mbgl {
--- a/ports/qt5-location/portfile.cmake
+++ b/ports/qt5-location/portfile.cmake
@ -1,3 +1,3 @@
 message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.")
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
-qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch mapboxgl-gcc13.patch)
+qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch add-stdint.diff add-float-cast.diff)
--- a/ports/qt5-location/vcpkg.json
+++ b/ports/qt5-location/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "qt5-location",
  "version": "5.15.17",
-  "port-version": 1,
+  "port-version": 2,
  "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.",
  "license": null,
  "dependencies": [
--- a/ports/realsense2/add-stdexcept.diff
+++ b/ports/realsense2/add-stdexcept.diff
@ -0,0 +1,24 @@
+diff --git a/src/core/matcher-factory.cpp b/src/core/matcher-factory.cpp
+index ea94209..580af62 100644
+--- a/src/core/matcher-factory.cpp
+++ b/src/core/matcher-factory.cpp
+@@ -6,6 +6,7 @@
+ #include "stream-interface.h"
+ 
+ #include <src/sync.h>
+#include <stdexcept>
+ 
+ 
+ namespace librealsense {
+diff --git a/src/core/options-registry.cpp b/src/core/options-registry.cpp
+index d22b142..68c62d5 100644
+--- a/src/core/options-registry.cpp
+++ b/src/core/options-registry.cpp
+@@ -7,6 +7,7 @@
+ #include <vector>
+ #include <mutex>
+ #include <map>
+#include <stdexcept>
+ 
+ 
+ namespace librealsense {
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@ -21,6 +21,7 @@ vcpkg_from_github(
        fix_openni2.patch
        libusb.diff
        using-firmware.diff
+        add-stdexcept.diff # https://github.com/IntelRealSense/librealsense/pull/14299
 )
 file(GLOB extern "${SOURCE_PATH}/CMake/extern_*.cmake")
 file(REMOVE_RECURSE
--- a/ports/realsense2/vcpkg.json
+++ b/ports/realsense2/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "realsense2",
  "version": "2.56.3",
+  "port-version": 1,
  "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
  "homepage": "https://github.com/IntelRealSense/librealsense",
  "license": "Apache-2.0",
--- a/ports/rioki-glow/add-iostream.diff
+++ b/ports/rioki-glow/add-iostream.diff
@ -0,0 +1,13 @@
+diff --git a/glow/util.cpp b/glow/util.cpp
+index 005df9d..e8a5747 100644
+--- a/glow/util.cpp
+++ b/glow/util.cpp
+@@ -25,6 +25,8 @@
+ #ifdef _WIN32
+ #define NOMINMAX
+ #include <Windows.h>
+#else
+#include <iostream>
+ #endif
+ 
+ namespace glow
--- a/ports/rioki-glow/portfile.cmake
+++ b/ports/rioki-glow/portfile.cmake
@ -3,6 +3,8 @@ vcpkg_from_github(
    REPO rioki/glow
    REF v0.2.1
    SHA512 410d0bcc98f9587321dceab498ed84fe2cffbf1f38ba59592d5f7eded9eea67c17e40415966d14f548b7e91f23e17fc0162c216c34b905c641647f90274af5b1
+    PATCHES
+        add-iostream.diff # https://github.com/rioki/glow/pull/21
 )

 vcpkg_cmake_configure(
--- a/ports/rioki-glow/vcpkg.json
+++ b/ports/rioki-glow/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "rioki-glow",
  "version-semver": "0.2.1",
+  "port-version": 1,
  "description": "OpenGL Object Wrapper",
  "homepage": "https://github.com/rioki/glow",
  "license": "MIT",
--- a/ports/rtmfp-cpp/portfile.cmake
+++ b/ports/rtmfp-cpp/portfile.cmake
@ -1,9 +1,17 @@
+vcpkg_download_distfile(ADD_CSTDINT
+    URLS https://github.com/zenomt/rtmfp-cpp/commit/9c53bde974e6463537a4e5573a548e59eb45786c.diff?full_index=1
+    FILENAME rtmfp-cpp-add-cstdint-9c53bde974e6463537a4e5573a548e59eb45786c.diff
+    SHA512 7c6c4bf04f541c06a6f24b0e5033a26c13e1f985b5fa33bddcea8374e50e97bdfd768a2a16cb84ba0e67f1525036fd17af298053c909f48fd45f6974b1857d56
+)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO zenomt/rtmfp-cpp
    REF "v${VERSION}"
    SHA512 cc8eac88c70b6a00a92a76bee66a3b319857a009fbfd82e9a710fe1c0fc452cf9fdf4128529e3f10931ed33c26eaf69253cab3b3e5a739eca6dd37a13f72800b
    HEAD_REF main
+    PATCHES
+        "${ADD_CSTDINT}"
 )

 vcpkg_cmake_configure(
--- a/ports/rtmfp-cpp/vcpkg.json
+++ b/ports/rtmfp-cpp/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "rtmfp-cpp",
  "version": "1.5.1",
+  "port-version": 1,
  "description": "Secure Real-Time Media Flow Protocol Library (RTMFP)",
  "homepage": "https://github.com/zenomt/rtmfp-cpp",
  "license": "MIT",
--- a/ports/shaderwriter/fix-template.diff
+++ b/ports/shaderwriter/fix-template.diff
@ -0,0 +1,13 @@
+diff --git a/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp b/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp
+index 39bdee2..26a1e74 100644
+--- a/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp
+++ b/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp
+@@ -61,7 +61,7 @@ namespace sdw
+ 		{
+ 			static_assert( hasFieldByName< FieldNameT >() );
+ 			using FieldT = decltype( getFieldByName< FieldNameT >() );
+-			return FieldT::template get( *this );
+			return FieldT::get( *this );
+ 		}
+ 
+ 		static type::BaseStructPtr makeType( type::TypesCache & cache )
--- a/ports/shaderwriter/portfile.cmake
+++ b/ports/shaderwriter/portfile.cmake
@ -3,6 +3,8 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
    REF v${VERSION}
    SHA512 72b197f1185e3cee507fb1a5152709ee4c99317db61484d2427d96ae8426a127cd1cb234553be55616709f6f04bed6aec88fa4dfea48219ac1c5b36d9b349a2a
    HEAD_REF development
+    PATCHES
+        fix-template.diff # https://github.com/DragonJoker/ShaderWriter/pull/280
 )

 vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH
--- a/ports/shaderwriter/vcpkg.json
+++ b/ports/shaderwriter/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "shaderwriter",
  "version": "2.9.0",
+  "port-version": 1,
  "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.",
  "homepage": "https://github.com/DragonJoker/ShaderWriter",
  "license": "MIT",
--- a/ports/treehopper/add-cstdint.diff
+++ b/ports/treehopper/add-cstdint.diff
@ -0,0 +1,10 @@
+diff --git a/C++/API/inc/UsbConnection.h b/C++/API/inc/UsbConnection.h
+index f07533c..614d2f9 100644
+--- a/C++/API/inc/UsbConnection.h
+++ b/C++/API/inc/UsbConnection.h
+@@ -1,4 +1,5 @@
+ #pragma once
+#include <cstdint>
+ #include <string>
+ #include "Treehopper.h"
+ 
--- a/ports/treehopper/portfile.cmake
+++ b/ports/treehopper/portfile.cmake
@ -8,6 +8,7 @@ vcpkg_from_github(
    HEAD_REF master
    PATCHES
        fix-dependences.patch
+        add-cstdint.diff
 )

 if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID)
--- a/ports/treehopper/vcpkg.json
+++ b/ports/treehopper/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "treehopper",
  "version": "1.11.3",
-  "port-version": 10,
+  "port-version": 11,
  "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.",
  "homepage": "https://treehopper.io",
  "supports": "!uwp & !(static & staticcrt)",
--- a/ports/turbobase64/fix-apple-silicon-arm64-detection.diff
+++ b/ports/turbobase64/fix-apple-silicon-arm64-detection.diff
@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b898742..f6274c5 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ option(BUILD_APP "Build executables" OFF)
+ message(STATUS "Configuring with CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
+ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+     set(ARCH_AMD64 ON)
+-elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64")
+     set(ARCH_AARCH64 ON)
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le")
+     set(ARCH_PPC64LE ON)
--- a/ports/turbobase64/portfile.cmake
+++ b/ports/turbobase64/portfile.cmake
@ -10,6 +10,7 @@ vcpkg_from_github(
    HEAD_REF master
    PATCHES
        fix-library-conflict.diff
+        fix-apple-silicon-arm64-detection.diff # https://github.com/powturbo/Turbo-Base64/pull/29
 )

 vcpkg_cmake_configure(
--- a/ports/turbobase64/vcpkg.json
+++ b/ports/turbobase64/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "turbobase64",
  "version": "2023.8",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Fastest Base64 SIMD/Neon library",
  "homepage": "https://github.com/powturbo/Turbo-Base64",
  "license": "GPL-3.0-only",
--- a/ports/vanillapdf/disable-autosubscribe.diff
+++ b/ports/vanillapdf/disable-autosubscribe.diff
@ -0,0 +1,20 @@
+diff --git a/src/vanillapdf/utils/util.h b/src/vanillapdf/utils/util.h
+index 086dc66..57e23ef 100644
+--- a/src/vanillapdf/utils/util.h
+++ b/src/vanillapdf/utils/util.h
+@@ -49,6 +49,7 @@ private:
+     ScopeGuardFactory();
+ };
+ 
+#if 0
+ // The AutoSubscribe concept is something I was thinking about for a long time.
+ // Unfortunately I am still not able to create a working POC, however I want to keep the code.
+ // In case I will be thinking about such functionality in the future, this could be the starting point.
+@@ -95,6 +96,7 @@ private:
+     T _observable;
+     U* _observer;
+ };
+#endif
+ 
+ #if (__cplusplus < 201402L) && !defined(COMPILER_MICROSOFT_VISUAL_STUDIO)
+     // Use custom implementation if not
--- a/ports/vanillapdf/portfile.cmake
+++ b/ports/vanillapdf/portfile.cmake
@ -3,6 +3,8 @@ vcpkg_from_github(
    REPO vanillapdf/vanillapdf
    REF "v${VERSION}"
    SHA512 f15d9a290de0eebac9073503ac555cbf389484aa3ff6385697ba879c336ed9cd4277af180f9d842b5bd8cca69bf6ef4dcfbedba07a6a76014e3974fe09fc6190
+    PATCHES
+        disable-autosubscribe.diff
 )

 vcpkg_cmake_configure(
--- a/ports/vanillapdf/vcpkg.json
+++ b/ports/vanillapdf/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "vanillapdf",
  "version": "2.1.0",
+  "port-version": 1,
  "description": "Vanilla.PDF is a cross-platform SDK for creating and modifying PDF documents.",
  "homepage": "https://github.com/vanillapdf/vanillapdf",
  "documentation": "https://vanillapdf.github.io/vanillapdf",
--- a/ports/xeus/portfile.cmake
+++ b/ports/xeus/portfile.cmake
@ -1,3 +1,9 @@
+vcpkg_download_distfile(REMOVE_LTO_PATCH
+    URLS https://github.com/jupyter-xeus/xeus/commit/2dcccb574713f81b7d69baed2bd543bf6798f671.diff?full_index=1
+    FILENAME xeus-remove-lto-2dcccb574713f81b7d69baed2bd543bf6798f671.diff
+    SHA512 e0ae94825cb606dcd250394aee5c88e23bd5440a38c9f4cd8059590ec01dc1ec751ab0bb413788439dfbbfb2c28c68a82cb56efa11d05c3a2d63d420876e1e0b
+)
+
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO QuantStack/xeus
@ -6,6 +12,7 @@ vcpkg_from_github(
    HEAD_REF master
    PATCHES
        Fix-Compile-nlohmann-json.patch
+        "${REMOVE_LTO_PATCH}"
 )

 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
--- a/ports/xeus/vcpkg.json
+++ b/ports/xeus/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "xeus",
  "version": "0.24.3",
-  "port-version": 3,
+  "port-version": 4,
  "description": "C++ implementation of the Jupyter kernel protocol",
  "homepage": "https://github.com/jupyter-xeus/xeus",
  "license": "BSD-3-Clause",
--- a/scripts/azure-pipelines/android/Dockerfile
+++ b/scripts/azure-pipelines/android/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:noble-20250714
+FROM ubuntu:noble-20250805

 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
 ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
--- a/scripts/azure-pipelines/android/azure-pipelines.yml
+++ b/scripts/azure-pipelines/android/azure-pipelines.yml
@ -28,9 +28,9 @@ jobs:
  - name: ANDROID_NDK_HOME
    value: /android-ndk-r28c
  - name: ANDROID_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-09-11'
  - name: LINUX_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-17'
  steps:
    # Note: /mnt is the Azure machines' temporary disk.
  - bash: |
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@ -69,14 +69,14 @@ jobs:
 - template: osx/azure-pipelines.yml
  parameters:
    jobName: x64_osx
-    poolName: 'PrOsx-2025-01-24'
+    poolName: 'PrOsx-2025-09-11'
    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
    tripletPattern: ${{ parameters.tripletPattern }}

 - template: osx/azure-pipelines.yml
  parameters:
    jobName: arm64_osx
-    poolName: 'PrOsx-2025-01-24-arm64'
+    poolName: 'PrOsx-2025-09-11-arm64'
    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
    tripletPattern: ${{ parameters.tripletPattern }}

--- a/scripts/azure-pipelines/linux/Dockerfile
+++ b/scripts/azure-pipelines/linux/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:jammy-20250714
+FROM ubuntu:noble-20250805
 ADD provision-image.sh /provision-image.sh
 RUN apt-get update && \
  apt-get install --no-install-recommends -y curl gnupg ca-certificates
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@ -27,7 +27,7 @@ jobs:
  - name: VCPKG_DOWNLOADS
    value: /mnt/vcpkg-ci/downloads
  - name: LINUX_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-17'
  steps:
    # Note: /mnt is the Azure machines' temporary disk.
  - bash: |
--- a/scripts/azure-pipelines/linux/provision-image.sh
+++ b/scripts/azure-pipelines/linux/provision-image.sh
@ -7,7 +7,7 @@ export DEBIAN_FRONTEND=noninteractive

 # Add apt repos

-# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "20.04") and format to "2004"
+# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "24.04") and format to "2404"
 UBUNTU_VERSION_ID=$(. /etc/os-release && echo "$VERSION_ID")
 NVIDIA_REPO_VERSION=$(echo "$UBUNTU_VERSION_ID" | sed 's/\.//')

@ -144,6 +144,9 @@ APT_PACKAGES="$APT_PACKAGES wayland-protocols"
 ## required by robotraconteur
 APT_PACKAGES="$APT_PACKAGES libbluetooth-dev"

+## required by libmysql
+APT_PACKAGES="$APT_PACKAGES libtirpc-dev"
+
 ## CUDA
 # The intent is to install everything that does not require an actual GPU, driver, or GUI.
 # Intentionally omitted: cuda-demo-suite-12-9 cuda-documentation-12-9 cuda-driver-*
--- a/scripts/azure-pipelines/osx/README.md
+++ b/scripts/azure-pipelines/osx/README.md
@ -9,9 +9,10 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
 - [ ] A Parallels license for amd64 or [macosvm](https://github.com/s-u/macosvm) allow-listed
  by macOS for arm64. Note that the directory 'Parallels' is still used when using `macosvm`
  just so that scripts know where to find the VM and friends.
- [ ] An Xcode installer - you can get this from Apple's developer website,
+- [ ] An Xcode .xip - you can get this from Apple's developer website,
  although you'll need to sign in first: <https://developer.apple.com/downloads>  
  If you are doing this from a local macos box, you can skip to the "update the macos host" step.  
+- [ ] An Xcode Command Line Tools installer

 ### Instructions (AMD64)

@ -23,9 +24,9 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
 - [ ] Update or install parallels
 - [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662  
      Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing.
-      You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6` and point Parallels
+      You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6.1` and point Parallels
      at that resulting installer in 'Applications' instead.
- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-<DATE>-amd64", for example "vcpkg-osx-2025-08-12-amd64".
+- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-<DATE>", for example "vcpkg-osx-2025-09-11".
 - [ ] When creating the VM, customize the hardware to the following:
    * 12 processors
    * 24000 MB of memory
@ -46,25 +47,32 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
 - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) )
 - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all
 - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz
+- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
 - [ ] In the guest, set the vcpkg user to be able to use sudo without a password. From a dev machine:
    ```sh
+    scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip
    ssh vcpkg@HOSTMACHINE
+    rm ~/.ssh/known_hosts
    export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
    export SSH_COOKIE=vcpkg@$GUEST_IP
-    ssh $SSH_COOKIE  # and then enter the password here
+    scp Xcode.xip $SSH_COOKIE:/Users/vcpkg/Xcode.xip
+    ssh $SSH_COOKIE # and then enter the password here
    printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
    sudo chmod 0440 '/etc/sudoers.d/vcpkg'
-    exit
+    sudo mdutil -ad
+    xip --expand Xcode.xip
+    sudo mv Xcode.app /Applications/Xcode.app
+    rm Xcode.xip
    exit
    ```
- [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh.  From a developer machine:
+- [ ] Open Xcode from Applications in the guest GUI. Accept the EULA.
+- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
+- [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation:
    ```sh
    scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
    scp ./setup-box.sh vcpkg@HOSTMACHINE:/Users/vcpkg
    scp path/to/console/tools.dmg vcpkg@HOSTMACHINE:/Users/vcpkg/clt.dmg
    ssh vcpkg@HOSTMACHINE
-    rm ~/.ssh/known_hosts
    chmod +x setup-guest.sh
    ./setup-guest.sh
    rm setup-guest.sh
@ -72,7 +80,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
    rm clt.dmg
    exit
    ```
- [ ] Shut down the VM cleanly
+- [ ] Shut down the VM cleanly.
 - [ ] Ensure that there is no host system specific 'hardware' like macOS install .isos attached.
 - [ ] Set the VM 'Isolated'
 - [ ] Boot and then cleanly shut down the VM.
@ -82,8 +90,8 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
    ```sh
    ssh vcpkg@HOSTMACHINE
    brew install azcopy
-    azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
-    azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
+    azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
+    azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?<SAS>"
    exit
    ```
 - [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Grant microsoft.vcpkg.ci and microsoft.vcpkg.pr access.
@ -104,13 +112,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
    rm macosvm-0.2-1-arm64-darwin21.tar.gz
    exit
    ```
- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw
- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2025-08-12-arm64".
- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-08-12-arm64 and UniversalMac_15.6_24G84_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI:
+- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw
+- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2025-09-11-arm64".
+- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-09-11-arm64 and UniversalMac_15.6.1_24G90_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI:
    ```sh
-    mkdir -p ~/Parallels/vcpkg-osx-2025-08-12-arm64
-    cd ~/Parallels/vcpkg-osx-2025-08-12-arm64
-    ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6_24G84_Restore.ipsw ./vm.json
+    mkdir -p ~/Parallels/vcpkg-osx-2025-09-11-arm64
+    cd ~/Parallels/vcpkg-osx-2025-09-11-arm64
+    ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6.1_24G90_Restore.ipsw ./vm.json
    ~/macosvm -g ./vm.json
    ```
 - [ ] Follow prompts as you would on real hardware.
@ -126,16 +134,23 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
 - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) )
 - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all
 - [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login
- [ ] Set the vcpkg user to be able to use sudo without a password. For example from a dev workstation:
+- [ ] Set the vcpkg user to be able to use sudo without a password, and install Xcode. For example from a dev workstation:
    ```sh
+    scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip
    ssh vcpkg@HOSTMACHINE
    rm ~/.ssh/known_hosts
+    scp Xcode.xip vcpkg@vcpkgs-Virtual-Machine.local:/Users/vcpkg/Xcode.xip
    ssh vcpkg@vcpkgs-Virtual-Machine.local
    printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg'
    sudo chmod 0440 '/etc/sudoers.d/vcpkg'
+    sudo mdutil -ad
+    xip --expand Xcode.xip
+    sudo mv Xcode.app /Applications/Xcode.app
+    rm Xcode.xip
    exit
    ```
- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz
+- [ ] Open Xcode from Applications in the guest GUI. Uncheck the "code completion model" and accept the EULA.
+- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz
 - [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation:
    ```sh
    scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg
@ -178,8 +193,8 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
    ssh vcpkg@HOSTMACHINE
    brew install azcopy
    cd ~/Parallels
-    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.pvmp?<SAS>" .
-    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>-amd64.sha256.txt?<SAS>" .
+    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>.pvmp?<SAS>" .
+    azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-<DATE>.sha256.txt?<SAS>" .
    exit
    ```
 - [ ] Open the .pvmp in Parallels, and unpack it.
@ -197,7 +212,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
 - [ ] [grab a PAT][] if you don't already have one
 - [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
    ```sh
-    ./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
+    scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh
+    ssh vcpkg@HOSTMACHINE
+    rm .ssh/known_hosts
+    chmod +x register-guest.sh
+    ./register-guest.sh PAT GOES HERE
+    rm register-guest.sh
    ```
 - [ ] In the VM, open a terminal on the host and run:
    ```
@ -243,7 +263,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i
 - [ ] [grab a PAT][] if you don't already have one
 - [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine:
    ```sh
-    ./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere
+    scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh
+    ssh vcpkg@HOSTMACHINE
+    rm .ssh/known_hosts
+    chmod +x register-guest.sh
+    ./register-guest.sh PAT GOES HERE
+    rm register-guest.sh
    ```
 - [ ] That will cleanly shut down the VM. In the KVM's terminal, relaunch the VM in ephemeral mode with:
    ```sh
--- a/scripts/azure-pipelines/osx/fire-register-guest.ps1
+++ b/scripts/azure-pipelines/osx/fire-register-guest.ps1
@ -1,22 +0,0 @@
-Param(
-    [Parameter(Mandatory = $true)]
-    [ValidateNotNullOrEmpty()]
-    [string]$Pat,
-    [Parameter(Mandatory = $true)]
-    [ValidateNotNullOrEmpty()]
-    [string]$Target
-)
-
-$sshCookie = "vcpkg@$Target"
-scp "$PSScriptRoot/register-guest.sh" "$($sshCookie):/Users/vcpkg/register-guest.sh"
-
-# note that the empty line is load bearing
-$script = @"
-rm .ssh/known_hosts
-chmod +x /Users/vcpkg/register-guest.sh
-/Users/vcpkg/register-guest.sh $Pat
-
-"@
-
-$script | ssh $sshCookie
-ssh $sshCookie rm /Users/vcpkg/register-guest.sh
--- a/scripts/azure-pipelines/osx/register-guest.sh
+++ b/scripts/azure-pipelines/osx/register-guest.sh
@ -10,11 +10,13 @@ export POOL=`echo ~/Parallels/*/ | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-o
 # on arm64, DNS works
 export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local
 else
-export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-amd64\.pvm/PrOsx-\1/p'`
+export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})\.pvm/PrOsx-\1/p'`
 # on amd64, DNS does not work, but luckily for us prlctl does know the IP
 export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'`
 export SSH_COOKIE=vcpkg@$GUEST_IP
 fi
+echo "POOL: $POOL"
+echo "SSH_COOKIE: $SSH_COOKIE"
 ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula"
 if [ `uname -m` = 'arm64' ]; then
  ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "sudo shutdown -h now"
--- a/scripts/azure-pipelines/osx/setup-box.sh
+++ b/scripts/azure-pipelines/osx/setup-box.sh
@ -1,14 +1,10 @@
 #!/bin/sh

-# The next 2 lines are a workaround for an XCode Command Line Tools bug:
-# https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues
-sudo mdutil -ad
-sudo mkdir -p /Library/Developer/CommandLineTools
-sudo touch /Library/Developer/CommandLineTools/.beta
 hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer
 sudo installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target /
 hdiutil detach /Volumes/setup-installer
 rm clt.dmg
+sudo xcode-select -s /Applications/Xcode.app
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 if [ `uname -m` = 'arm64' ]; then
    (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile
@ -20,9 +16,9 @@ fi
 brew install autoconf-archive autoconf automake azcopy azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm
 mkdir ~/Data
 if [ `uname -m` = 'arm64' ]; then
-curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz
+curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz
 else
-curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz
+curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz
 fi
 mkdir ~/myagent
 tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent
--- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
@ -6,7 +6,7 @@ jobs:
 - job: x64_windows
  pool:
    name: vcpkg-testing-msvc
-    demands: ImageVersionOverride -equals 2025.08.15
+    demands: ImageVersionOverride -equals 2025.09.12
  timeoutInMinutes: 2880 # 2 days
  variables:
  - name: WORKING_ROOT
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@ -20,7 +20,7 @@ jobs:
  condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
  pool:
    name: PrWin-WUS
-    demands: ImageVersionOverride -equals 2025.08.15
+    demands: ImageVersionOverride -equals 2025.09.12
  timeoutInMinutes: 2880 # 2 days
  variables:
  - name: WORKING_ROOT
--- a/scripts/azure-pipelines/windows/deploy-azcopy.ps1
+++ b/scripts/azure-pipelines/windows/deploy-azcopy.ps1
@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$AzCopyUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
  Write-Host 'Downloading from the Internet'
-  $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.0/azcopy_windows_amd64_10.30.0.zip'
+  $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_windows_amd64_10.30.1.zip'
 } else {
  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.0.zip?$SasToken"
+  $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.1.zip?$SasToken"
 }

 mkdir -Force "C:\AzCopy10"
--- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
+++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$AzCliUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
  Write-Host 'Downloading from the Internet'
-  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.76.0-x64.msi'
+  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.77.0-x64.msi'
 } else {
  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.76.0-x64.msi?$SasToken"
+  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.77.0-x64.msi?$SasToken"
 }

 DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')
--- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1
+++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1
@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$PwshUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
  Write-Host 'Downloading from the Internet'
-  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.2/PowerShell-7.5.2-win-x64.msi'
+  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.3/PowerShell-7.5.3-win-x64.msi'
 } else {
  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.2-win-x64.msi?$SasToken"
+  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.3-win-x64.msi?$SasToken"
 }

 DownloadAndInstall -Url $PwshUrl -Name 'PowerShell Core' -Args @('/quiet', '/norestart')
--- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 }

 # See https://learn.microsoft.com/visualstudio/releases/2022/release-history
-# 17.14.12
-$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/a54455c3-57af-4ccb-ab09-88cfa071f1b5/c5dc5ae50da56fa711f3d699747e9bb2ac8795bd2535a1d288d2f4c88b64a582/vs_Enterprise.exe'
+# 17.14.14
+$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/c2e2845d-bdff-44fc-ac00-3d488e9f5675/60af8b24769eebe0349cd8bbf17ecb257a30bb69aae1970210e292062a002119/vs_Enterprise.exe'
 $Workloads = @(
  'Microsoft.VisualStudio.Workload.NativeDesktop',
  'Microsoft.VisualStudio.Workload.Universal',
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@ -39,9 +39,6 @@
 ##

 # Add new items alphabetically
-
-# ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11.
-ada-url:x64-linux=fail
 angelscript:x64-osx=fail
 apr:arm-neon-android=fail
 apr:arm64-android=fail
@ -52,13 +49,11 @@ arpack-ng:x64-windows-static-md=fail
 arpack-ng:x64-windows-static=fail
 # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed
 arrayfire:x64-linux=fail
+atliac-minitest:arm64-uwp=fail
+atliac-minitest:x64-uwp=fail
 avro-c:arm-neon-android=fail
 avro-c:arm64-android=fail
 avro-c:x64-android=fail
-# C++20 conformant compiler required
-atliac-minitest:arm64-uwp=fail
-atliac-minitest:x64-linux=fail
-atliac-minitest:x64-uwp=fail
 backward-cpp:arm-neon-android=fail
 backward-cpp:arm64-android=fail
 backward-cpp:x64-android=fail
@ -217,7 +212,7 @@ clamav:arm64-windows=fail
 clblas:arm-neon-android=fail
 clblas:arm64-android=fail
 clblas:x64-android=fail
-clockutils:arm-neon-android=fail
+clockutils:arm-neon-android=fail # gnustl_shared is no longer supported. Please switch to either c++_shared or c++_static.
 clockutils:arm64-android=fail
 clockutils:x64-android=fail
 clrng:arm-neon-android=fail
@ -246,7 +241,6 @@ cppcoro:arm64-osx=fail
 cppcoro:x64-android=fail
 cppcoro:x64-linux=fail
 cppcoro:x64-osx=fail
-cppslippi:x64-linux=fail
 crashpad:x64-linux=fail #Compilation failed due to the lack of Clang++ compiler.
 cserialport:arm-neon-android=fail
 cserialport:arm64-android=fail
@ -287,16 +281,12 @@ directxsdk:x64-windows=skip
 directxsdk:x86-windows=skip
 discord-rpc:arm64-uwp=fail
 discord-rpc:x64-uwp=fail
-# Needs newer GCC than we have
-discordcoreapi:x64-linux=fail
-# Needs newer standard library than we have
-discordcoreapi:x64-osx=fail
+discordcoreapi:x64-osx=fail # Needs newer standard library than we have
 discount:x64-android=fail
 eathread:x64-android=fail
 ecal:arm-neon-android=fail
 ecal:arm64-android=fail
 ecal:x64-android=fail
-faker-cxx:x64-linux=fail # requires gcc13 or later
 # variable length arrays in C++ are a Clang extension
 fbbgemmerror:arm-neon-android=fail
 fbbgemmerror:arm64-android=fail
@ -501,9 +491,8 @@ libdc1394:arm64-android=fail
 libdc1394:x64-android=fail
 libfreenect2:arm64-windows-static-md=fail
 libfreenect2:arm64-windows=fail
-# Fails to build due to incompatible delcaration of select in macOS 14.2
 libgo:x64-android=fail
-libgo:x64-osx=fail
+libgo:x64-osx=fail # Fails to build due to incompatible delcaration of select in macOS 14.2
 libgxps:x64-windows-static=fail
 libhdfs3:arm-neon-android=fail
 libhdfs3:arm64-android=fail
@ -593,9 +582,10 @@ libvmdk:x64-windows-static=skip
 libvmdk:x64-windows=skip
 libvmdk:x86-windows=skip
 libxaw:x64-windows-static=skip
-# Inline asm used doesn't appear to support arm64-windows:
-libxt:arm64-windows-static-md=fail
-libxt:arm64-windows=fail
+libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows
+libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows
+libxt:x64-windows-release=fail # Appears to have broken races
+libxt:x64-windows=fail
 linenoise-ng:arm64-uwp=fail
 linenoise-ng:x64-uwp=fail
 linenoise-ng:x64-windows-static-md=fail
@ -613,7 +603,6 @@ llvm:x64-android=fail
 log4cplus:arm64-uwp=fail
 log4cplus:x64-uwp=fail
 log4cpp:x64-linux=fail # dynamic exception specifications
-marzbanpp:x64-linux=fail # triplet supported but vcpkg toolchain is too old (requires GCC 12+/Clang 19+)
 mchehab-zbar:arm-neon-android=fail
 mchehab-zbar:arm64-android=fail
 mchehab-zbar:x64-android=fail
@ -746,6 +735,7 @@ openvino:arm64-android=skip # conflicts with kleidiai
 openvino:arm64-osx=skip # conflicts with kleidiai
 openvino:arm64-windows-static-md=fail
 openvino:arm64-windows=fail
+openvino:x64-osx=fail # OpenVINO_VERSION_MAJOR parsed from CI_BUILD_NUMBER () and from openvino/core/version.hpp (2025) are different
 openvr:x64-windows-static=fail
 # Conflicts with optional-lite, by the same author
 optional-bare:arm-neon-android=skip
@ -763,7 +753,6 @@ optional-bare:x64-windows-static-md=skip
 optional-bare:x64-windows-static=skip
 optional-bare:x64-windows=skip
 optional-bare:x86-windows=skip
-orange-math:x64-linux=fail
 orc:arm-neon-android=fail
 orc:arm64-android=fail
 orc:x64-android=fail
@ -880,7 +869,6 @@ rpclib:x64-uwp=fail
 rtmidi:arm-neon-android=fail
 rtmidi:arm64-android=fail
 rtmidi:x64-android=fail
-safetyhook:x64-linux=fail
 salome-medcoupling:x64-linux=fail
 saucer:arm64-osx=fail # std::move_only_function is not supported
 saucer:arm64-windows-static-md=fail # fatal error C1605: compiler limit: object file size cannot exceed 4 GB
@ -1024,9 +1012,6 @@ v8:x64-windows-static-md=fail
 v8:x64-windows-static=fail
 v8:x64-windows=fail
 v8:x86-windows=fail
-# vst3sdk CMake files work only with the GUI version of Xcode
-vst3sdk:arm64-osx=fail
-vst3sdk:x64-osx=fail
 vtk:arm64-windows-static-md=fail
 vtk:arm64-windows=fail
 vtk-dicom:arm64-windows-static-md=fail
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@ -54,7 +54,6 @@ llvm = skip
 ace[tao]:arm-neon-android=feature-fails # tao requires a host tree with tao_idl compiled for the host
 ace[tao]:arm64-android=feature-fails
 ace[tao]:x64-android=feature-fails
-ada-url:x64-linux=fail # ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11.
 allegro5:arm64-windows=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy
 apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
 armadillo:arm-neon-android=cascade
@ -89,7 +88,7 @@ clapack:x64-windows-release=skip
 clapack:x64-windows=skip
 clapack:x86-windows=skip
 clapack(android)=fail # needs target configuration data
-clockutils:arm-neon-android=fail
+clockutils:arm-neon-android=fail # gnustl_shared is no longer supported. Please switch to either c++_shared or c++_static.
 clockutils:arm64-android=fail
 clockutils:x64-android=fail
 coroutine(uwp)=fail
@ -216,6 +215,8 @@ libgit2:arm-uwp=fail
 libgit2:x64-uwp=fail
 libgo:arm-uwp=fail
 libgo:arm64-windows=fail
+libgo:x64-android=fail
+libgo:x64-osx=fail # Fails to build due to incompatible delcaration of select in macOS 14.2
 libgo:x64-uwp=fail
 libgpod:x64-linux=fail # Missing system libraries on linux to run/prepare autoconf
 libgpod:x64-osx=fail
@ -261,9 +262,10 @@ libwandio:x64-windows-static=fail
 libwandio:x64-windows=fail
 libwandio:x86-windows=fail
 libwebp[core]:x64-android=combination-fails # Compiler crash without simd
-libxt:arm64-windows=fail # clang-cl ICEd
-licensepp:arm-uwp=fail
-licensepp:x64-uwp=fail
+libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows
+libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows
+libxt:x64-windows-release=fail # Appears to have broken races
+libxt:x64-windows=fail
 linenoise-ng:arm-uwp=fail
 linenoise-ng:x64-uwp=fail
 linenoise-ng:x64-windows-static-md=fail
@ -386,6 +388,7 @@ openvino:arm64-android=skip # conflicts with kleidiai
 openvino:arm64-osx=skip # conflicts with kleidiai
 openvino:arm64-windows-static-md=fail
 openvino:arm64-windows=fail
+openvino:x64-osx=fail # OpenVINO_VERSION_MAJOR parsed from CI_BUILD_NUMBER () and from openvino/core/version.hpp (2025) are different
 openvino[npu]:x64-linux=cascade # dependency level-zero not supported
 openvpn3:x64-osx=fail
 openvr:arm-uwp=fail
@ -556,7 +559,6 @@ torch-th:arm64-windows=fail
 torch-th:x64-android=fail
 torch-th:x64-uwp=fail
 torch-th:x64-windows-static=fail
-treehopper:x64-linux=fail
 treehopper:x64-windows-static=fail
 unicorn-lib:arm-uwp=fail
 unicorn-lib:x64-uwp=fail
@ -728,6 +730,9 @@ cgal[qt]:arm64-windows = cascade
 cgal[qt]:x64-windows = cascade
 cgal[qt]:x86-windows = cascade
 cgns[hdf5,mpi](uwp) = cascade
+clblas:arm-neon-android=fail
+clblas:arm64-android=fail
+clblas:x64-android=fail
 clblas:x64-uwp = cascade
 clblast:arm64-uwp = cascade
 clblast:x64-uwp = cascade
@ -750,10 +755,11 @@ coin-or-osi:x64-uwp = cascade
 collada-dom:arm64-uwp = cascade
 collada-dom:x64-uwp = cascade
 colmap:arm64-uwp = cascade
-colmap:arm64-windows = cascade
 colmap:x64-uwp = cascade
-colmap:x64-windows = cascade
-colmap:x86-windows = cascade
+colmap[cuda-redist,tests]:x64-windows = feature-fails
+colmap[cuda-redist,tests]:x64-windows-release = feature-fails
+colmap[cuda-redist,tests]:x64-windows-static = feature-fails
+colmap[cuda,cuda-redist]:x64-linux = feature-fails
 colmap[cuda,cuda-redist](arm64 & osx) = cascade
 cppcms:arm64-uwp = cascade
 cppcms:x64-uwp = cascade
@ -1390,14 +1396,19 @@ libxxf86vm:arm64-uwp = cascade
 libxxf86vm:x64-uwp = cascade
 libzim:arm64-uwp = cascade
 libzim:x64-uwp = cascade
+llgl:arm-neon-android=fail
+llgl:arm64-android=fail
+llgl:x64-android=fail
+llgl[vulkan]:x64-linux=feature-fails
 llgl[vulkan](osx) = cascade # no vulkan sdk installed
 luajit:arm-neon-android = cascade
 luasec:x64-linux = cascade
 luv:arm64-windows = cascade
 magma(uwp | osx) = cascade
-magnum[al-info,anyaudioimporter,audio,glfwapplication,wavaudioimporter]:arm64-uwp = cascade
-magnum[al-info,anyaudioimporter,audio,glfwapplication,wavaudioimporter]:x64-uwp = cascade
 magnum[distancefieldconverter,fontconverter,gl-info,imageconverter,magnumfont,magnumfontconverter,opengltester,sceneconverter,shaders,text]:x64-uwp = cascade
+magnum[glfwapplication]:arm64-uwp = cascade
+magnum[glfwapplication]:x64-uwp = cascade
+magnum[glxcontext,windowlessglxapplication](android)=feature-fails
 magnum[vk]:x64-uwp = cascade
 magnum-extras:arm64-uwp = cascade
 magnum-extras:x64-uwp = cascade
@ -1889,7 +1900,6 @@ rtabmap(uwp) = cascade
 ryml:arm64-uwp = cascade
 ryml:arm64-windows = cascade
 ryml:x64-uwp = cascade
-safetyhook:x64-linux=fail
 salome-configuration:arm64-uwp = cascade
 salome-configuration:x64-uwp = cascade
 salome-med-fichier:arm64-uwp = cascade
@ -2109,7 +2119,7 @@ adios2[python](!uwp) = feature-fails # Could NOT find Python (missing: Python_Nu
 arrayfire[opencl](windows & !uwp) = feature-fails # build errror: See https://github.com/microsoft/vcpkg/issues/33464
 ashes[core](windows) = combination-fails # CMake Error: INSTALL(EXPORT) given unknown export "AshesRenderers". One render backend must be selected
 # boost-python[core](!linux) = combination-fails
-awlib[graphics] = feature-fails # Broken code. See https://github.com/microsoft/vcpkg/issues/39849
+awlib[graphics](osx) = feature-fails # Broken code. See https://github.com/microsoft/vcpkg/issues/39849
 cgns[core,fortran,hdf5,legacy,lfs,mpi,tests](osx | linux) = combination-fails # ["fortran","hdf5","mpi"]: Could NOT find MPI (missing: MPI_Fortran_FOUND) (found version "3.1")
 cgns[fortran](windows | android) = feature-fails # No fortran compiler installed
 coroutine(osx) = fail # requires c++20
@ -2124,7 +2134,6 @@ dcmtk(uwp) = fail # Please set the C++ runtime location (required for running ap
 dmlc[openmp](osx) = feature-fails # No openmp on osx
 dv-processing[tools](osx) = feature-fails # Broke with compiler version. See https://github.com/microsoft/vcpkg/issues/39852
 embree3[core,avx,avx2,avx512,default-features,sse2,sse42](osx) = combination-fails # CMake Error at CMakeLists.txt:447 (MESSAGE):   Using Embree as static library is not supported with AppleClang >= 9.0 when multiple ISAs are selected.  Please either build a shared library or enable only one ISA.
-faker-cxx(linux) = fail # requires gcc13 or later
 ffmpeg[all,all-gpl](x64 & android) = feature-fails
 ffmpeg[nvcodec,ffplay,opengl](android) = feature-fails
 fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833
@ -2203,7 +2212,6 @@ openmvg[core](arm & windows & !uwp) = combination-fails # nmmintrin.h(17): fatal
 openmvg[openmp](arm & windows & !uwp) = feature-fails
 openscap[python](!windows) = feature-fails # CI image lacks swig
 opentelemetry-cpp[otlp](uwp) = feature-fails # --grpc_out: protoc-gen-grpc: The system cannot find the file specified. See https://github.com/microsoft/vcpkg/issues/34847
-orange-math(linux) = fail # requires gcc15 or later
 osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains
 pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails
 pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304
--- a/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt
+++ b/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt
@ -1,32 +1,32 @@
 cmake_minimum_required(VERSION 3.12)
 project(python3-test)

-set(Python_ARTIFACTS_PREFIX "_MEOW")
+if("${CMAKE_VERSION}" VERSION_LESS "4.0")
+    # We need to opt-out of CMP0148 to be able to test the pre-CMake 3.12 Python
+    # find modules. The old policy is deprecated, so, at some point, this aspect
+    # of the test will have to go away.
+    if(POLICY CMP0148)
+        cmake_policy(SET CMP0148 OLD)
+    endif()

-# We need to opt-out of CMP0148 to be able to test the pre-CMake 3.12 Python
-# find modules. The old policy is deprecated, so, at some point, this aspect
-# of the test will have to go away.
-if(POLICY CMP0148)
-    cmake_policy(SET CMP0148 OLD)
-endif()
+    # The purpose of this test is to ensure that we get the expected values
+    # from the finders, not crosscompiling. So, let's not even go there.
+    # These find_package() calls aren't required because FindPythonInterp
+    # seems to not return a result in CI. Probably because FindPythonInterp
+    # prefers the system Python instead of the executable from the python3
+    # port.
+    if(NOT CMAKE_CROSSCOMPILING)
+        find_package(PythonInterp)
+    endif()
+    find_package(PythonLibs)

-# The purpose of this test is to ensure that we get the expected values
-# from the finders, not crosscompiling. So, let's not even go there.
-# These find_package() calls aren't required because FindPythonInterp
-# seems to not return a result in CI. Probably because FindPythonInterp
-# prefers the system Python instead of the executable from the python3
-# port.
-if(NOT CMAKE_CROSSCOMPILING)
-    find_package(PythonInterp)
-endif()
-find_package(PythonLibs)
-
-# The old find modules should NOT be prefixed.
-if(DEFINED PythonInterp_MEOW_FOUND OR DEFINED PYTHON_MEOW_EXECUTABLE)
-    message(FATAL_ERROR "FindPythonInterp prefixed the result variables")
-endif()
-if(DEFINED PythonLibs_MEOW_FOUND OR DEFINED PYTHON_MEOW_LIBRARIES)
-    message(FATAL_ERROR "FindPythonLibs prefixed the result variables")
+    # The old find modules should NOT be prefixed.
+    if(DEFINED PythonInterp_MEOW_FOUND OR DEFINED PYTHON_MEOW_EXECUTABLE)
+        message(FATAL_ERROR "FindPythonInterp prefixed the result variables")
+    endif()
+    if(DEFINED PythonLibs_MEOW_FOUND OR DEFINED PYTHON_MEOW_LIBRARIES)
+        message(FATAL_ERROR "FindPythonLibs prefixed the result variables")
+    endif()
 endif()

 function(test_result NAME TYPE EXPECTED UNEXPECTED)
@ -55,13 +55,8 @@ endif()

 # The new find modules should be prefixed if CMake is 4.0+
 find_package(Python REQUIRED COMPONENTS ${_INTERPRETER} Development)
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.0)
-    set(EXPECTED_PYTHON Python_MEOW)
-    set(UNEXPECTED_PYTHON Python)
-else()
-    set(EXPECTED_PYTHON Python)
-    set(UNEXPECTED_PYTHON Python_MEOW)
-endif()
+set(EXPECTED_PYTHON Python)
+set(UNEXPECTED_PYTHON Python_MEOW)
 test_new_finder(${EXPECTED_PYTHON} ${UNEXPECTED_PYTHON})

 # Also test non-prefixed. Use Python3:: to avoid conflicts with Python_MEOW::
--- a/Show More
+++ b/Show More