diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index e44cd032e..5afa160da 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Setup NDK
         run: |
-          sdkmanager --install "ndk;29.0.13846066"
+          sdkmanager --install "ndk;29.0.14206865"
 
       - name: Build native libraries
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef95a8907..0afd71077 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
 
           - name: MacOS
             os: macos
-            os-version: 13
+            os-version: 15-intel
             arm: false
             shell: bash
             fatal_warnings: true
@@ -144,7 +144,7 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 20
-          sudo apt-get install libc++-20* libc++abi*20* -y --no-install-recommends
+          sudo apt-get install libc++-20* libc++abi-*20* -y --no-install-recommends
           echo "CC=clang-20" >> "$GITHUB_ENV"
           echo "CXX=clang++-20" >> "$GITHUB_ENV"
           echo "OBJC=clang-20" >> "$GITHUB_ENV"
@@ -166,16 +166,6 @@ jobs:
           version: 14
           platform: x64
 
-      - name: Unbreak Python in GHA (MacOS 13 image)
-        if: matrix.config.os == 'macos' && matrix.config.os-version == 13
-        run: |
-          # TODO: remove this, after it works again
-          # A workaround for "The `brew link` step did not complete successfully" error.
-          # See e.g. https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1991817938
-          find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
-          sudo rm -rf /Library/Frameworks/Python.framework/
-          brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
-
       - name: Setup Clang (MacOS)
         if: matrix.config.os == 'macos'
         run: |
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 57e8baabc..df142280d 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -23,7 +23,7 @@ jobs:
       # Don't fail the whole workflow if one architecture fails
       fail-fast: false
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08
+      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-25.08
       options: --privileged
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/nintendo.yml b/.github/workflows/nintendo.yml
index da1f5de58..9d9540717 100644
--- a/.github/workflows/nintendo.yml
+++ b/.github/workflows/nintendo.yml
@@ -19,24 +19,24 @@ jobs:
           - name: 3ds
             extension: 3dsx
             container: devkitarm
-            revision: "20250102"
+            revision: "20250728"
 
           - name: switch
             extension: nro
             container: devkita64
-            revision: "20241023"
+            revision: "20250728"
 
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-
+      
+      # NOTE: meson has no dependencies, so --break-system-packages doesn't really break anything!
       - name: Setup Meson
         run: |
           sudo apt-get update
           sudo apt-get install python3 python3-pip -y --no-install-recommends
-          python3 -m pip install --upgrade pip
-          pip install meson
+          pip install meson --break-system-packages
 
       - name: Setup ninja
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e7a378a83..816f564eb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
           sudo ./llvm.sh 20
-          sudo apt-get install libc++-20* libc++abi*20* llvm-20 -y --no-install-recommends
+          sudo apt-get install libc++-20* libc++abi-*20* llvm-20 -y --no-install-recommends
           echo "CC=clang-20" >> "$GITHUB_ENV"
           echo "CXX=clang++-20" >> "$GITHUB_ENV"
 
diff --git a/io.github.openbrickprotocolfoundation.oopetris.yml b/io.github.openbrickprotocolfoundation.oopetris.yml
index e9644bb42..640316ad4 100644
--- a/io.github.openbrickprotocolfoundation.oopetris.yml
+++ b/io.github.openbrickprotocolfoundation.oopetris.yml
@@ -1,6 +1,6 @@
 app-id: io.github.openbrickprotocolfoundation.oopetris
 runtime: org.freedesktop.Platform
-runtime-version: '24.08'
+runtime-version: '25.08'
 sdk: org.freedesktop.Sdk
 command: oopetris
 modules:
@@ -15,6 +15,7 @@ modules:
       - --fatal-meson-warnings
       - -Drun_in_ci=true # note we always want the CI checks in the case we built the flatpak
       - --force-fallback-for=fmt # note, the freedesktop sdk has this installed, but it is not copiable into the runtime, so we need to build it ourself, to be able to install it correctly
+      - -Dsdl2_image:test=false # disable failing sdl2_image tests
     builddir: true
     build-options:
       build-args:
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index 2060ca5e9..badcca16a 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -130,7 +130,7 @@ List getAndroidABIs() {
 /**
  * Determine the version
  * if you specify it explicitly, that will be used, otherwise meson introspect will be called
- * @return String
+ * @returns String
  */
 String getVersion() {
     String property = project.findProperty('VERSION')
@@ -321,14 +321,14 @@ android {
         targetCompatibility JavaVersion.VERSION_21
     }
 
-    compileSdkVersion 35
-    ndkVersion = "29.0.13846066"
+    compileSdkVersion 36
+    ndkVersion = "29.0.14033849"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
         }
         minSdkVersion 21
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode 7
         versionName(versionString)
     }
diff --git a/platforms/android/build.gradle b/platforms/android/build.gradle
index 362a661b3..38929e03d 100644
--- a/platforms/android/build.gradle
+++ b/platforms/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.12.1'
+        classpath 'com.android.tools.build:gradle:8.12.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/platforms/android/gradle/wrapper/gradle-wrapper.properties b/platforms/android/gradle/wrapper/gradle-wrapper.properties
index bc1450fc0..97438d063 100644
--- a/platforms/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platforms/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 18 19:56:11 CEST 2025
+#Mon Oct 13 21:03:44 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
index ea629c314..e048f0814 100755
--- a/platforms/build-android.sh
+++ b/platforms/build-android.sh
@@ -11,8 +11,8 @@ if [ ! -d "toolchains" ]; then
     mkdir -p toolchains
 fi
 
-export NDK_VER_DOWNLOAD="r29-beta3"
-export NDK_VER_DESC="r29-beta3"
+export NDK_VER_DOWNLOAD="r29"
+export NDK_VER_DESC="r29"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"
diff --git a/subprojects/argparse.wrap b/subprojects/argparse.wrap
index 0b857c526..bd9e64552 100644
--- a/subprojects/argparse.wrap
+++ b/subprojects/argparse.wrap
@@ -3,11 +3,11 @@ directory = argparse-3.2
 source_url = https://github.com/p-ranav/argparse/archive/refs/tags/v3.2.tar.gz
 source_filename = argparse-3.2.tar.gz
 source_hash = 9dcb3d8ce0a41b2a48ac8baa54b51a9f1b6a2c52dd374e28cc713bab0568ec98
-patch_filename = argparse_3.2-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.2-1/get_patch
-patch_hash = ddf1abdb00927ce60371fce3b751d66f07ddc879d1e55816218b017d7d972cf2
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.2-1/argparse-3.2.tar.gz
-wrapdb_version = 3.2-1
+patch_filename = argparse_3.2-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/argparse_3.2-2/get_patch
+patch_hash = 46a7f697beacf0ecdd56d430bd0707dea0311fa3ff8e0ebfe9e6188d48e6a96b
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/argparse_3.2-2/argparse-3.2.tar.gz
+wrapdb_version = 3.2-2
 
 [provide]
 argparse = argparse_dep
diff --git a/subprojects/cpp-httplib.wrap b/subprojects/cpp-httplib.wrap
index 1bfbded97..9c75a72c1 100644
--- a/subprojects/cpp-httplib.wrap
+++ b/subprojects/cpp-httplib.wrap
@@ -1,11 +1,11 @@
 [wrap-file]
-directory = cpp-httplib-0.25.0
-source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.25.0.tar.gz
-source_filename = cpp-httplib-0.25.0.tar.gz
-source_hash = ac7c59fa72325d4cb9f73af266312d82632ac35a5c4c8a1be620c1f946ec9cea
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.25.0-1/cpp-httplib-0.25.0.tar.gz
-wrapdb_version = 0.25.0-1
-diff_files = cpp-httplib-0.25.0_mingw.diff
+directory = cpp-httplib-0.26.0
+source_url = https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.26.0.tar.gz
+source_filename = cpp-httplib-0.26.0.tar.gz
+source_hash = a66f908f50ccb119769adce44fe1eac75f81b6ffab7c4ac0211bb663ffeb2688
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cpp-httplib_0.26.0-1/cpp-httplib-0.26.0.tar.gz
+wrapdb_version = 0.26.0-1
+diff_files = cpp-httplib-0.26.0_mingw.diff
 
 [provide]
-cpp-httplib = cpp_httplib_dep
+dependency_names = cpp-httplib
diff --git a/subprojects/discord-social-sdk.wrap b/subprojects/discord-social-sdk.wrap
index 0122eb3c7..1adbc59f7 100644
--- a/subprojects/discord-social-sdk.wrap
+++ b/subprojects/discord-social-sdk.wrap
@@ -1,10 +1,10 @@
 [wrap-file]
 directory = discord_social_sdk
-source_url = https://oopetris.totto.lt/static/assets/discord/DiscordSocialSdk-1.4.9649.zip
-source_filename = DiscordSocialSdk-1.4.9649.zip
-source_hash = 55af4030abf3286ee0a8e562c30cd839a605063eb5e987aea110bfc81bc39312
+source_url = https://oopetris.totto.lt/static/assets/discord/DiscordSocialSdk-1.6.11894.zip
+source_filename = DiscordSocialSdk-1.6.11894.zip
+source_hash = 61ef7474331a1a039c65a8a07c6fbef558d4301e06aa4e2f42af9983da7698d8
 patch_directory = discord_social_sdk
-diff_files = discord_social_sdk-1.4.9649_mingw.diff
+diff_files = discord_social_sdk-1.6.11894_mingw.diff
 
 [provide]
 discord-social-sdk = discord_social_sdk_dep
diff --git a/subprojects/flac.wrap b/subprojects/flac.wrap
index 970962d4a..0a203423b 100644
--- a/subprojects/flac.wrap
+++ b/subprojects/flac.wrap
@@ -3,11 +3,11 @@ directory = flac-1.5.0
 source_url = https://github.com/xiph/flac/releases/download/1.5.0/flac-1.5.0.tar.xz
 source_filename = flac-1.5.0.tar.xz
 source_hash = f2c1c76592a82ffff8413ba3c4a1299b6c7ab06c734dee03fd88630485c2b920
-patch_filename = flac_1.5.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/flac_1.5.0-1/get_patch
-patch_hash = c3d7dcb01d6e0a2bc066b12e789661fd9c4356500787004cfc1950d52babd6ca
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/flac_1.5.0-1/flac-1.5.0.tar.xz
-wrapdb_version = 1.5.0-1
+patch_filename = flac_1.5.0-2_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/flac_1.5.0-2/get_patch
+patch_hash = ee4cd8175784b4032e3b19dda1fe4c1d6d4b285dfa87fe94361f1a6fde732ff0
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/flac_1.5.0-2/flac-1.5.0.tar.xz
+wrapdb_version = 1.5.0-2
 
 [provide]
 flac = flac_dep
diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
index 0961ce675..dad73cbf8 100644
--- a/subprojects/fmt.wrap
+++ b/subprojects/fmt.wrap
@@ -1,15 +1,14 @@
 [wrap-file]
-directory = fmt-11.2.0
-source_url = https://github.com/fmtlib/fmt/archive/11.2.0.tar.gz
-source_filename = fmt-11.2.0.tar.gz
-source_hash = bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af
-patch_filename = fmt_11.2.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.2.0-1/get_patch
-patch_hash = 645bf1c335a24608b4b34f16ed10b9237bbb0131488668fb86454202239e086c
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.2.0-1/fmt-11.2.0.tar.gz
-wrapdb_version = 11.2.0-1
-diff_files = fmt_dependency_override.diff, fmt_emscripten.diff
+directory = fmt-12.0.0
+source_url = https://github.com/fmtlib/fmt/archive/12.0.0.tar.gz
+source_filename = fmt-12.0.0.tar.gz
+source_hash = aa3e8fbb6a0066c03454434add1f1fc23299e85758ceec0d7d2d974431481e40
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_12.0.0-1/fmt-12.0.0.tar.gz
+patch_filename = fmt_12.0.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_12.0.0-1/get_patch
+patch_hash = 307f288ebf3850abf2f0c50ac1fb07de97df9538d39146d802f3c0d6cada8998
+wrapdb_version = 12.0.0-1
+diff_files = fmt_emscripten.diff, fmt_header_only_fix.diff
 
 [provide]
-fmt = fmt_dep
-fmt_header_only = fmt_header_only_dep
+dependency_names = fmt
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index acad6f487..abc81cca3 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -1,11 +1,10 @@
 [wrap-file]
-directory = freetype-2.13.3
-source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.xz
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.13.3-1/freetype-2.13.3.tar.xz
-source_filename = freetype-2.13.3.tar.xz
-source_hash = 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289
-wrapdb_version = 2.13.3-1
+directory = freetype-2.14.1
+source_url = https://download.savannah.gnu.org/releases/freetype/freetype-2.14.1.tar.xz
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/freetype2_2.14.1-1/freetype-2.14.1.tar.xz
+source_filename = freetype-2.14.1.tar.xz
+source_hash = 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc
+wrapdb_version = 2.14.1-1
 
 [provide]
-freetype2 = freetype_dep
-freetype = freetype_dep
+dependency_names = freetype2
diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap
index 3a9771450..9902a4f7e 100644
--- a/subprojects/gtest.wrap
+++ b/subprojects/gtest.wrap
@@ -3,11 +3,11 @@ directory = googletest-1.17.0
 source_url = https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
 source_filename = googletest-1.17.0.tar.gz
 source_hash = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
-patch_filename = gtest_1.17.0-3_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-3/get_patch
-patch_hash = 3e2799683f27c6dce138b7bae823416581c467ddde755c9a516c0863225f0ceb
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-3/googletest-1.17.0.tar.gz
-wrapdb_version = 1.17.0-3
+patch_filename = gtest_1.17.0-4_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.17.0-4/get_patch
+patch_hash = 3abf7662d09db706453a5b064a1e914678c74b9d9b0b19382747ca561d0d8750
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.17.0-4/googletest-1.17.0.tar.gz
+wrapdb_version = 1.17.0-4
 
 [provide]
 gtest = gtest_dep
diff --git a/subprojects/icu.wrap b/subprojects/icu.wrap
index 8f4335b84..a9989ceb4 100644
--- a/subprojects/icu.wrap
+++ b/subprojects/icu.wrap
@@ -3,14 +3,12 @@ directory = icu
 source_url = https://github.com/unicode-org/icu/releases/download/release-77-1/icu4c-77_1-src.tgz
 source_filename = icu4c-77_1-src.tgz
 source_hash = 588e431f77327c39031ffbb8843c0e3bc122c211374485fa87dc5f3faff24061
-patch_filename = icu_77.1-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/icu_77.1-2/get_patch
-patch_hash = 7a1a23408c8dae2c8c78bdb3e02adf093832cfd9c04292692bb62ffc6f45b2a6
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_77.1-2/icu4c-77_1-src.tgz
-wrapdb_version = 77.1-2
+patch_filename = icu_77.1-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/icu_77.1-3/get_patch
+patch_hash = df23a720ece4cd8c76ef50bcafe0d800c8c11117806bf207d65973a95f0dcea7
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_77.1-3/icu4c-77_1-src.tgz
+wrapdb_version = 77.1-3
 
 [provide]
-icu-uc = icuuc_dep
-icu-io = icuio_dep
-icu-i18n = icui18n_dep
+dependency_names = icu-data, icu-i18n, icu-io, icu-uc
 program_names = genbrk, genccode, gencmn
diff --git a/subprojects/packagefiles/cpp-httplib-0.25.0_mingw.diff b/subprojects/packagefiles/cpp-httplib-0.26.0_mingw.diff
similarity index 100%
rename from subprojects/packagefiles/cpp-httplib-0.25.0_mingw.diff
rename to subprojects/packagefiles/cpp-httplib-0.26.0_mingw.diff
diff --git a/subprojects/packagefiles/discord_social_sdk-1.4.9649_mingw.diff b/subprojects/packagefiles/discord_social_sdk-1.6.11894_mingw.diff
similarity index 100%
rename from subprojects/packagefiles/discord_social_sdk-1.4.9649_mingw.diff
rename to subprojects/packagefiles/discord_social_sdk-1.6.11894_mingw.diff
diff --git a/subprojects/packagefiles/discord_social_sdk/meson.build b/subprojects/packagefiles/discord_social_sdk/meson.build
index 6e35bd1a7..4e4519140 100644
--- a/subprojects/packagefiles/discord_social_sdk/meson.build
+++ b/subprojects/packagefiles/discord_social_sdk/meson.build
@@ -2,7 +2,7 @@ project(
     'discord-social-sdk',
     'cpp',
     'c',
-    version: '1.4.9649',
+    version: '1.6.11894',
     meson_version: '>=1.4.0',
     default_options: {
         'cpp_std': ['c++17'],
@@ -68,6 +68,8 @@ if not meson.is_cross_build()
     elif host_machine.system() == 'windows'
         if host_machine.cpu_family() == 'x86_64'
             lib_base_dir = get_option('default_library') == 'static' ? 'bin' : 'lib'
+        elif host_machine.cpu_family() == 'aarch64'
+            lib_base_dir = (get_option('default_library') == 'static' ? 'bin' : 'lib') / 'arm64'
         else
             error('unsupported architecture for windows: '
                 + host_machine.cpu_family())
diff --git a/subprojects/packagefiles/expected-1.1.0_installable.diff b/subprojects/packagefiles/expected-1.3.0_installable.diff
similarity index 100%
rename from subprojects/packagefiles/expected-1.1.0_installable.diff
rename to subprojects/packagefiles/expected-1.3.0_installable.diff
diff --git a/subprojects/packagefiles/fmt_dependency_override.diff b/subprojects/packagefiles/fmt_dependency_override.diff
deleted file mode 100644
index 43a049a4c..000000000
--- a/subprojects/packagefiles/fmt_dependency_override.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 0c841f7..0c698c6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -27,10 +27,6 @@ fmt_dep = declare_dependency(
-   link_with: fmt_lib,
- )
- 
--if meson.version().version_compare('>=0.54.0')
--  meson.override_dependency('fmt', fmt_dep)
--endif
--
- fmt_header_only_dep = declare_dependency(
-   include_directories: 'include',
-   compile_args: '-DFMT_HEADER_ONLY',
diff --git a/subprojects/packagefiles/fmt_header_only_fix.diff b/subprojects/packagefiles/fmt_header_only_fix.diff
new file mode 100644
index 000000000..7b8f6eeff
--- /dev/null
+++ b/subprojects/packagefiles/fmt_header_only_fix.diff
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index 9a012e8..4608302 100644
+--- a/meson.build
++++ b/meson.build
+@@ -20,6 +20,9 @@ if header_only
+     include_directories: 'include',
+     compile_args: '-DFMT_HEADER_ONLY',
+   )
++  if meson.version().version_compare('>=0.54.0')
++    meson.override_dependency('fmt', fmt_header_only_dep)
++  endif
+ else
+   fmt_lib = library(
+     'fmt',
diff --git a/subprojects/spdlog.wrap b/subprojects/spdlog.wrap
index 43ddfb02d..9f64dcfa0 100644
--- a/subprojects/spdlog.wrap
+++ b/subprojects/spdlog.wrap
@@ -3,12 +3,13 @@ directory = spdlog-1.15.3
 source_url = https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz
 source_filename = spdlog-1.15.3.tar.gz
 source_hash = 15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67
-patch_filename = spdlog_1.15.3-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.15.3-2/get_patch
-patch_hash = 2f5667992a7482c0bfbc012c1bcb8c93d1fb22274b4a235be40f8fc9284e920e
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.15.3-2/spdlog-1.15.3.tar.gz
-wrapdb_version = 1.15.3-2
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/spdlog_1.15.3-5/spdlog-1.15.3.tar.gz
+patch_filename = spdlog_1.15.3-5_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/spdlog_1.15.3-5/get_patch
+patch_hash = 5e0eaf0002ff589cd8dac58e1b38c297422e7a0404d7d47ff0d2e285ed18169c
+wrapdb_version = 1.15.3-5
+
 diff_files = spdlog_1.15.3_fmt_11.2.0_compatibility.diff,spdlog_1.15.3_no_tls_option.diff
 
 [provide]
-spdlog = spdlog_dep
+dependency_names = spdlog
diff --git a/subprojects/tl-expected.wrap b/subprojects/tl-expected.wrap
index ee1dd8a50..008135a5f 100644
--- a/subprojects/tl-expected.wrap
+++ b/subprojects/tl-expected.wrap
@@ -1,15 +1,14 @@
 [wrap-file]
-directory = expected-1.1.0
-source_url = https://github.com/TartanLlama/expected/archive/v1.1.0.tar.gz
-source_filename = expected-1.1.0.tar.gz
-source_hash = 1db357f46dd2b24447156aaf970c4c40a793ef12a8a9c2ad9e096d9801368df6
-patch_filename = tl-expected_1.1.0-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/tl-expected_1.1.0-1/get_patch
-patch_hash = 8b1aa60a1ddd604494628f0c6b0ed569b9e1e2dc17dfdc09d5de5563ae8adfe3
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/tl-expected_1.1.0-1/expected-1.1.0.tar.gz
-wrapdb_version = 1.1.0-1
-
-diff_files = expected-1.1.0_installable.diff
+directory = expected-1.3.1
+source_url = https://github.com/TartanLlama/expected/archive/v1.3.1.tar.gz
+source_filename = expected-1.3.1.tar.gz
+source_hash = 9a04f4f472fbb5c30bf60402f1ca626c4a76987f867978d0b8a35d7ab3fb8fe7
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/tl-expected_1.3.1-1/expected-1.3.1.tar.gz
+patch_filename = tl-expected_1.3.1-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/tl-expected_1.3.1-1/get_patch
+patch_hash = 91cfeae04ba6ea05792e68a37781236a7045b9e2e4e0c8b7093fd8c3e43b0bad
+wrapdb_version = 1.3.1-1
+diff_files = expected-1.3.0_installable.diff
 
 [provide]
-tl-expected = tl_expected_dep
+dependency_names = tl-expected
diff --git a/subprojects/utfcpp.wrap b/subprojects/utfcpp.wrap
index 7d6b2c7df..3ecb8f765 100644
--- a/subprojects/utfcpp.wrap
+++ b/subprojects/utfcpp.wrap
@@ -1,13 +1,13 @@
 [wrap-file]
-directory = utfcpp-4.0.6
-source_url = https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.6.tar.gz
-source_filename = utfcpp-4.0.6.tar.gz
-source_hash = 6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
-patch_filename = utfcpp_4.0.6-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/utfcpp_4.0.6-1/get_patch
-patch_hash = 49fac3078123b02019498cb58cd6d27df789ea831400b328360cca6533c3b6af
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/utfcpp_4.0.6-1/utfcpp-4.0.6.tar.gz
-wrapdb_version = 4.0.6-1
+directory = utfcpp-4.0.8
+source_url = https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.8.tar.gz
+source_filename = utfcpp-4.0.8.tar.gz
+source_hash = f808b26d8c3a59def27fea207182ece77a8930bd121a69f80d328ecf3cfef925
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/utfcpp_4.0.8-1/utfcpp-4.0.8.tar.gz
+patch_filename = utfcpp_4.0.8-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/utfcpp_4.0.8-1/get_patch
+patch_hash = 83888527bbd2ee13f49f3d791ecdc698b95c614da3e23c44b87c185bd5c19989
+wrapdb_version = 4.0.8-1
 
 [provide]
-utf8cpp = utfcpp_dep
+dependency_names = utf8cpp
diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
index 63031fa10..781fe872a 100644
--- a/tools/dependencies/meson.build
+++ b/tools/dependencies/meson.build
@@ -139,19 +139,21 @@ endif
 fmt_use_header_only = false
 
 if (meson.is_cross_build()
-and (host_machine.system() == 'switch'
-or host_machine.system() == '3ds')
+    and (host_machine.system() == 'switch'
+        or host_machine.system() == '3ds')
 )
     fmt_use_header_only = true
 endif
 
 if fmt_use_header_only
     fmt_header_only_dep = dependency(
-        'fmt_header_only',
+        'fmt',
         required: true,
         allow_fallback: true,
+        default_options: {
+            'header-only': true,
+        },
     )
-    meson.override_dependency('fmt', fmt_header_only_dep)
     fmt_dep = fmt_header_only_dep
 else
     fmt_dep = dependency(
@@ -436,8 +438,8 @@ if build_application
     endif
 
     if (host_machine.system() == 'linux'
-or (meson.is_cross_build()
-and host_machine.system() == 'android')
+    or (meson.is_cross_build()
+        and host_machine.system() == 'android')
 )
         keyutils_dep = dependency(
             'keyutils',
@@ -529,7 +531,7 @@ and host_machine.system() == 'android')
 
 
     if (host_machine.system() == 'linux'
-and host_machine.cpu_family() == 'aarch64'
+    and host_machine.cpu_family() == 'aarch64'
 )
         # not supported on aarch64 linux :(
         discord_dep_required = false
diff --git a/tools/options/meson.build b/tools/options/meson.build
index 9fa2bbeb5..eaf38f8ba 100644
--- a/tools/options/meson.build
+++ b/tools/options/meson.build
@@ -61,6 +61,11 @@ if get_option('run_in_ci')
         'checks': ['>=15', '<16'],
     }
 
+    gcc_14_or_15_compiler = {
+        'id': 'gcc',
+        'checks': ['>=14', '<16'],
+    }
+
     msvc_compiler_current = {
         'id': 'msvc',
         'checks': ['>=19.43', '<20'],
@@ -76,10 +81,10 @@ if get_option('run_in_ci')
             'compilers': [clang_21_compiler],
         },
         'cross_3ds': {
-            'compilers': [gcc_14_compiler],
+            'compilers': [gcc_15_compiler],
         },
         'cross_switch': {
-            'compilers': [gcc_14_compiler],
+            'compilers': [gcc_15_compiler],
         },
         'cross_emscripten': {
             'compilers': [emscripten_compiler_current],
@@ -91,7 +96,7 @@ if get_option('run_in_ci')
             'compilers': [gcc_15_compiler],
         },
         'linux': {
-            'compilers': [clang_20_compiler, gcc_14_compiler],
+            'compilers': [clang_20_compiler, gcc_14_or_15_compiler],
         },
         'darwin': {
             'compilers': [clang_20_compiler],