Upgrade vcpkg submodule and handle fallout.

CMakeLists.txt

@@ -95,7 +95,7 @@ find_package(OpenSSL REQUIRED)
 find_package(Opus)
 find_package(PhysX REQUIRED)
 find_package(PNG REQUIRED)
-find_package(Python3 3.8 REQUIRED Interpreter Development)
+find_package(Python3 3.8 REQUIRED COMPONENTS Interpreter Development)
 find_package(Speex)
 find_package(string_theory 2.0 REQUIRED)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)

Scripts/Ports/python3-cairosvg/portfile.cmake

@@ -11,7 +11,7 @@ set(INSTALLED_PYTHON_PREFIX "${CURRENT_INSTALLED_DIR}/tools/python3")
 # We are running in script mode, so no toolchains are available. Sad.
 find_program(
     PYTHON_EXECUTABLE
-    NAMES python python3 python3.9
+    NAMES python python3 python3.10
     PATHS "${INSTALLED_PYTHON_PREFIX}"
     NO_DEFAULT_PATH
 )
@@ -28,7 +28,7 @@ vcpkg_execute_in_download_mode(
     OUTPUT_VARIABLE INSTALLED_PYTHON_PREFIX
 )
 vcpkg_execute_in_download_mode(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import sys,distutils.sysconfig;sys.stdout.write(distutils.sysconfig.get_python_lib(plat_specific=False,standard_lib=False))"
+    COMMAND "${PYTHON_EXECUTABLE}" -c [[import sys,sysconfig;sys.stdout.write(sysconfig.get_path("purelib"))]]
     WORKING_DIRECTORY "${INSTALLED_PYTHON_PREFIX}"
     OUTPUT_VARIABLE INSTALLED_SITE_PACKAGES_DIR
 )

Scripts/Ports/python3-cairosvg/vcpkg.json

@@ -6,7 +6,8 @@
   "dependencies": [
     {
       "name": "cairo",
-      "platform": "windows"
+      "platform": "windows",
+      "default-features": false
     },
     "python3"
   ]

Scripts/Triplets/x64-windows-plasma.cmake

@@ -16,3 +16,8 @@ if(PORT IN_LIST _PLASMA_DYNAMIC_LIBRARIES)
 else()
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+
+# This is a terrible hack because meson seems to suck.
+if(PORT STREQUAL cairo)
+    set(VCPKG_BUILD_TYPE release)
+endif()

Scripts/Triplets/x86-windows-plasma.cmake

@@ -16,3 +16,8 @@ if(PORT IN_LIST _PLASMA_DYNAMIC_LIBRARIES)
 else()
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
+
+# This is a terrible hack because meson seems to suck.
+if(PORT STREQUAL cairo)
+    set(VCPKG_BUILD_TYPE release)
+endif()

cmake/Findlibwebm.cmake

@@ -5,6 +5,24 @@ find_path(libwebm_INCLUDE_DIR NAMES libwebm/mkvparser.hpp)
 find_library(libwebm_LIBRARY_RELEASE NAMES webm libwebm)
 find_library(libwebm_LIBRARY_DEBUG NAMES webmd libwebmd)
 
+# Cope with vcpkg no longer renaming the debug library. This is needed due to MSVC's STL iterators
+# not being ABI compatible from debug to release mode.
+if(libwebm_LIBRARY_RELEASE AND NOT libwebm_LIBRARY_DEBUG)
+    foreach(prefix_path IN LISTS CMAKE_PREFIX_PATH)
+        if(prefix_path MATCHES "[Dd][Ee][Bb][Uu][Gg]\/?$")
+            list(APPEND _debug_paths "${prefix_path}")
+        endif()
+        if(_debug_paths)
+            find_library(libwebm_LIBRARY_DEBUG
+                NAMES webm libwebm webmd libwembd
+                PATHS ${_debug_paths}
+                PATH_SUFFIXES lib
+                NO_CMAKE_PATH
+            )
+        endif()
+    endforeach()
+endif()
+
 select_library_configurations(libwebm)
 find_package_handle_standard_args(libwebm REQUIRED_VARS libwebm_INCLUDE_DIR libwebm_LIBRARY)
 

cmake/VcpkgToolchain.cmake

@@ -93,6 +93,13 @@ if(_HOST_IS_WINDOWS AND NOT DEFINED VCPKG_TARGET_TRIPLET)
     endif()
 endif()
 
+# Default to using the same triplet for the host and target to prevent unnesecary
+# dependencies on cross-compilers when we're just building a Win32 static engine
+# on a Win64 machine.
+if(_HOST_IS_WINDOWS AND NOT DEFINED VCPKG_HOST_TRIPLET)
+    set(VCPKG_HOST_TRIPLET ${VCPKG_TARGET_TRIPLET} CACHE STRING "")
+endif()
+
 # Workaround: The cairocffi Python module does not ship with libcairo-2.dll as expected. So,
 # we're going to opt-into a special manifest feature to install the vcpkg cairo.dll into
 # the python3 port. BUT only if PLASMA_BUILD_RESOURCE_DAT has not been explicitly turned OFF