diff --git a/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch b/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
new file mode 100644
index 0000000000..eda9c1d9e4
--- /dev/null
+++ b/dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
@@ -0,0 +1,45 @@
+From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
+From: "J. Berger" <mail@janaberger.de>
+Date: Sat, 1 Nov 2025 17:38:30 +0100
+Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
+ conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
+
+This is a follow-up for PR #4572.
+---
+ include/fmt/format.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/fmt/format.h b/include/fmt/format.h
+index 4a653007..65e19d2d 100644
+--- a/include/fmt/format.h
++++ b/include/fmt/format.h
+@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
+     auto grouping = Grouping(loc, specs.localized());
+     size += grouping.count_separators(exp);
+     return write_padded<Char, align::right>(
+-        out, specs, to_unsigned(size), [&](iterator it) {
++        out, specs, static_cast<size_t>(size), [&](iterator it) {
+           if (s != sign::none) *it++ = detail::getsign<Char>(s);
+           it = write_significand(it, f.significand, significand_size, exp,
+                                  decimal_point, grouping);
+@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
+   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
+   size += 1 + (pointy ? 1 : 0) + num_zeros;
+   return write_padded<Char, align::right>(
+-      out, specs, to_unsigned(size), [&](iterator it) {
++      out, specs, static_cast<size_t>(size), [&](iterator it) {
+         if (s != sign::none) *it++ = detail::getsign<Char>(s);
+         *it++ = Char('0');
+         if (!pointy) return it;
+@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
+     *it++ = Char(exp_char);
+     return write_exponent<Char>(exp, it);
+   };
+-  auto usize = to_unsigned(size);
++  size_t usize = static_cast<size_t>(size);
+   return specs.width > 0
+              ? write_padded<Char, align::right>(out, specs, usize, write)
+              : base_iterator(out, write(reserve(out, usize)));
+-- 
+2.52.0.vfs.0.5
+
diff --git a/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch b/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
deleted file mode 100644
index 6bec3b8e4b..0000000000
--- a/dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88c12148..967b53dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
-   join(netfxpath
-        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
-        ".NETFramework\\v4.0")
--  file(WRITE run-msbuild.bat "
-+  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
-     ${MSBUILD_SETUP}
-     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
- endif ()
diff --git a/dep/vcpkg-overlay-ports/fmt/portfile.cmake b/dep/vcpkg-overlay-ports/fmt/portfile.cmake
index 42d554a3d5..dedda6d264 100644
--- a/dep/vcpkg-overlay-ports/fmt/portfile.cmake
+++ b/dep/vcpkg-overlay-ports/fmt/portfile.cmake
@@ -2,10 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
     REF "${VERSION}"
-    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
+    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
     HEAD_REF master
     PATCHES
-        fix-write-batch.patch
+        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,13 +22,6 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
-        "defined(FMT_SHARED)"
-        "1"
-    )
-endif()
-
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
diff --git a/dep/vcpkg-overlay-ports/fmt/vcpkg.json b/dep/vcpkg-overlay-ports/fmt/vcpkg.json
index d55fff5aa0..f928cd31a4 100644
--- a/dep/vcpkg-overlay-ports/fmt/vcpkg.json
+++ b/dep/vcpkg-overlay-ports/fmt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fmt",
-  "version": "11.1.4",
+  "version": "12.1.0",
   "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",
diff --git a/vcpkg.json b/vcpkg.json
index 51278244ac..72e362ff65 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -17,7 +17,7 @@
   "overrides": [
     {
       "name": "fmt",
-      "version": "11.1.4"
+      "version": "12.1.0"
     },
     {
       "name": "ms-gsl",
@@ -29,14 +29,14 @@
     },
     {
       "name": "cli11",
-      "version": "2.4.2"
+      "version": "2.6.1"
     },
     {
       "name": "cmark",
-      "version": "0.30.3"
+      "version": "0.31.1"
     }
   ],
-  "builtin-baseline": "fe1cde61e971d53c9687cf9a46308f8f55da19fa",
+  "builtin-baseline": "15e5f3820f0370f1ba7150853762cec0688cd396",
   "vcpkg-configuration": {
     "overlay-triplets": [
       "./dep/vcpkg-overlay-triplets"