CI: Allow manual flathub dispatch on a non-default ref

2026-01-31 01:15:24 +01:00 · 2025-06-30 08:58:42 -04:00
1820 changed files with 307854 additions and 490206 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -86,5 +86,5 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        4
-UseTab:          AlignWithSpaces
+UseTab:          ForContinuationAndIndentation
 ...
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
 # These are supported funding model platforms

 github: [PCSX2]
-liberapay: PCSX2
--- a/.github/ISSUE_TEMPLATE/app_bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/app_bug_report.yaml
@@ -59,7 +59,7 @@ body:
    attributes:
      label: PCSX2 Revision
      description: "Please ensure you are on the latest version before making an issue"
-      placeholder: "Example: v2.5.374"
+      placeholder: "Example: v1.7.1337"
    validations:
      required: true
  - type: dropdown
--- a/.github/ISSUE_TEMPLATE/emu_bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/emu_bug_report.yaml
@@ -76,7 +76,7 @@ body:
    attributes:
      label: PCSX2 Revision
      description: "We only accept bug reports for the latest dev version. Please try upgrading before making an issue."
-      placeholder: "Example: v2.5.374"
+      placeholder: "Example: v1.7.1337"
    validations:
      required: true
  - type: dropdown
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -22,10 +22,6 @@
      - '3rdparty/**/*'
      - '**/3rdpartyDeps.props'
      - '.gitmodules'
-'requires-win-deps-build':
-  - changed-files:
-    - any-glob-to-any-file:
-      - '.github/workflows/scripts/windows/*'
 'Documentation':
  - changed-files:
    - any-glob-to-any-file:
@@ -40,13 +36,6 @@
      - 'pcsx2-qt/**/*'
      - '3rdparty/Qt/*'
      - '3rdparty/Qt/**/*'
-'OSD / ImGui':
-  - changed-files:
-    - any-glob-to-any-file:
-      - 'pcsx2/ImGui/*'
-      - 'pcsx2/ImGui/**/*'
-      - '3rdparty/imgui/*'
-      - '3rdparty/imgui/**/*'
 'GameDB':
  - changed-files:
    - any-glob-to-any-file:
--- a/.github/workflows/cron_publish_flatpak.yml
+++ b/.github/workflows/cron_publish_flatpak.yml
@@ -6,15 +6,15 @@ on:
  workflow_dispatch: # As well as manually.
    inputs:
      stableBuild:
-        description: 'Build stable version'
-        required: false
+        description: Build and or publish to flathub stable or beta?
+        required: true
        type: boolean
        default: false
-      publish:
-        description: 'Publish to Flathub'
-        required: false
-        type: boolean
-        default: true
+      ref:
+        description: The git ref to build and or publish.
+        required: true
+        type: string 
+        default: master

 jobs:

@@ -63,8 +63,9 @@ jobs:
      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
      compiler: clang
      cmakeflags: ""
-      publish: ${{ inputs.publish || true }}
+      publish: true
      fetchTags: true
-      stableBuild: ${{ inputs.stableBuild || false }}
+      stableBuild: ${{ inputs.stableBuild || 'false' }}
+      ref: ${{ inputs.ref|| 'master' }}
    secrets: inherit

--- a/.github/workflows/cron_update_base_translation.yml
+++ b/.github/workflows/cron_update_base_translation.yml
@@ -11,13 +11,13 @@ jobs:
    name: "Update Base Translation"
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Update Base Translation
        run: ./.github/workflows/scripts/common/update_base_translation.sh
      
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
+        uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
        with:
          title: "Qt: Update Base Translation"
          commit-message: "[ci skip] Qt: Update Base Translation."
--- a/.github/workflows/cron_update_controller_db.yml
+++ b/.github/workflows/cron_update_controller_db.yml
@@ -9,7 +9,7 @@ jobs:
    if: github.repository == 'PCSX2/pcsx2'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Get Latest DB and Prepare DB File
        run: |
@@ -19,7 +19,7 @@ jobs:
          mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
+        uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79
        with:
          title: "PAD: Update to latest controller database"
          commit-message: "[ci skip] PAD: Update to latest controller database."
--- a/.github/workflows/lint_gamedb.yml
+++ b/.github/workflows/lint_gamedb.yml
@@ -18,12 +18,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Install Packages
        run: |
          npm install -g ajv-cli prettier
-          pip install yamllint
+          sudo apt-get -y install yamllint

      - name: Validate YAML
        run: |
--- a/.github/workflows/linux_build_flatpak.yml
+++ b/.github/workflows/linux_build_flatpak.yml
@@ -39,25 +39,30 @@ on:
        required: false
        type: boolean
        default: false
+      ref:
+        required: false
+        type: string
+        default: master

 jobs:
  build_linux:
    name: ${{ inputs.jobName }}
    runs-on: ${{ inputs.os }}
    container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.7
      options: --privileged
    timeout-minutes: 60

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
          # 10 here, since the odds of having 10 untagged commits in a row should be slim to none
          # This is required for the tagging logic in generate-metainfo.sh
          fetch-depth: 10
          fetch-tags: true
+          ref: ${{ inputs.ref }}

      # Work around container ownership issue
      - name: Set Safe Directory
@@ -93,7 +98,7 @@ jobs:

      - name: Build Flatpak (beta)
        if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
-        uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -109,7 +114,7 @@ jobs:

      - name: Build Flatpak (stable)
        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
-        uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -129,7 +134,7 @@ jobs:

      - name: Push to Flathub (beta)
        if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: beta
@@ -138,7 +143,7 @@ jobs:

      - name: Push to Flathub (stable)
        if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
-        uses: flatpak/flatpak-github-actions/flat-manager@92ae9851ad316786193b1fd3f40c4b51eb5cb101
+        uses: flatpak/flatpak-github-actions/flat-manager@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: stable
@@ -153,7 +158,7 @@ jobs:
          mv "./${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak" "$GITHUB_WORKSPACE"/ci-artifacts/

      - name: Upload artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
--- a/.github/workflows/linux_build_qt.yml
+++ b/.github/workflows/linux_build_qt.yml
@@ -55,11 +55,11 @@ jobs:
      CCACHE_DIR: ${{ github.workspace }}/.ccache
      CCACHE_COMPRESS: true
      CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
           fetch-depth: 0

@@ -92,7 +92,7 @@ jobs:
        run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT

      - name: ccache cache files
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: .ccache
          key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -104,24 +104,24 @@ jobs:
          sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
          sudo tools/retry.sh apt-get update
          sudo tools/retry.sh apt-get -y install \
-            build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev \
+            build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \
            libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev \
-            libharfbuzz-dev libinput-dev libopengl-dev libopus-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libudev-dev libva-dev libvpl2 libvpl-dev \
-            libwayland-dev libx11-dev libx11-xcb-dev libx264-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \
+            libharfbuzz-dev libinput-dev libopengl-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libswresample-dev libswscale-dev libudev-dev \
+            libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \
            libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \
            libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev \
-            lld-17 llvm-17 nasm ninja-build patchelf pkg-config zlib1g-dev
+            lld-17 llvm-17 ninja-build patchelf pkg-config zlib1g-dev

      - name: Cache Dependencies
        id: cache-deps
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ~/deps
          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh', '.github/workflows/scripts/common/*.patch') }}

      - name: Build Dependencies
        if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: BUILD_FFMPEG=1 .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps"
+        run: .github/workflows/scripts/linux/build-dependencies-qt.sh "$HOME/deps"

      - name: Download patches
        run: |
@@ -174,7 +174,7 @@ jobs:

      - name: Upload artifact
        if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
--- a/.github/workflows/macos_build.yml
+++ b/.github/workflows/macos_build.yml
@@ -12,7 +12,7 @@ on:
      os:
        required: false
        type: string
-        default: macos-26
+        default: macos-14
      patchesUrl:
        required: false
        type: string
@@ -42,13 +42,13 @@ jobs:
      CCACHE_DIR: ${{ github.workspace }}/.ccache
      CCACHE_COMPRESS: true
      CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M
      # Only way to use a secret in an if statement
      SIGN_KEY: ${{ secrets.APPLE_SIGN_P12_B64 }}

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # actions/checkout elides tags, fetch them primarily for releases
      - name: Fetch Tags
@@ -62,11 +62,8 @@ jobs:
          echo "#define DEFAULT_UPDATER_CHANNEL \"stable\"" > ./pcsx2-qt/DefaultUpdaterChannel.h
          cat ./pcsx2-qt/DefaultUpdaterChannel.h

-      - name: Use Xcode 26.0.1
-        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app
-
-      - name: Install Metal Toolchain
-        run: xcodebuild -downloadComponent MetalToolchain
+      - name: Use Xcode 15.2
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app

      - name: Prepare Artifact Metadata
        id: artifact-metadata
@@ -91,10 +88,10 @@ jobs:

      - name: Cache Dependencies
        id: cache-deps
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: ~/deps
-          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/*', '.github/workflows/scripts/common/*.patch') }}
+          key: ${{ inputs.os }} deps ${{ hashFiles('.github/workflows/scripts/macos/build-dependencies.sh', '.github/workflows/scripts/common/*.patch') }}

      - name: Build Dependencies
        if: steps.cache-deps.outputs.cache-hit != 'true'
@@ -112,7 +109,7 @@ jobs:
        run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT

      - name: Cache ccache cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: .ccache
          key: ${{ inputs.os }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
@@ -197,7 +194,7 @@ jobs:
          cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz

      - name: Upload Artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: "*.tar.xz"
--- a/.github/workflows/release_cut_new.yml
+++ b/.github/workflows/release_cut_new.yml
@@ -12,7 +12,7 @@ on:
      - master
  workflow_dispatch:
    inputs:
-      is_prerelease:
+      is_prelease:
        description: 'Should be a pre-release?'
        required: true
        default: 'true'
@@ -35,7 +35,7 @@ jobs:
    outputs:
      new_tag: ${{ steps.tag_version.outputs.new_tag }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      # Docs - https://github.com/mathieudutour/github-tag-action
      - name: Bump Version and Push Tag
@@ -68,16 +68,16 @@ jobs:
          mv ./release-notes.md ${GITHUB_WORKSPACE}/release-notes.md

      - name: Create a GitHub Release (Manual)
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
        if: steps.tag_version.outputs.new_tag && github.event_name == 'workflow_dispatch'
        with:
          body_path: ./release-notes.md
          draft: true
-          prerelease: ${{ github.event_name != 'workflow_dispatch' || inputs.is_prerelease == 'true' }}
+          prerelease: ${{ github.event_name != 'workflow_dispatch' || inputs.is_prelease == 'true' }}
          tag_name: ${{ steps.tag_version.outputs.new_tag }}

      - name: Create a GitHub Release (Push)
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b
+        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
        if: steps.tag_version.outputs.new_tag && github.event_name != 'workflow_dispatch'
        with:
          body_path: ./release-notes.md
@@ -100,7 +100,7 @@ jobs:
      cmakeflags: ""
      buildAppImage: true
      fetchTags: true
-      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prerelease == 'false' }}
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
    secrets: inherit

  build_linux_flatpak:
@@ -114,9 +114,11 @@ jobs:
      artifactPrefixName: "PCSX2-linux-Qt-x64-flatpak"
      compiler: clang
      cmakeflags: ""
-      publish: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prerelease == 'false' }} # prerelease builds are published by the cron job
+      # Publish if we are creating a stable release
+      # The flathub cron job only picks up dev builds
+      publish: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
      fetchTags: true
-      stableBuild: ${{ inputs.is_prerelease == 'false' }}
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
    secrets: inherit

  # Windows
@@ -133,7 +135,7 @@ jobs:
      buildSystem: cmake
      cmakeFlags: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl
      fetchTags: true
-      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prerelease == 'false' }}
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
    secrets: inherit

  # MacOS
@@ -147,7 +149,7 @@ jobs:
      jobName: "MacOS Build"
      artifactPrefixName: "PCSX2-macos-Qt"
      fetchTags: true
-      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prerelease == 'false' }}
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
      sign_and_notarize: true
    secrets: inherit

@@ -163,12 +165,12 @@ jobs:
    name: "Upload Artifacts"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: Prepare Artifact Folder
        run: mkdir ./ci-artifacts/

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v4
        name: Download all Artifacts
        with:
          path: ./ci-artifacts/
@@ -203,7 +205,7 @@ jobs:
          echo "TAG_VAL=${TAG_VAL}"
          gh release edit ${TAG_VAL} --draft=false --repo PCSX2/pcsx2

-      - uses: actions/setup-node@v6
+      - uses: actions/setup-node@v4
        with:
          node-version: 22

--- a/.github/workflows/scripts/common/kddockwidgets-dodgy-include.patch
+++ b/.github/workflows/scripts/common/kddockwidgets-dodgy-include.patch
@@ -0,0 +1,13 @@
+diff --git a/src/core/indicators/ClassicDropIndicatorOverlay.h b/src/core/indicators/ClassicDropIndicatorOverlay.h
+index 2dfb9718a..9b01f002e 100644
+--- a/src/core/indicators/ClassicDropIndicatorOverlay.h
+++ b/src/core/indicators/ClassicDropIndicatorOverlay.h
+@@ -11,7 +11,7 @@
+ 
+ #pragma once
+ 
+-#include "core/DropIndicatorOverlay.h"
+#include <kddockwidgets/core/DropIndicatorOverlay.h>
+ 
+ namespace KDDockWidgets {
+ 
--- a/.github/workflows/scripts/common/qtapng-cmake.patch
+++ b/.github/workflows/scripts/common/qtapng-cmake.patch
@@ -1,60 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bace076..bfb1c66 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,10 @@ endif ()
- 
- find_package(Qt${APNG_QT_VERSION} REQUIRED COMPONENTS Core Gui)
- 
-+set(CMAKE_FIND_FRAMEWORK NEVER)
-+find_package(PNG 1.6.40 REQUIRED)
-+find_package(ZLIB REQUIRED)
-+
- add_subdirectory(src)
- 
- if(APNG_TESTS)
-diff --git a/cmake/FindZLib.cmake b/cmake/FindZLib.cmake
-deleted file mode 100644
-index f8e9220..0000000
--- a/cmake/FindZLib.cmake
-+++ /dev/null
-@@ -1 +0,0 @@
-add_library(ZLIB::ZLIB ALIAS zlibstatic) # use our zlib
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 697df95..0e89371 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,2 +1 @@
-add_subdirectory(3rdparty EXCLUDE_FROM_ALL)
- add_subdirectory(plugins)
-diff --git a/src/plugins/imageformats/apng/CMakeLists.txt b/src/plugins/imageformats/apng/CMakeLists.txt
-index e1b3fd9..72164fb 100644
--- a/src/plugins/imageformats/apng/CMakeLists.txt
-+++ b/src/plugins/imageformats/apng/CMakeLists.txt
-@@ -14,13 +14,10 @@ target_sources(ApngImagePlugin PRIVATE ${APNG_SOURCES})
- target_link_libraries(ApngImagePlugin PRIVATE 
-   Qt${APNG_QT_VERSION}::Core
-   Qt${APNG_QT_VERSION}::Gui
-  png_static
-  zlibstatic
-+  PNG::PNG
-+  ZLIB::ZLIB
- )
- 
-get_target_property(_png_include png_static INCLUDE_DIRECTORIES)
-target_include_directories(ApngImagePlugin PRIVATE ${_png_include})
-
- target_compile_definitions(ApngImagePlugin PRIVATE
-   QT_DEPRECATED_WARNINGS
-   QT_ASCII_CAST_WARNINGS
-@@ -31,3 +28,10 @@ set_target_properties(ApngImagePlugin PROPERTIES
-   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins/imageformats"
-   LIBRARY_OUTPUT_NAME qapng
- )
-+
-+install(TARGETS ApngImagePlugin DESTINATION "plugins/imageformats")
-+
-+if(WIN32 AND MSVC)
-+  set_target_properties(ApngImagePlugin PROPERTIES DEBUG_POSTFIX d)
-+  install(FILES $<TARGET_PDB_FILE:ApngImagePlugin> DESTINATION "plugins/imageformats" OPTIONAL)
-+endif()
--- a/.github/workflows/scripts/common/update_base_translation.sh
+++ b/.github/workflows/scripts/common/update_base_translation.sh
@@ -9,5 +9,6 @@ set -e
 "$SCRIPTDIR/../../../../tools/retry.sh" sudo apt-get -y install qt6-l10n-tools python3

 "$SCRIPTDIR/../../../../tools/generate_fullscreen_ui_translation_strings.py"
+"$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_glyph_ranges.py"
 "$SCRIPTDIR/../../../../tools/generate_update_fa_glyph_ranges.py"
 PATH=/usr/lib/qt6/bin:$PATH "$SCRIPTDIR/../../../../pcsx2-qt/Translations/update_base_translation.sh"
--- a/.github/workflows/scripts/linux/appimage-qt.sh
+++ b/.github/workflows/scripts/linux/appimage-qt.sh
@@ -43,8 +43,22 @@ STRIP=strip

 declare -a MANUAL_LIBS=(
 	"libshaderc_shared.so.1"
-	"libharfbuzz.so.0"
-	"libfreetype.so.6"
+)
+
+declare -a MANUAL_QT_LIBS=(
+	"libQt6WaylandEglClientHwIntegration.so.6"
+)
+
+declare -a MANUAL_QT_PLUGINS=(
+	"wayland-decoration-client"
+	"wayland-graphics-integration-client"
+	"wayland-shell-integration"
+)
+
+declare -a REMOVE_LIBS=(
+	'libwayland-client.so*'
+	'libwayland-cursor.so*'
+	'libwayland-egl.so*'
 )

 set -e
@@ -52,6 +66,7 @@ set -e
 LINUXDEPLOY=./linuxdeploy-x86_64.AppImage
 LINUXDEPLOY_PLUGIN_QT=./linuxdeploy-plugin-qt-x86_64.AppImage
 APPIMAGETOOL=./appimagetool-x86_64.AppImage
+PATCHELF=patchelf

 if [ ! -f "$LINUXDEPLOY" ]; then
 	"$PCSX2DIR/tools/retry.sh" wget -O "$LINUXDEPLOY" https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
@@ -64,7 +79,7 @@ if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then
 fi

 if [ ! -f "$APPIMAGETOOL" ]; then
-	"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+	"$PCSX2DIR/tools/retry.sh" wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
 	chmod +x "$APPIMAGETOOL"
 fi

@@ -72,16 +87,21 @@ OUTDIR=$(realpath "./$APPDIRNAME")
 rm -fr "$OUTDIR"

 echo "Locating extra libraries..."
-EXTRA_LIBS_ARGS=()
+EXTRA_LIBS_ARGS=""
 for lib in "${MANUAL_LIBS[@]}"; do
 	srcpath=$(find "$DEPSDIR" -name "$lib")
 	if [ ! -f "$srcpath" ]; then
-		echo "Missing extra library $lib. Exiting."
+		echo "Missinge extra library $lib. Exiting."
 		exit 1
 	fi

 	echo "Found $lib at $srcpath."
-	EXTRA_LIBS_ARGS+=( "--library=$srcpath" )
+
+	if [ "$EXTRA_LIBS_ARGS" == "" ]; then
+		EXTRA_LIBS_ARGS="--library=$srcpath"
+	else
+		EXTRA_LIBS_ARGS="$EXTRA_LIBS_ARGS,$srcpath"
+	fi
 done

 # Why the nastyness? linuxdeploy strips our main binary, and there's no option to turn it off.
@@ -105,20 +125,55 @@ cp "$PCSX2DIR/.github/workflows/scripts/linux/pcsx2-qt.desktop" "net.pcsx2.PCSX2
 cp "$PCSX2DIR/bin/resources/icons/AppIconLarge.png" "PCSX2.png"

 echo "Running linuxdeploy to create AppDir..."
-# The wayland platform plugin requires the plugins deployed for the waylandcompositor module
-# Interestingly, specifying the module doesn't copy the module, only the required plugins for it
-# https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/160#issuecomment-2655543893
-EXTRA_QT_MODULES="core;gui;svg;waylandclient;waylandcompositor;widgets;xcbqpa" \
-EXTRA_PLATFORM_PLUGINS="libqwayland.so" \
+EXTRA_QT_PLUGINS="core;gui;svg;waylandclient;widgets;xcbqpa" \
+EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
 DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
-$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" ${EXTRA_LIBS_ARGS[@]} \
+$LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt" $EXTRA_LIBS_ARGS \
 --desktop-file="net.pcsx2.PCSX2.desktop" --icon-file="PCSX2.png"

 echo "Copying resources into AppDir..."
 cp -a "$BUILDDIR/bin/resources" "$OUTDIR/usr/bin"

+# LinuxDeploy's Qt plugin doesn't include Wayland support. So manually copy in the additional Wayland libraries.
+echo "Copying Qt Wayland libraries..."
+for lib in "${MANUAL_QT_LIBS[@]}"; do
+	srcpath="$DEPSDIR/lib/$lib"
+	dstpath="$OUTDIR/usr/lib/$lib"
+	echo "  $srcpath -> $dstpath"
+	cp "$srcpath" "$dstpath"
+	$PATCHELF --set-rpath '$ORIGIN' "$dstpath"
+done
+
+# .. and plugins.
+echo "Copying Qt Wayland plugins..."
+for GROUP in "${MANUAL_QT_PLUGINS[@]}"; do
+	srcpath="$DEPSDIR/plugins/$GROUP"
+	dstpath="$OUTDIR/usr/plugins/$GROUP"
+	echo "  $srcpath -> $dstpath"
+	mkdir -p "$dstpath"
+
+	for srcsopath in $(find "$DEPSDIR/plugins/$GROUP" -iname '*.so'); do
+		# This is ../../ because it's usually plugins/group/name.so
+		soname=$(basename "$srcsopath")
+		dstsopath="$dstpath/$soname"
+		echo "    $srcsopath -> $dstsopath"
+		cp "$srcsopath" "$dstsopath"
+		$PATCHELF --set-rpath '$ORIGIN/../../lib:$ORIGIN' "$dstsopath"
+	done
+done
+
+# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin
+# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the
+# include list...
+for lib in "${REMOVE_LIBS[@]}"; do
+	for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do
+		echo "    Removing problematic library ${libpath}."
+		rm -f "$libpath"
+	done
+done
+
 # Restore unstripped deps (for cache).
 rm -fr "$DEPSDIR"
 mv "$DEPSDIR.bak" "$DEPSDIR"
--- a/.github/workflows/scripts/linux/build-dependencies-qt.sh
+++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh
@@ -7,10 +7,6 @@ if [ "$#" -ne 1 ]; then
    exit 1
 fi

-# The bundled ffmpeg has a lot of things disabled to reduce code size.
-# Users may want to use system ffmpeg for additional features
-: ${BUILD_FFMPEG:=0}
-
 SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 NPROCS="$(getconf _NPROCESSORS_ONLN)"
 INSTALLDIR="$1"
@@ -18,85 +14,63 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FFMPEG=8.0
-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBJPEGTURBO=3.1.2
-LIBPNG=1.6.53
-LIBWEBP=1.6.0
-NVENC=13.0.19.0
-SDL=SDL3-3.4.0
-QT=6.10.1
-QTAPNG=1.3.0
+LIBJPEGTURBO=3.1.0
+LIBPNG=1.6.48
+LIBWEBP=1.5.0
+SDL=SDL3-3.2.14
+QT=6.9.0
 LZ4=1.10.0
-VULKAN=1.4.328.1
 ZSTD=1.5.7
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
-PLUTOSVG=0.0.7
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=0.0.13
+PLUTOSVG=0.0.6

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7

 mkdir -p deps-build
 cd deps-build

-export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
-
 cat > SHASUMS <<EOF
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
 fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
-e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03  libpng-$LIBPNG.tar.xz
+7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  $SDL.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee  nv-codec-headers-$NVENC.tar.gz
-c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c  vulkan-sdk-$VULKAN.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-49bf6db800227a6b2c971f4c5d03dd1e81297e7ffb296ce4a96437304f27cb13  qtwayland-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+c1800c2ea835801af04a05d4a32321d79a93954ee3ae2172bbeacf13d1f0598c  qtbase-everywhere-src-$QT.tar.xz
+2047c6242a57bf97cf40079fa9f91752c137cd9ae84760faa9a2e5e8a440606f  qtimageformats-everywhere-src-$QT.tar.xz
+ec359d930c95935ea48af58b100c2f5d0d275968ec8ca1e0e76629b7159215fc  qtsvg-everywhere-src-$QT.tar.xz
+fa645589cc3f939022401a926825972a44277dead8ec8607d9f2662e6529c9a4  qttools-everywhere-src-$QT.tar.xz
+1d5581ef5fc7c7bc556f2403017983683993bbebfcdf977ef8f180f604668c3f  qttranslations-everywhere-src-$QT.tar.xz
+503416fcb04db503bd130e6a49c45e3e546f091e83406f774a0c703130c91805  qtwayland-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+f49d62709d6bf1808ddc9b8f71e22a755484f75c7bbb0fb368f7fb2ffc7cf645  plutovg-$PLUTOVG.tar.gz
+01f8aee511bd587a602a166642a96522cc9522efd1e38c2d00e4fbc0aa22d7a0  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -L \
-	-o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-	-o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
 	-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
 	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
 	-O "https://libsdl.org/release/$SDL.tar.gz" \
 	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-	-O "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-$VULKAN.tar.gz" \
-	-O "https://github.com/FFmpeg/nv-codec-headers/releases/download/n$NVENC/nv-codec-headers-$NVENC.tar.gz" \
-	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtwayland-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
 	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
 	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
 	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
@@ -107,37 +81,6 @@ curl -L \

 shasum -a 256 --check SHASUMS

-if [ "$BUILD_FFMPEG" -ne 0 ]; then
-	echo "Installing vulkan headers..."
-	rm -fr "Vulkan-Headers-vulkan-sdk-$VULKAN"
-	tar xf "vulkan-sdk-$VULKAN.tar.gz"
-	cd "Vulkan-Headers-vulkan-sdk-$VULKAN"
-	cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
-	make -C build install
-	cd ..
-
-	echo "Installing nvenc headers..."
-	rm -fr "nv-codec-headers-$NVENC"
-	tar xf "nv-codec-headers-$NVENC.tar.gz"
-	make -C "nv-codec-headers-$NVENC" PREFIX="$INSTALLDIR" install
-
-	echo "Installing FFmpeg..."
-	rm -fr "ffmpeg-$FFMPEG"
-	tar xf "ffmpeg-$FFMPEG.tar.xz"
-	cd "ffmpeg-$FFMPEG"
-	CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
-		./configure --prefix="$INSTALLDIR" \
-		--disable-all --disable-autodetect --disable-static --enable-shared \
-		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
-		--enable-gpl --enable-libx264 --enable-libopus --enable-vulkan --enable-ffnvcodec --enable-nvenc --enable-vaapi --enable-libvpl \
-		--enable-encoder=ffv1,qtrle,libx264*,aac,flac,libopus,pcm_s16be,pcm_s16le,*_vulkan,*_qsv,*_nvenc,*_vaapi \
-		--enable-muxer=avi,matroska,mov,mp3,mp4,wav \
-		--enable-protocol=file
-	make "-j$NPROCS"
-	make install
-	cd ..
-fi
-
 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
 unzip "$LIBBACKTRACE.zip"
@@ -150,9 +93,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
@@ -162,9 +103,7 @@ echo "Building libjpegturbo..."
 rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
 tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
 cd "libjpeg-turbo-$LIBJPEGTURBO"
-# On non debian or debian based Linux systems, libjpeg-turbo will set CMAKE_INSTALL_DEFAULT_LIBDIR "lib64" (or libx32)
-# That will prevent CMake from finding the deps libjpeg later on. if we set CMAKE_INSTALL_DEFAULT_LIBDIR, libjpeg-turbo will leave it as is, so set it to "lib"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DCMAKE_INSTALL_DEFAULT_LIBDIR="lib" -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -198,40 +137,11 @@ cmake --build build --parallel
 ninja -C build install
 cd ..

-echo "Building FreeType without HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building HarfBuzz..."
-rm -fr "harfbuzz-$HARFBUZZ"
-tar xf "harfbuzz-$HARFBUZZ.tar.gz"
-cd "harfbuzz-$HARFBUZZ"
-# Add an SOVERSION to match system harfbuzz
-sed -i 's/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE SOVERSION 0)/g' CMakeLists.txt
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -DHB_HAVE_GOBJECT=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType with HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
 echo "Building SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_X11_XSCRNSAVER=OFF -DSDL_TESTS=OFF -G Ninja
+cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -247,7 +157,7 @@ tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 mkdir build
 cd build
-../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- --log-level=STATUS -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 cmake --build . --parallel
 ninja install
 cd ../../
@@ -307,20 +217,11 @@ cmake --build . --parallel
 ninja install
 cd ../../

-echo "Building Qt APNG..."
-rm -fr "QtApng-$QTAPNG"
-tar xf "QtApng-$QTAPNG.tar.gz"
-cd "QtApng-$QTAPNG"
-patch -p1 < "$SCRIPTDIR/../common/qtapng-cmake.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
 echo "Building KDDockWidgets..."
 rm -fr "KDDockWidgets-$KDDOCKWIDGETS"
 tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
+patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
@@ -339,7 +240,7 @@ echo "Building PlutoSVG..."
 rm -fr "plutosvg-$PLUTOSVG"
 tar xf "plutosvg-$PLUTOSVG.tar.gz"
 cd "plutosvg-$PLUTOSVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=OFF -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
--- a/.github/workflows/scripts/linux/build-dependencies-runner.sh
+++ b/.github/workflows/scripts/linux/build-dependencies-runner.sh
@@ -1,196 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "$#" -ne 1 ]; then
-    echo "Syntax: $0 <output directory>"
-    exit 1
-fi
-
-SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-NPROCS="$(getconf _NPROCESSORS_ONLN)"
-INSTALLDIR="$1"
-if [ "${INSTALLDIR:0:1}" != "/" ]; then
-        INSTALLDIR="$PWD/$INSTALLDIR"
-fi
-
-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBPNG=1.6.51
-LIBWEBP=1.6.0
-SDL=SDL3-3.2.26
-LZ4=1.10.0
-ZSTD=1.5.7
-PLUTOVG=1.3.2
-PLUTOSVG=0.0.7
-
-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
-
-mkdir -p deps-build
-cd deps-build
-
-cat > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
-a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2  libpng-$LIBPNG.tar.xz
-e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
-9c16ec5654be709f062a705d0c6f529193f1c2123fe7f102fda6733913689023  libpng-$LIBPNG-apng.patch.gz
-537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-EOF
-
-curl -L \
-        -o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download" \
-        -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \
-        -O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.zip" \
-        -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-        -O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
-        -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
-        -O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
-        -O "https://libsdl.org/release/$SDL.tar.gz" \
-        -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
-        -o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
-        -o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
-        -o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
-        -o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
-        -o "plutovg-$PLUTOVG.tar.gz" "https://github.com/sammycage/plutovg/archive/v$PLUTOVG.tar.gz" \
-        -o "plutosvg-$PLUTOSVG.tar.gz" "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG.tar.gz"
-
-shasum -a 256 --check SHASUMS
-
-echo "Building libbacktrace..."
-rm -fr "libbacktrace-$LIBBACKTRACE"
-unzip "$LIBBACKTRACE.zip"
-cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$INSTALLDIR"
-make
-make install
-cd ..
-
-echo "Building libpng..."
-rm -fr "libpng-$LIBPNG"
-tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
-cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building LZ4..."
-rm -fr "lz4-$LZ4"
-tar xf "lz4-$LZ4.tar.gz"
-cd "lz4-$LZ4"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir -G Ninja build/cmake
-cmake --build build-dir --parallel
-ninja -C build-dir install
-cd ..
-
-echo "Building Zstandard..."
-rm -fr "zstd-$ZSTD"
-tar xf "zstd-$ZSTD.tar.gz"
-cd "zstd-$ZSTD"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType without HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building HarfBuzz..."
-rm -fr "harfbuzz-$HARFBUZZ"
-tar xf "harfbuzz-$HARFBUZZ.tar.gz"
-cd "harfbuzz-$HARFBUZZ"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building WebP..."
-rm -fr "libwebp-$LIBWEBP"
-tar xf "libwebp-$LIBWEBP.tar.gz"
-cd "libwebp-$LIBWEBP"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja \
-  -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
-  -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType with HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building SDL..."
-rm -fr "$SDL"
-tar xf "$SDL.tar.gz"
-cd "$SDL"
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building PlutoVG..."
-rm -fr "plutovg-$PLUTOVG"
-tar xf "plutovg-$PLUTOVG.tar.gz"
-cd "plutovg-$PLUTOVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOVG_BUILD_EXAMPLES=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building PlutoSVG..."
-rm -fr "plutosvg-$PLUTOSVG"
-tar xf "plutosvg-$PLUTOSVG.tar.gz"
-cd "plutosvg-$PLUTOSVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building shaderc..."
-rm -fr "shaderc-$SHADERC"
-tar xf "shaderc-$SHADERC.tar.gz"
-cd "shaderc-$SHADERC"
-cd third_party
-tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
-mv "glslang-$SHADERC_GLSLANG" "glslang"
-tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
-mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
-tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
-mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
-cd ..
-patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Cleaning up..."
-cd ..
-rm -r deps-build
--- a/.github/workflows/scripts/linux/flatpak/modules/20-sdl3.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/20-sdl3.json
@@ -14,8 +14,8 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.4.0.tar.gz",
-      "sha256": "082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8"
+      "url": "https://libsdl.org/release/SDL3-3.2.14.tar.gz",
+      "sha256": "b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f"
    }
  ],
  "cleanup": [
--- a/.github/workflows/scripts/linux/flatpak/modules/22-shaderc.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/22-shaderc.json
@@ -15,24 +15,24 @@
    {
      "type": "git",
      "url": "https://github.com/google/shaderc.git",
-      "commit": "73743588fe9c39f2f1c780a087d94afac691a189"
+      "commit": "47a9387ef5b3600d30d84c71ec77a59dc7db46fa"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/glslang/archive/7a47e2531cb334982b2a2dd8513dca0a3de4373d.tar.gz",
-      "sha256": "272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931",
+      "url": "https://github.com/KhronosGroup/glslang/archive/142052fa30f9eca191aa9dcf65359fcaed09eeec.tar.gz",
+      "sha256": "aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f",
      "dest": "third_party/glslang"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/b824a462d4256d720bebb40e78b9eb8f78bbb305.tar.gz",
-      "sha256": "c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c",
+      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/5e3ad389ee56fca27c9705d093ae5387ce404df4.tar.gz",
+      "sha256": "5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697",
      "dest": "third_party/spirv-headers"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/971a7b6e8d7740035bbff089bbbf9f42951ecfd5.tar.gz",
-      "sha256": "06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f",
+      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/dd4b663e13c07fea4fbb3f70c1c91c86731099f7.tar.gz",
+      "sha256": "03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47",
      "dest": "third_party/spirv-tools"
    },
    {
--- a/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/23-kddockwidgets.json
@@ -14,9 +14,13 @@
    {
      "type": "git",
      "url": "https://github.com/KDAB/KDDockWidgets.git",
-      "tag": "v2.3.0",
-      "commit": "c38711026e17e34916dd82c6fcbdcc0d2342f541",
+      "tag": "v2.2.3",
+      "commit": "28d16d0431d7cdc9f36cb619d22621146fdfab44",
      "disable-submodules": true
+    },
+    {
+      "type": "patch",
+      "path": "../../../common/kddockwidgets-dodgy-include.patch"
    }
  ],
  "cleanup": [
--- a/.github/workflows/scripts/linux/flatpak/modules/24-plutovg.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/24-plutovg.json
@@ -13,8 +13,7 @@
    {
      "type": "git",
      "url": "https://github.com/sammycage/plutovg.git",
-      "tag": "v1.3.2",
-      "commit": "5695a711dd1cff1f01fa6542f3fe6a15de082c63"
+      "tag": "v0.0.13"
    }
  ],
  "cleanup": [
--- a/.github/workflows/scripts/linux/flatpak/modules/25-plutosvg.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/25-plutosvg.json
@@ -14,8 +14,7 @@
    {
      "type": "git",
      "url": "https://github.com/sammycage/plutosvg.git",
-      "tag": "v0.0.7",
-      "commit": "31f7d2675416cd777c8e86220b035364873b2a8b"
+      "tag": "v0.0.6"
    }
  ],
  "cleanup": [
--- a/.github/workflows/scripts/linux/flatpak/modules/26-libpng.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/26-libpng.json
@@ -1,46 +0,0 @@
-{
-  "name": "libpng",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-    "-DPNG_TESTS=OFF",
-    "-DPNG_STATIC=OFF",
-    "-DPNG_SHARED=ON",
-    "-DPNG_TOOLS=OFF"
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.53/libpng-1.6.53.tar.xz",
-      "sha256": "1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4"
-    },
-    {
-      "type": "file",
-      "url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.53-apng.patch.gz",
-      "dest-filename": "libpng-1.6.53-apng.patch.gz",
-      "sha256": "452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c"
-    },
-    {
-      "type": "shell",
-      "commands":
-      [
-          "gunzip -f libpng-1.6.53-apng.patch.gz",
-          "patch -p1  < \"libpng-1.6.53-apng.patch\""
-      ]
-    }
-  ],
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/*.a",
-    "/lib/*.la",
-    "/lib/cmake",
-    "/lib/libpng",
-    "/lib/pkgconfig",
-    "/share/man"
-  ]
-}
-
--- a/.github/workflows/scripts/linux/flatpak/modules/27-qtapng.json
+++ b/.github/workflows/scripts/linux/flatpak/modules/27-qtapng.json
@@ -1,29 +0,0 @@
-{
-  "name": "qtapng",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-    "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\""
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "git",
-      "url": "https://github.com/jurplel/QtApng.git",
-      "tag": "1.3.0",
-      "commit": "bd15516b281204e90ecd5b80b00d1274b062f5fc"
-    },
-    {
-        "type": "patch",
-        "path": "../../../common/qtapng-cmake.patch"
-    }
-  ],
-  "cleanup": [
-    "/plugins"
-  ],
-  "post-install": [
-    "mv ${FLATPAK_DEST}/plugins/* ${FLATPAK_DEST}/bin/"
-  ]
-}
--- a/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
+++ b/.github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.json
@@ -1,15 +1,15 @@
 {
  "app-id": "net.pcsx2.PCSX2",
  "runtime": "org.kde.Platform",
-  "runtime-version": "6.10",
+  "runtime-version": "6.8",
  "sdk": "org.kde.Sdk",
  "sdk-extensions": [
-    "org.freedesktop.Sdk.Extension.llvm20"
+    "org.freedesktop.Sdk.Extension.llvm18"
  ],
  "add-extensions": {
    "org.freedesktop.Platform.ffmpeg-full": {
      "directory": "lib/ffmpeg",
-      "version": "25.08",
+      "version": "24.08",
      "add-ld-path": ".",
      "autodownload": true
    }
@@ -22,8 +22,7 @@
    "--socket=wayland",
    "--socket=fallback-x11",
    "--socket=pulseaudio",
-    "--talk-name=org.freedesktop.ScreenSaver",
-    "--filesystem=xdg-run/gamescope-0:ro"
+    "--talk-name=org.freedesktop.ScreenSaver"
  ],
  "modules": [
    "modules/10-libpcap.json",
@@ -33,8 +32,6 @@
    "modules/23-kddockwidgets.json",
    "modules/24-plutovg.json",
    "modules/25-plutosvg.json",
-    "modules/26-libpng.json",
-    "modules/27-qtapng.json",
    {
      "name": "pcsx2",
      "buildsystem": "cmake-ninja",
@@ -48,11 +45,10 @@
        "cxxflags": "",
        "cxxflags-override": true,
        "config-opts": [
-          "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\"",
          "-DCMAKE_BUILD_TYPE=Release",
          "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
-          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm20/bin/clang",
-          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm20/bin/clang++",
+          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang",
+          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++",
          "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld",
          "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld",
          "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld",
--- a/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in
+++ b/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in
@@ -20,7 +20,7 @@
  <url type="donation">https://github.com/sponsors/PCSX2</url>
  <url type="faq">https://pcsx2.net/docs/</url>
  <url type="help">https://pcsx2.net/discord</url>
-  <url type="contribute">https://pcsx2.net/docs/category/contributing</url>
+  <url type="contribute">https://github.com/PCSX2/pcsx2/blob/master/.github/CONTRIBUTING.md</url>
  <url type="translate">https://crowdin.com/project/pcsx2-emulator</url>
  <url type="contact">https://mastodon.social/@PCSX2</url>
  <screenshots>
--- a/.github/workflows/scripts/macos/build-dependencies-universal.sh
+++ b/.github/workflows/scripts/macos/build-dependencies-universal.sh
@@ -38,26 +38,25 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-SDL=SDL3-3.4.0
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
+SDL=SDL3-3.2.14
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.53
-LIBJPEGTURBO=3.1.2
-LIBWEBP=1.6.0
-FFMPEG=8.0
-MOLTENVK=1.4.1
-QT=6.10.1
-QTAPNG=1.3.0
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
-PLUTOSVG=0.0.7
+LIBPNG=1.6.48
+LIBJPEGTURBO=3.1.0
+LIBWEBP=1.5.0
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.3
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=0.0.13
+PLUTOSVG=0.0.6

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7

 mkdir -p deps-build
 cd deps-build
@@ -78,30 +77,28 @@ CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
 CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"

 cat > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
-e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03  libpng-$LIBPNG.tar.xz
+7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+f49d62709d6bf1808ddc9b8f71e22a755484f75c7bbb0fb368f7fb2ffc7cf645  plutovg-$PLUTOVG.tar.gz
+01f8aee511bd587a602a166642a96522cc9522efd1e38c2d00e4fbc0aa22d7a0  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -C - -L \
@@ -111,7 +108,6 @@ curl -C - -L \
 	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
 	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
@@ -121,7 +117,6 @@ curl -C - -L \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
 	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
 	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
 	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
@@ -205,9 +200,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
 make -C build "-j$NPROCS"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -DPNG_ARM_NEON=on -B build-arm64
@@ -277,7 +270,7 @@ rm -fr "MoltenVK-${MOLTENVK}"
 tar xf "v$MOLTENVK.tar.gz"
 cd "MoltenVK-${MOLTENVK}"
 ./fetchDependencies --macos
-make macos MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=0 MVK_CONFIG_USE_METAL_PRIVATE_API=1
+make macos
 cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
 cd ..

@@ -285,10 +278,6 @@ echo "Installing Qt Base..."
 rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
-
-# Patch Qt to support macOS 11
-patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
-
 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
 # We could run macdeployqt twice, but that's even more janky than patching it.
@@ -324,7 +313,7 @@ tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
 make "-j$NPROCS"
 make install
 cd ../..
@@ -335,7 +324,7 @@ tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_system_webp=ON
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_system_webp=ON
 make "-j$NPROCS"
 make install
 cd ../..
@@ -346,7 +335,7 @@ tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -375,28 +364,19 @@ tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
 make "-j$NPROCS"
 make install
 cd ../..

-echo "Building Qt APNG..."
-rm -fr "QtApng-$QTAPNG"
-tar xf "QtApng-$QTAPNG.tar.gz"
-cd "QtApng-$QTAPNG"
-patch -p1 < "$SCRIPTDIR/../common/qtapng-cmake.patch"
-cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -B build
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-
 echo "Building KDDockWidgets..."
 rm -fr "KDDockWidgets-$KDDOCKWIDGETS"
 tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
+patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build
-make -C build "-j$NPROCS"
-make -C build install
+cmake --build build --parallel
+cmake --install build
 cd ..

 echo "Building PlutoVG..."
--- a/.github/workflows/scripts/macos/build-dependencies.sh
+++ b/.github/workflows/scripts/macos/build-dependencies.sh
@@ -20,26 +20,25 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-SDL=SDL3-3.4.0
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
+SDL=SDL3-3.2.14
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.53
-LIBJPEGTURBO=3.1.2
-LIBWEBP=1.6.0
-FFMPEG=8.0
-MOLTENVK=1.4.1
-QT=6.10.1
-QTAPNG=1.3.0
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
-PLUTOSVG=0.0.7
+LIBPNG=1.6.48
+LIBJPEGTURBO=3.1.0
+LIBWEBP=1.5.0
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.3
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=0.0.13
+PLUTOSVG=0.0.6

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2024.1
+SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7

 mkdir -p deps-build
 cd deps-build
@@ -54,35 +53,32 @@ CMAKE_COMMON=(
 	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
 	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
 	-DCMAKE_OSX_ARCHITECTURES="x86_64"
-	-DCMAKE_APPLE_SILICON_PROCESSOR="x86_64"
 	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
 )

 cat > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
+b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-1d3fb8ccc2932d04aa3663e22ef5ef490244370f4e568d7850165068778d98d4  libpng-$LIBPNG.tar.xz
-e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c  libpng-$LIBPNG-apng.patch.gz
-8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
-498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
-c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
-8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
-8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
+46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03  libpng-$LIBPNG.tar.xz
+7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c  libwebp-$LIBWEBP.tar.gz
+9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+eb3b5f0c16313d34f208d90c2fa1e588a23283eed63b101edd5422be6165d528  shaderc-$SHADERC.tar.gz
+aa27e4454ce631c5a17924ce0624eac736da19fc6f5a2ab15a6c58da7b36950f  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+5d866ce34a4b6908e262e5ebfffc0a5e11dd411640b5f24c85a80ad44c0d4697  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+03ee1a2c06f3b61008478f4abe9423454e53e580b9488b47c8071547c6a9db47  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+f49d62709d6bf1808ddc9b8f71e22a755484f75c7bbb0fb368f7fb2ffc7cf645  plutovg-$PLUTOVG.tar.gz
+01f8aee511bd587a602a166642a96522cc9522efd1e38c2d00e4fbc0aa22d7a0  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -L \
@@ -92,7 +88,6 @@ curl -L \
 	-O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz" \
 	-O "https://github.com/lz4/lz4/releases/download/v$LZ4/lz4-$LZ4.tar.gz" \
 	-O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz" \
-	-O "https://download.sourceforge.net/libpng-apng/libpng-$LIBPNG-apng.patch.gz" \
 	-O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz" \
 	-O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz" \
 	-O "https://ffmpeg.org/releases/ffmpeg-$FFMPEG.tar.xz" \
@@ -102,7 +97,6 @@ curl -L \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtsvg-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttools-everywhere-src-$QT.tar.xz" \
 	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qttranslations-everywhere-src-$QT.tar.xz" \
-	-o "QtApng-$QTAPNG.tar.gz" "https://github.com/jurplel/QtApng/archive/refs/tags/$QTAPNG.tar.gz" \
 	-o "shaderc-$SHADERC.tar.gz" "https://github.com/google/shaderc/archive/refs/tags/v$SHADERC.tar.gz" \
 	-o "shaderc-glslang-$SHADERC_GLSLANG.tar.gz" "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG.tar.gz" \
 	-o "shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS.tar.gz" \
@@ -162,9 +156,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gunzip -d -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
 make -C build "-j$NPROCS"
 make -C build install
@@ -225,7 +217,7 @@ cd "MoltenVK-${MOLTENVK}"
 sed -i '' 's/xcodebuild "$@"/xcodebuild $XCODEBUILD_EXTRA_ARGS "$@"/g' fetchDependencies
 sed -i '' 's/XCODEBUILD :=/XCODEBUILD ?=/g' Makefile
 XCODEBUILD_EXTRA_ARGS="VALID_ARCHS=x86_64" ./fetchDependencies --macos
-XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=0 MVK_CONFIG_USE_METAL_PRIVATE_API=1
+XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos
 cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
 cd ..

@@ -234,15 +226,26 @@ rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"

-# Patch Qt to support macOS 11
-patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
-
 # since we don't have a direct reference to QtSvg, it doesn't deployed directly from the main binary
 # (only indirectly from iconengines), and the libqsvg.dylib imageformat plugin does not get deployed.
 # We could run macdeployqt twice, but that's even more janky than patching it.
+
+# https://github.com/qt/qtbase/commit/7b018629c3c3ab23665bf1da00c43c1546042035
+# The QProcess default wait time of 30s may be too short in e.g. CI environments where processes may be blocked
+# for a longer time waiting for CPU or IO.
+
 patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
 --- shared.cpp
 +++ shared.cpp
+@@ -152,7 +152,7 @@
+     LogDebug() << " inspecting" << binaryPath;
+     QProcess otool;
+     otool.start("otool", QStringList() << "-L" << binaryPath);
+-    otool.waitForFinished();
+    otool.waitForFinished(-1);
+ 
+     if (otool.exitStatus() != QProcess::NormalExit || otool.exitCode() != 0) {
+         LogError() << otool.readAllStandardError();
@@ -1122,14 +1122,8 @@
         addPlugins(QStringLiteral("networkinformation"));
     }
@@ -261,7 +264,7 @@ patch -u src/tools/macdeployqt/shared/shared.cpp <<EOF
 
     // Platforminputcontext plugins if QtGui is in use
 EOF
-cmake -B build "${CMAKE_COMMON[@]}" -DCMAKE_BUILD_TYPE=MinSizeRel -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
+cmake -B build "${CMAKE_COMMON[@]}" -DFEATURE_dbus=OFF -DFEATURE_framework=OFF -DFEATURE_icu=OFF -DFEATURE_opengl=OFF -DFEATURE_sql=OFF -DFEATURE_gssapi=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -272,7 +275,7 @@ tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
 make "-j$NPROCS"
 make install
 cd ../..
@@ -283,7 +286,7 @@ tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF -DFEATURE_system_webp=ON
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_system_webp=ON
 make "-j$NPROCS"
 make install
 cd ../..
@@ -294,7 +297,7 @@ tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=ON -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -323,25 +326,16 @@ tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}"
 make "-j$NPROCS"
 make install
 cd ../..

-echo "Building Qt APNG..."
-rm -fr "QtApng-$QTAPNG"
-tar xf "QtApng-$QTAPNG.tar.gz"
-cd "QtApng-$QTAPNG"
-patch -p1 < "$SCRIPTDIR/../common/qtapng-cmake.patch"
-cmake "${CMAKE_COMMON[@]}" -B build
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-
 echo "Building KDDockWidgets..."
 rm -fr "KDDockWidgets-$KDDOCKWIDGETS"
 tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
+patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch"
 cmake "${CMAKE_COMMON[@]}" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build
 make -C build "-j$NPROCS"
 make -C build install
--- a/.github/workflows/scripts/macos/qt-macos11compat.patch
+++ b/.github/workflows/scripts/macos/qt-macos11compat.patch
@@ -1,116 +0,0 @@
-diff --git a/.cmake.conf b/.cmake.conf
--- a/.cmake.conf
-+++ b/.cmake.conf
-@@ -51,7 +51,7 @@ set(QT_MAX_NEW_POLICY_CMAKE_VERSION_QT_APPLE "3.21")
- set(QT_SUPPORTED_MIN_MACOS_SDK_VERSION "14")
- set(QT_SUPPORTED_MAX_MACOS_SDK_VERSION "26")
- set(QT_SUPPORTED_MIN_MACOS_XCODE_VERSION "15")
-set(QT_SUPPORTED_MIN_MACOS_VERSION "13")
-+set(QT_SUPPORTED_MIN_MACOS_VERSION "11")
- set(QT_SUPPORTED_MAX_MACOS_VERSION_TESTED "26")
- 
- set(QT_SUPPORTED_MIN_IOS_SDK_VERSION "17")
-diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,10 @@ cmake_minimum_required(VERSION 3.16)
- # Get the repo version and CMake policy details
- include(.cmake.conf)
- 
-+if(APPLE)
-+  add_compile_options(-Werror=unguarded-availability-new)
-+endif()
-+
- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/QtBaseHelpers.cmake)
- 
- qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}")
-diff --git a/src/corelib/global/qsysinfo.cpp b/src/corelib/global/qsysinfo.cpp
--- a/src/corelib/global/qsysinfo.cpp
-+++ b/src/corelib/global/qsysinfo.cpp
-@@ -1027,7 +1027,7 @@ QByteArray QSysInfo::machineUniqueId()
- {
- #if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
-     char uuid[UuidStringLen + 1];
-    io_service_t service = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
-+    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
-     QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
-     CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
-     return QByteArray(uuid);
-diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
--- a/src/corelib/kernel/qcore_mac.mm
-+++ b/src/corelib/kernel/qcore_mac.mm
-@@ -367,7 +367,7 @@ bool qt_apple_runningWithLiquidGlass()
-             return config;
- #endif
- 
-        QIOType<io_registry_entry_t> nvram = IORegistryEntryFromPath(kIOMainPortDefault, "IODeviceTree:/options");
-+        QIOType<io_registry_entry_t> nvram = IORegistryEntryFromPath(kIOMasterPortDefault, "IODeviceTree:/options");
-         if (!nvram) {
-             qWarning("Failed to locate NVRAM entry in IO registry");
-             return {};
-diff --git a/src/gui/platform/darwin/qappleiconengine.mm b/src/gui/platform/darwin/qappleiconengine.mm
--- a/src/gui/platform/darwin/qappleiconengine.mm
-+++ b/src/gui/platform/darwin/qappleiconengine.mm
-@@ -366,12 +366,16 @@
-                                                weight:NSFontWeightRegular
-                                                scale:NSImageSymbolScaleLarge];
- 
-+    auto *primaryColor = [NSColor colorWithSRGBRed:color.redF()
-+                                             green:color.greenF()
-+                                              blue:color.blueF()
-+                                             alpha:color.alphaF()];
-+
-+    if (@available(macOS 13, *)) {
-+
-     // Apply tint color first, which switches the configuration to palette mode
-     config = [config configurationByApplyingConfiguration:
-        [NSImageSymbolConfiguration configurationWithPaletteColors:@[
-            [NSColor colorWithSRGBRed:color.redF() green:color.greenF()
-                blue:color.blueF() alpha:color.alphaF()]
-        ]]];
-+        [NSImageSymbolConfiguration configurationWithPaletteColors:@[primaryColor]]];
- 
-     // Then switch back to monochrome, as palette mode gives a different look
-     // than monochrome, even with a single color.
-@@ -379,6 +383,18 @@
-         [NSImageSymbolConfiguration configurationPreferringMonochrome]];
- 
-     return [image imageWithSymbolConfiguration:config];
-+
-+    } else {
-+    NSImage *configuredImage = [image imageWithSymbolConfiguration:config];
-+    return [NSImage imageWithSize:configuredImage.size flipped:NO
-+        drawingHandler:^BOOL(NSRect) {
-+            [primaryColor set];
-+            NSRect imageRect = {NSZeroPoint, configuredImage.size};
-+            [configuredImage drawInRect:imageRect];
-+            NSRectFillUsingOperation(imageRect, NSCompositingOperationSourceIn);
-+            return YES;
-+        }];
-+    }
- }
- #elif defined(QT_PLATFORM_UIKIT)
- auto *configuredImage(const UIImage *image, const QColor &color)
-diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
-+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
-@@ -323,6 +323,8 @@ a normal (not maximized or full screen) top-level window.
-         m_view.safeAreaInsets.bottom
-     };
- 
-+    if (@available(macOS 12, *)) {
-+
-     // The screen's safe area insets represent the distances from the screen's
-     // edges at which content isn't obscured. The view's safe area margins do
-     // not include the screen's insets automatically, so we need to manually
-@@ -355,6 +357,10 @@ a normal (not maximized or full screen) top-level window.
-     };
- 
-     return (screenSafeAreaMargins | viewSafeAreaMargins).toMargins();
-+
-+    } else {
-+        return viewSafeAreaMargins.toMargins();
-+    }
- }
- 
- void QCocoaWindow::updateSafeAreaMarginsIfNeeded()
--- a/.github/workflows/scripts/windows/build-dependencies-arm64.bat
+++ b/.github/workflows/scripts/windows/build-dependencies-arm64.bat
@@ -42,56 +42,49 @@ echo INSTALLDIR=%INSTALLDIR%

 cd "%BUILDDIR%"

-set FREETYPE=2.14.1
-set HARFBUZZ=12.2.0
-set LIBJPEGTURBO=3.1.2
-set LIBPNG=1653
-set LIBPNGLONG=1.6.53
-set SDL=SDL3-3.4.0
-set QT=6.10.1
-set QTMINOR=6.10
-set QTAPNG=1.3.0
+set FREETYPE=2.13.3
+set HARFBUZZ=11.2.0
+set LIBJPEGTURBO=3.1.0
+set LIBPNG=1648
+set SDL=SDL3-3.2.14
+set QT=6.9.0
+set QTMINOR=6.9
 set LZ4=1.10.0
-set WEBP=1.6.0
+set WEBP=1.5.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.4.0
-set PLUTOVG=1.3.2
-set PLUTOSVG=0.0.7
+set KDDOCKWIDGETS=2.2.3
+set PLUTOVG=0.0.13
+set PLUTOSVG=0.0.6

-set SHADERC=2025.4
-set SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-set SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7

-set AGILITYSDK=1.618.5
-
-call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
-call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1648.zip 2e5f080360f77376eb2bfa9e2ed773b9c7728159aba47b638ad53ca839379040 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 46a17d3ea71fe2580a7f43ca7da286c5b9106dd761e2fd5533bb113e5d86b633 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 513df15a6365a40f6230ec9463ad8c71b824e181d4b661dac9707e103b24ae0c || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" d428fd17a0d3f92c48a30f1d23806bf20352fbce2e80e5bbee27fa80576480ee || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 54bf06afeb67035f1c6afcd00beec755c0d776626b4cce9ab56992a55215ba69 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 5f8a94a161bd2e71a82f478dc19f4ec77ac95a50709f5a68d5951001ed6bb856 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 5885ce1a114615cc5fa69e459f069d3fe2bcb1320fd9cc162821f3920ef44735 || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
-call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
-call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
-call :downloadfile: "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" 0027fc24f947c48dbded13ada7d280be221eb651644e23a8a476f0f1f0a079dd || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" e313baaa7c934503ef601c909661a84e5b795dfa12f0354721cac7a9c27be47e || goto error
+call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 24826a70d0b168a66eb16ec9d7eeeba0d4ca9d4babc1199889d374918008426e || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" fab72d1a38eacea52710d18edb95dfd75db894ad869675d07a1eb26827da9b15 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 4a118247386ffba9160113f146f2189ba5abe3995db357114d7112ede6bd3cd1 || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 9a38cb3b14484f5038d78cd5df89404f2f5b389a6ad91f9f1df4ae71bb9490dc || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" a26383c836a84fab5b03aed5d98e8e27d6c0a9cdbc3b0f462ccfe0a11a3d91ea || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -99,7 +92,7 @@ if %DEBUG%==1 (
  echo Building release libraries...
 )

-set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG"
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
 set ARM64TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE="%SCRIPTDIR%\cmake-toolchain-windows-arm64.cmake"

 echo Building Zlib...
@@ -114,10 +107,7 @@ cd .. || goto error
 echo Building libpng...
 rmdir /S /Q "lpng%LIBPNG%"
 %SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
-rem apng not in released libpng yet
-%SEVENZIP% x "lpng%LIBPNG%-apng.patch.gz" -aoa || goto error
 cd "lpng%LIBPNG%" || goto error
-%PATCH% -p1 < "../libpng-%LIBPNGLONG%-apng.patch" || goto error
 cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -200,7 +190,7 @@ cd .. || goto error
 if %DEBUG%==1 (
  set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
 ) else (
-  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=MinSizeRel -G Ninja
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
 )

 echo Building Qt base...
@@ -256,22 +246,6 @@ cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error

-if %DEBUG%==1 (
-  set QTAPNGBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
-) else (
-  set QTAPNGBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
-)
-
-echo Building Qt APNG...
-rmdir /S /Q "QtApng-%QTAPNG%"
-%SEVENZIP% x "QtApng-%QTAPNG%.zip" || goto error
-cd "QtApng-%QTAPNG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\..\common\qtapng-cmake.patch" || goto error
-cmake -B build %ARM64TOOLCHAIN% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% %QTAPNGBUILDSPEC% || goto error
-cmake --build build --parallel || goto error
-ninja -C build install || goto error
-cd .. || goto error
-
 if %DEBUG%==1 (
  set KDDOCKWIDGETSBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
 ) else (
@@ -285,6 +259,7 @@ echo "Building KDDockWidgets..."
 rmdir /S /Q "KDDockWidgets-%KDDOCKWIDGETS%"
 %SEVENZIP% x "KDDockWidgets-%KDDOCKWIDGETS%.zip" || goto error
 cd "KDDockWidgets-%KDDOCKWIDGETS%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\kddockwidgets-dodgy-include.patch" || goto error
 cmake -B build %ARM64TOOLCHAIN% -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets %KDDOCKWIDGETSBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -308,20 +283,6 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

-echo Unpacking Agility SDK
-rmdir /S /Q "agility-sdk-%AGILITYSDK%"
-%SEVENZIP% x -o"agility-sdk-%AGILITYSDK%" "agility-sdk-%AGILITYSDK%.nupkg" || goto error
-cd "agility-sdk-%AGILITYSDK%" || goto error
-if not exist "%INSTALLDIR%\bin\D3D12" (
-  mkdir "%INSTALLDIR%\bin\D3D12" || goto error
-)
-rem the pdbs aren't in the list of distributable files, so only copy the dlls.
-copy "build\native\bin\arm64\D3D12Core.dll" "%INSTALLDIR%\bin\D3D12\D3D12Core.dll" || goto error
-if %DEBUG%==1 (
-  copy "build\native\bin\arm64\d3d12SDKLayers.dll" "%INSTALLDIR%\bin\D3D12\d3d12SDKLayers.dll" || goto error
-)
-cd .. || goto error
-
 echo Building shaderc...
 rmdir /S /Q "shaderc-%SHADERC%"
 %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
--- a/.github/workflows/scripts/windows/build-dependencies.bat
+++ b/.github/workflows/scripts/windows/build-dependencies.bat
@@ -40,56 +40,49 @@ set "PATH=%PATH%;%INSTALLDIR%\bin"

 cd "%BUILDDIR%"

-set FREETYPE=2.14.1
-set HARFBUZZ=12.2.0
-set LIBJPEGTURBO=3.1.2
-set LIBPNG=1653
-set LIBPNGLONG=1.6.53
-set SDL=SDL3-3.4.0
-set QT=6.10.1
-set QTMINOR=6.10
-set QTAPNG=1.3.0
+set FREETYPE=2.13.3
+set HARFBUZZ=11.2.0
+set LIBJPEGTURBO=3.1.0
+set LIBPNG=1648
+set SDL=SDL3-3.2.14
+set QT=6.9.0
+set QTMINOR=6.9
 set LZ4=1.10.0
-set WEBP=1.6.0
+set WEBP=1.5.0
 set ZLIB=1.3.1
 set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.4.0
-set PLUTOVG=1.3.2
-set PLUTOSVG=0.0.7
+set KDDOCKWIDGETS=2.2.3
+set PLUTOVG=0.0.13
+set PLUTOSVG=0.0.6

-set SHADERC=2025.4
-set SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-set SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+set SHADERC=2024.1
+set SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec
+set SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4
+set SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7

-set AGILITYSDK=1.618.5
-
-call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 452a1a290bd0cf18737fad0057dc17b7fdf10a73eda2d6d4f31ba04fda25ef2c || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
-call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
-call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
-call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1648.zip 2e5f080360f77376eb2bfa9e2ed773b9c7728159aba47b638ad53ca839379040 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 9564c72b1dfd1d6fe6274c5f95a8d989b59854575d4bbee44ade7bc17aa9bc93 || goto error
+call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 46a17d3ea71fe2580a7f43ca7da286c5b9106dd761e2fd5533bb113e5d86b633 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 513df15a6365a40f6230ec9463ad8c71b824e181d4b661dac9707e103b24ae0c || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" d428fd17a0d3f92c48a30f1d23806bf20352fbce2e80e5bbee27fa80576480ee || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 54bf06afeb67035f1c6afcd00beec755c0d776626b4cce9ab56992a55215ba69 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 5f8a94a161bd2e71a82f478dc19f4ec77ac95a50709f5a68d5951001ed6bb856 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 5885ce1a114615cc5fa69e459f069d3fe2bcb1320fd9cc162821f3920ef44735 || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
-call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
-call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error
-call :downloadfile: "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" 0027fc24f947c48dbded13ada7d280be221eb651644e23a8a476f0f1f0a079dd || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" e313baaa7c934503ef601c909661a84e5b795dfa12f0354721cac7a9c27be47e || goto error
+call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 24826a70d0b168a66eb16ec9d7eeeba0d4ca9d4babc1199889d374918008426e || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" fab72d1a38eacea52710d18edb95dfd75db894ad869675d07a1eb26827da9b15 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 4a118247386ffba9160113f146f2189ba5abe3995db357114d7112ede6bd3cd1 || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 9a38cb3b14484f5038d78cd5df89404f2f5b389a6ad91f9f1df4ae71bb9490dc || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" a26383c836a84fab5b03aed5d98e8e27d6c0a9cdbc3b0f462ccfe0a11a3d91ea || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 6c9f42ed6bf42750f5369b089909abfdcf0101488b4a1f41116d5159d00af8e7 || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 03ad8a6fa987af4653d0cfe6bdaed41bcf617f1366a151fb1574da75950cd3e8 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" fa59a54334feaba5702b9c25724c3f4746123865769b36dd5a28d9ef5e9d39ab || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" bf385994c20293485b378c27dfdbd77a31b949deabccd9218a977f173eda9f6f || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -97,7 +90,7 @@ if %DEBUG%==1 (
  echo Building release libraries...
 )

-set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_MINSIZEREL="/DEBUG"
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"

 echo Building Zlib...
 rmdir /S /Q "zlib-%ZLIB%"
@@ -111,10 +104,7 @@ cd .. || goto error
 echo Building libpng...
 rmdir /S /Q "lpng%LIBPNG%"
 %SEVENZIP% x "lpng%LIBPNG%.zip" || goto error
-rem apng not in released libpng yet
-%SEVENZIP% x "lpng%LIBPNG%-apng.patch.gz" -aoa || goto error
 cd "lpng%LIBPNG%" || goto error
-%PATCH% -p1 < "../libpng-%LIBPNGLONG%-apng.patch" || goto error
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -197,13 +187,20 @@ cd .. || goto error
 if %DEBUG%==1 (
  set QTBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -G "Ninja Multi-Config"
 ) else (
-  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=MinSizeRel -G Ninja
+  set QTBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
 )

 echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
+
+rem Disable the PCRE2 JIT, it doesn't properly verify AVX2 support.
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-disable-pcre2-jit.patch" || goto error
+
+rem Hackfix settings icon stretching
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-fix-icon-stretch.patch" || goto error
+
 cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -232,7 +229,7 @@ ninja install || goto error
 cd ..\.. || goto error

 echo Building Qt Tools...
-rmdir /S /Q "qttools-everywhere-src-%QT%"
+rmdir /S /Q "qtimageformats-everywhere-src-%QT%"
 %SEVENZIP% x "qttools-everywhere-src-%QT%.zip" || goto error
 cd "qttools-everywhere-src-%QT%" || goto error
 mkdir build || goto error
@@ -253,28 +250,12 @@ cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error

-if %DEBUG%==1 (
-  set QTAPNGBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
-) else (
-  set QTAPNGBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
-)
-
-echo Building Qt APNG...
-rmdir /S /Q "QtApng-%QTAPNG%"
-%SEVENZIP% x "QtApng-%QTAPNG%.zip" || goto error
-cd "QtApng-%QTAPNG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\..\common\qtapng-cmake.patch" || goto error
-cmake -B build -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% %QTAPNGBUILDSPEC% || goto error
-cmake --build build --parallel || goto error
-ninja -C build install || goto error
-cd .. || goto error
-
 if %DEBUG%==1 (
  set KDDOCKWIDGETSBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
 ) else (
  rem kddockwidgets slightly changes the name of the dll depending on if CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES is used
-  rem The dll name being kddockwidgets-qt62.dll or kddockwidgets-qt6.dll respectively
-  rem Always use CMAKE_CONFIGURATION_TYPES to give consistent naming
+  rem The dll name being kddockwidgets-qt62.dll or kddockwidgets-qt62.dll respectively
+  rem Always use CMAKE_CONFIGURATION_TYPES to give consistant naming
  set KDDOCKWIDGETSBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES=Release -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=Release -G "Ninja Multi-Config"
 )

@@ -282,6 +263,7 @@ echo "Building KDDockWidgets..."
 rmdir /S /Q "KDDockWidgets-%KDDOCKWIDGETS%"
 %SEVENZIP% x "KDDockWidgets-%KDDOCKWIDGETS%.zip" || goto error
 cd "KDDockWidgets-%KDDOCKWIDGETS%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\kddockwidgets-dodgy-include.patch" || goto error
 cmake -B build -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets %KDDOCKWIDGETSBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -305,20 +287,6 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

-echo Unpacking Agility SDK
-rmdir /S /Q "agility-sdk-%AGILITYSDK%"
-%SEVENZIP% x -o"agility-sdk-%AGILITYSDK%" "agility-sdk-%AGILITYSDK%.nupkg" || goto error
-cd "agility-sdk-%AGILITYSDK%" || goto error
-if not exist "%INSTALLDIR%\bin\D3D12" (
-  mkdir "%INSTALLDIR%\bin\D3D12" || goto error
-)
-rem the pdbs aren't in the list of distributable files, so only copy the dlls.
-copy "build\native\bin\x64\D3D12Core.dll" "%INSTALLDIR%\bin\D3D12\D3D12Core.dll" || goto error
-if %DEBUG%==1 (
-  copy "build\native\bin\x64\d3d12SDKLayers.dll" "%INSTALLDIR%\bin\D3D12\d3d12SDKLayers.dll" || goto error
-)
-cd .. || goto error
-
 echo Building shaderc...
 rmdir /S /Q "shaderc-%SHADERC%"
 %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
--- a/.github/workflows/scripts/windows/qtbase-disable-pcre2-jit.patch
+++ b/.github/workflows/scripts/windows/qtbase-disable-pcre2-jit.patch
@@ -0,0 +1,35 @@
+--- qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-03-19 08:46:43.000000000 -0700
+++ qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-06-06 21:52:20.539619500 -0700
+@@ -41,6 +41,7 @@
+         src/pcre2_xclass.c
+     DEFINES
+         HAVE_CONFIG_H
+        PCRE2_DISABLE_JIT
+     PUBLIC_DEFINES
+         PCRE2_CODE_UNIT_WIDTH=16
+     PUBLIC_INCLUDE_DIRECTORIES
+@@ -52,23 +53,8 @@
+ ## Scopes:
+ #####################################################################
+ 
+-qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+-qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+-    DEFINES
+-        PCRE2_DISABLE_JIT
+-)
+-
+ if (APPLE)
+-    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64 -DPCRE2_DISABLE_JIT")
+    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64")
+ endif()
+ 
+ qt_internal_extend_target(BundledPcre2 CONDITION WIN32
--- a/.github/workflows/scripts/windows/qtbase-fix-icon-stretch.patch
+++ b/.github/workflows/scripts/windows/qtbase-fix-icon-stretch.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+index 208420d7e8..26ef6f31ef 100644
+--- a/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+++ b/src/plugins/styles/modernwindows/qwindowsvistastyle.cpp
+@@ -4232,8 +4232,6 @@ QRect QWindowsVistaStyle::subElementRect(SubElement element, const QStyleOption
+
+     case SE_ItemViewItemDecoration:
+         rect = QWindowsStyle::subElementRect(element, option, widget);
+-        if (qstyleoption_cast<const QStyleOptionViewItem *>(option))
+-            rect.adjust(-2, 0, 2, 0);
+         break;
+
+     case SE_ItemViewItemFocusRect:
--- a/.github/workflows/triage_pr.yml
+++ b/.github/workflows/triage_pr.yml
@@ -8,7 +8,7 @@ jobs:
    if: github.repository == 'PCSX2/pcsx2'
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/labeler@v6
+    - uses: actions/labeler@v5
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}

--- a/.github/workflows/windows_build_matrix.yml
+++ b/.github/workflows/windows_build_matrix.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: windows-2025
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Verify VS Project Files
        run: .github\workflows\scripts\windows\validate-vs-filters.ps1

--- a/.github/workflows/windows_build_qt.yml
+++ b/.github/workflows/windows_build_qt.yml
@@ -56,7 +56,7 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Configure MSBuild Clang Version
        if: inputs.configuration != 'CMake'
@@ -115,7 +115,7 @@ jobs:

      - name: Cache Dependencies
        id: cache-deps
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: deps
          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/windows/build-dependencies.bat', '.github/workflows/scripts/common/*.patch') }}
@@ -154,7 +154,7 @@ jobs:
          cmake --build build --config Release --target unittests

      - name: Upload artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: |
@@ -168,7 +168,7 @@ jobs:
            !./bin/**/*.lib

      - name: Install the Breakpad Symbol Generator
-        uses: baptiste0928/cargo-install@b687c656bda5733207e629b50a22bf68974a0305
+        uses: baptiste0928/cargo-install@91c5da15570085bcde6f4d7aed98cb82d6769fd3
        with:
          crate: dump_syms

@@ -186,7 +186,7 @@ jobs:
          }

      - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
          path: |
--- a/.github/workflows/windows_deps_dispatch.yml
+++ b/.github/workflows/windows_deps_dispatch.yml
@@ -1,17 +0,0 @@
-name: 🖥️ 📦 Dispatch Windows Deps Build
-
-on:
-  pull_request_target:
-    types: [closed]
-
-jobs:
-  trigger:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'requires-win-deps-build')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch to windows-dependencies repo
-        uses: peter-evans/repository-dispatch@v4
-        with:
-          token: ${{ secrets.DEPS_REPO_DISPATCH_ACCESS_TOKEN }}
-          repository: pcsx2/pcsx2-windows-dependencies
-          event-type: deps-update
--- a/3rdparty/ccc/src/ccc/symbol_database.cpp
+++ b/3rdparty/ccc/src/ccc/symbol_database.cpp
@@ -113,27 +113,13 @@ typename SymbolList<SymbolType>::AddressToHandleMapIterators SymbolList<SymbolTy
 template <typename SymbolType>
 typename SymbolList<SymbolType>::AddressToHandleMapIterators SymbolList<SymbolType>::handles_from_address_range(AddressRange range) const
 {
-	typename AddressToHandleMap::const_iterator begin, end;
-	if (range.low.valid() && range.high.valid()) {
-		if (range.low.value < range.high.value) {
-			begin = m_address_to_handle.lower_bound(range.low.value);
-			end = m_address_to_handle.lower_bound(range.high.value);
-		} else {
-			begin = m_address_to_handle.end();
-			end = m_address_to_handle.end();
-		}
-	} else if (range.low.valid()) {
-		begin = m_address_to_handle.lower_bound(range.low.value);
-		end = m_address_to_handle.end();
-	} else if (range.high.valid()) {
-		begin = m_address_to_handle.begin();
-		end = m_address_to_handle.lower_bound(range.high.value);
+	if(range.low.valid()) {
+		return {m_address_to_handle.lower_bound(range.low.value), m_address_to_handle.lower_bound(range.high.value)};
+	} else if(range.high.valid()) {
+		return {m_address_to_handle.begin(), m_address_to_handle.lower_bound(range.high.value)};
 	} else {
-		begin = m_address_to_handle.end();
-		end = m_address_to_handle.end();
+		return {m_address_to_handle.end(), m_address_to_handle.end()};
 	}
-	
-	return {begin, end};
 }

 template <typename SymbolType>
--- a/3rdparty/cpuinfo/CMakeLists.txt
+++ b/3rdparty/cpuinfo/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.18 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)

 # ---[ Setup project
 PROJECT(
@@ -108,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
      "Target operating system is not specified. "
      "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
  SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD|Emscripten)$")
+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD)$")
  IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
    MESSAGE(WARNING
      "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
@@ -184,11 +184,10 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
    ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
      LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
    ENDIF()
-  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64|aarch64)$")
+  ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
    LIST(APPEND CPUINFO_SRCS
      src/arm/windows/init-by-logical-sys-info.c
-      src/arm/windows/init.c
-      src/arm/uarch.c)
+      src/arm/windows/init.c)
  ELSEIF(CPUINFO_TARGET_PROCESSOR MATCHES "^(armv[5-8].*|aarch64|arm64.*)$" OR IOS_ARCH MATCHES "^(armv7.*|arm64.*)$")
    LIST(APPEND CPUINFO_SRCS
      src/arm/uarch.c
@@ -219,7 +218,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
  ELSEIF(CPUINFO_TARGET_PROCESSOR MATCHES "^(riscv(32|64))$")
    LIST(APPEND CPUINFO_SRCS
      src/riscv/uarch.c)
-    IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
+    IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
      LIST(APPEND CPUINFO_SRCS
        src/riscv/linux/init.c
 	src/riscv/linux/riscv-hw.c
@@ -748,11 +747,6 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS)
    TARGET_LINK_LIBRARIES(pixel-2-xl-test PRIVATE cpuinfo_mock gtest)
    ADD_TEST(NAME pixel-2-xl-test COMMAND pixel-2-xl-test)

-    ADD_EXECUTABLE(pixel-8-test test/mock/pixel-8.cc)
-    TARGET_INCLUDE_DIRECTORIES(pixel-8-test BEFORE PRIVATE test/mock)
-    TARGET_LINK_LIBRARIES(pixel-8-test PRIVATE cpuinfo_mock gtest)
-    ADD_TEST(NAME pixel-8-test COMMAND pixel-8-test)
-
    ADD_EXECUTABLE(xiaomi-mi-5c-test test/mock/xiaomi-mi-5c.cc)
    TARGET_INCLUDE_DIRECTORIES(xiaomi-mi-5c-test BEFORE PRIVATE test/mock)
    TARGET_LINK_LIBRARIES(xiaomi-mi-5c-test PRIVATE cpuinfo_mock gtest)
--- a/3rdparty/cpuinfo/README.md
+++ b/3rdparty/cpuinfo/README.md
@@ -9,7 +9,7 @@ cpuinfo is a library to detect essential for performance optimization informatio
 ## Features

 - **Cross-platform** availability:
-  - Linux, Windows, macOS, Android, iOS and FreeBSD operating systems
+  - Linux, Windows, macOS, Android, and iOS operating systems
  - x86, x86-64, ARM, and ARM64 architectures
 - Modern **C/C++ interface**
  - Thread-safe
@@ -258,8 +258,6 @@ LDFLAGS+= $(pkg-config --libs libcpuinfo)
  - [x] x86
  - [x] x86-64
  - [x] arm64
- [x] FreeBSD
-  - [x] x86-64

 ## Methods

--- a/3rdparty/cpuinfo/cmake/DownloadGoogleBenchmark.cmake
+++ b/3rdparty/cpuinfo/cmake/DownloadGoogleBenchmark.cmake
@@ -1,11 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.18 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)

 PROJECT(googlebenchmark-download NONE)

 INCLUDE(ExternalProject)
 ExternalProject_Add(googlebenchmark
-	URL https://github.com/google/benchmark/archive/refs/tags/v1.9.4.tar.gz
-	URL_HASH SHA256=b334658edd35efcf06a99d9be21e4e93e092bd5f95074c1673d5c8705d95c104
+	URL https://github.com/google/benchmark/archive/v1.6.1.zip
+	URL_HASH SHA256=367e963b8620080aff8c831e24751852cffd1f74ea40f25d9cc1b667a9dd5e45
 	SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googlebenchmark"
 	BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googlebenchmark"
 	CONFIGURE_COMMAND ""
--- a/3rdparty/cpuinfo/cmake/DownloadGoogleTest.cmake
+++ b/3rdparty/cpuinfo/cmake/DownloadGoogleTest.cmake
@@ -1,11 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.18 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)

 PROJECT(googletest-download NONE)

 INCLUDE(ExternalProject)
 ExternalProject_Add(googletest
-	URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
-	URL_HASH SHA256=40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff
+	URL https://github.com/google/googletest/archive/release-1.11.0.zip
+	URL_HASH SHA256=353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a
 	SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest"
 	BINARY_DIR "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest"
 	CONFIGURE_COMMAND ""
--- a/3rdparty/cpuinfo/include/cpuinfo.h
+++ b/3rdparty/cpuinfo/include/cpuinfo.h
@@ -353,8 +353,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_palm_cove = 0x0010020B,
 	/** Intel Sunny Cove microarchitecture (10 nm, Ice Lake). */
 	cpuinfo_uarch_sunny_cove = 0x0010020C,
-	/** Intel Willow Cove microarchitecture (10 nm, Tiger Lake). */
-	cpuinfo_uarch_willow_cove = 0x0010020D,

 	/** Pentium 4 with Willamette, Northwood, or Foster cores. */
 	cpuinfo_uarch_willamette = 0x00100300,
@@ -373,14 +371,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_goldmont = 0x00100404,
 	/** Intel Goldmont Plus microarchitecture (Gemini Lake). */
 	cpuinfo_uarch_goldmont_plus = 0x00100405,
-	/** Intel Airmont microarchitecture (10 nm out-of-order Atom). */
-	cpuinfo_uarch_tremont = 0x00100406,
-	/** Intel Gracemont microarchitecture (AlderLake N). */
-	cpuinfo_uarch_gracemont = 0x00100407,
-	/** Intel Crestmont microarchitecture (Sierra Forest). */
-	cpuinfo_uarch_crestmont = 0x00100408,
-	/** Intel Darkmont microarchitecture (e-core used in Clearwater Forest). */
-	cpuinfo_uarch_darkmont = 0x00100409,

 	/** Intel Knights Ferry HPC boards. */
 	cpuinfo_uarch_knights_ferry = 0x00100500,
@@ -510,8 +500,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_cortex_x3 = 0x00300503,
 	/** ARM Cortex-X4. */
 	cpuinfo_uarch_cortex_x4 = 0x00300504,
-	/** ARM Cortex-X925. */
-	cpuinfo_uarch_cortex_x925 = 0x00300505,

 	/** ARM Cortex-A510. */
 	cpuinfo_uarch_cortex_a510 = 0x00300551,
@@ -523,8 +511,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_cortex_a715 = 0x00300572,
 	/** ARM Cortex-A720. */
 	cpuinfo_uarch_cortex_a720 = 0x00300573,
-	/** ARM Cortex-A725. */
-	cpuinfo_uarch_cortex_a725 = 0x00300574,

 	/** Qualcomm Scorpion. */
 	cpuinfo_uarch_scorpion = 0x00400100,
@@ -595,22 +581,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_avalanche = 0x0070010D,
 	/** Apple A15 / M2 processor (little cores). */
 	cpuinfo_uarch_blizzard = 0x0070010E,
-	/** Apple A16 processor (big cores). */
-	cpuinfo_uarch_everest = 0x00700200,
-	/** Apple A16 processor (little cores). */
-	cpuinfo_uarch_sawtooth = 0x00700201,
-	/** Apple A17 processor (big cores). */
-	cpuinfo_uarch_coll_everest = 0x00700202,
-	/** Apple A17 processor (little cores). */
-	cpuinfo_uarch_coll_sawtooth = 0x00700203,
-	/** Apple A18 processor (big cores). */
-	cpuinfo_uarch_tupai_everest = 0x00700204,
-	/** Apple A18 processor (little cores). */
-	cpuinfo_uarch_tupai_sawtooth = 0x00700205,
-	/** Apple A18 pro processor (big cores). */
-	cpuinfo_uarch_tahiti_everest = 0x00700206,
-	/** Apple A18 pro processor (little cores). */
-	cpuinfo_uarch_tahiti_sawtooth = 0x00700207,

 	/** Cavium ThunderX. */
 	cpuinfo_uarch_thunderx = 0x00800100,
@@ -736,7 +706,7 @@ struct cpuinfo_cluster {
 	uint64_t frequency;
 };

-#define CPUINFO_PACKAGE_NAME_MAX 64
+#define CPUINFO_PACKAGE_NAME_MAX 48

 struct cpuinfo_package {
 	/** SoC or processor chip model name */
@@ -1730,7 +1700,6 @@ struct cpuinfo_arm_isa {
 	bool sme_b16b16;
 	bool sme_f16f16;
 	uint32_t svelen;
-	uint32_t smelen;
 #endif
 	bool rdm;
 	bool fp16arith;
@@ -2112,15 +2081,6 @@ static inline uint32_t cpuinfo_get_max_arm_sve_length(void) {
 #endif
 }

-// Function to get the max SME vector length on ARM CPU's which support SME.
-static inline uint32_t cpuinfo_get_max_arm_sme_length(void) {
-#if CPUINFO_ARCH_ARM64
-	return cpuinfo_isa.smelen * 8; // bytes * 8 = bit length(vector length)
-#else
-	return 0;
-#endif
-}
-
 static inline bool cpuinfo_has_arm_sme(void) {
 #if CPUINFO_ARCH_ARM64
 	return cpuinfo_isa.sme;
--- a/3rdparty/cpuinfo/src/arm/linux/aarch64-isa.c
+++ b/3rdparty/cpuinfo/src/arm/linux/aarch64-isa.c
@@ -191,21 +191,4 @@ void cpuinfo_arm64_linux_decode_isa_from_proc_cpuinfo(
 		// Mask out the SVE vector length bits
 		isa->svelen = ret & PR_SVE_VL_LEN_MASK;
 	}
-
-#ifndef PR_SME_GET_VL
-#define PR_SME_GET_VL 64
-#endif
-
-#ifndef PR_SME_VL_LEN_MASK
-#define PR_SME_VL_LEN_MASK 0xffff
-#endif
-
-	ret = prctl(PR_SME_GET_VL);
-	if (ret < 0) {
-		cpuinfo_log_warning("No SME support on this machine");
-		isa->smelen = 0; // Assume no SME support if the call fails
-	} else {
-		// Mask out the SME vector length bits
-		isa->smelen = ret & PR_SME_VL_LEN_MASK;
-	}
 }
--- a/3rdparty/cpuinfo/src/arm/linux/chipset.c
+++ b/3rdparty/cpuinfo/src/arm/linux/chipset.c
@@ -468,56 +468,6 @@ static bool match_universal(const char* start, const char* end, struct cpuinfo_a
 	return true;
 }

-/**
- * Tries to match /s5e\d{4}$/ signature for Samsung Exynos chipsets.
- * If match successful, extracts model information into \p chipset argument.
- *
- * @param start - start of the platform identifier (ro.product.board or
- * ro.board.platform) to match.
- * @param end - end of the platform identifier (ro.product.board or
- * ro.board.platform) to match.
- * @param[out] chipset - location where chipset information will be stored upon
- * a successful match.
- *
- * @returns true if signature matched, false otherwise.
- */
-static bool match_s5e(const char* start, const char* end, struct cpuinfo_arm_chipset chipset[restrict static 1]) {
-	/* Expect exactly 7 symbols: "s5e" (3 symbols) + 4-digit model number */
-	if (start + 7 != end) {
-		return false;
-	}
-
-	/* Check that string starts with "s5e" */
-	if (start[0] != 's') {
-		return false;
-	}
-
-	/* Load next 2 bytes as little endian 16-bit word */
-	const uint16_t expected_5e = load_u16le(start + 1);
-	if (expected_5e != UINT16_C(0x6535) /* "e5" = reverse("5e") */) {
-		return false;
-	}
-
-	/* Check and parse 4-digit model number */
-	uint32_t model = 0;
-	for (uint32_t i = 3; i < 7; i++) {
-		const uint32_t digit = (uint32_t)(uint8_t)start[i] - '0';
-		if (digit >= 10) {
-			/* Not really a digit */
-			return false;
-		}
-		model = model * 10 + digit;
-	}
-
-	/* Return parsed chipset. */
-	*chipset = (struct cpuinfo_arm_chipset){
-		.vendor = cpuinfo_arm_chipset_vendor_samsung,
-		.series = cpuinfo_arm_chipset_series_samsung_exynos,
-		.model = model,
-	};
-	return true;
-}
-
 /**
 * Compares, case insensitively, a string to known values "SMDK4210" and
 * "SMDK4x12" for Samsung Exynos chipsets. If platform identifier matches one of
@@ -953,7 +903,7 @@ static bool match_sc(const char* start, const char* end, struct cpuinfo_arm_chip
 }

 /**
- * Tries to match, case-sentitively, /Unisoc T\d{3,4}/ or /UNISOC T\d{3,4}/ signature for Unisoc T
+ * Tries to match, case-sentitively, /Unisoc T\d{3,4}/ signature for Unisoc T
 * chipset. If match successful, extracts model information into \p chipset
 * argument.
 *
@@ -967,7 +917,7 @@ static bool match_sc(const char* start, const char* end, struct cpuinfo_arm_chip
 * @returns true if signature matched, false otherwise.
 */
 static bool match_t(const char* start, const char* end, struct cpuinfo_arm_chipset chipset[restrict static 1]) {
-	/* Expect 11-12 symbols: "Unisoc T" / "UNISOC T" (8 symbols) + 3-4-digit model number
+	/* Expect 11-12 symbols: "Unisoc T" (8 symbols) + 3-4-digit model number
 	 */
 	const size_t length = end - start;
 	switch (length) {
@@ -978,18 +928,16 @@ static bool match_t(const char* start, const char* end, struct cpuinfo_arm_chips
 			return false;
 	}

-	/* Check that string starts with "Unisoc T" or "UNISOC T". The first four characters
+	/* Check that string starts with "Unisoc T". The first four characters
 	 * are loaded as 32-bit little endian word */
 	const uint32_t expected_unis = load_u32le(start);
-	if (expected_unis != UINT32_C(0x73696E55) /* "sinU" = reverse("Unis") */ &&
-	    expected_unis != UINT32_C(0x53494E55) /* "SINU" = reverse("UNIS") */) {
+	if (expected_unis != UINT32_C(0x73696E55) /* "sinU" = reverse("Unis") */) {
 		return false;
 	}

 	/* The next four characters are loaded as 32-bit little endian word */
 	const uint32_t expected_oc_t = load_u32le(start + 4);
-	if (expected_oc_t != UINT32_C(0x5420636F) /* "T co" = reverse("oc T") */ &&
-	    expected_oc_t != UINT32_C(0x5420434F) /* "T CO" = reverse("OC T") */) {
+	if (expected_oc_t != UINT32_C(0x5420636F) /* "T co" = reverse("oc T") */) {
 		return false;
 	}

@@ -2889,15 +2837,6 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_product_bo
 		return chipset;
 	}

-	/* Check s5eXXXX (Samsung Exynos) signature */
-	if (match_s5e(board, board_end, &chipset)) {
-		cpuinfo_log_debug(
-			"matched S5E (Samsung Exynos) signature in ro.product.board string \"%.*s\"",
-			(int)board_length,
-			board);
-		return chipset;
-	}
-
 #if CPUINFO_ARCH_ARM
 	/* Check SMDK (Samsung Exynos) signature */
 	if (match_and_parse_smdk(board, board_end, cores, &chipset)) {
@@ -4010,20 +3949,6 @@ static inline struct cpuinfo_arm_chipset disambiguate_spreadtrum_chipset(
 	return *ro_board_platform_chipset;
 }

-static enum cpuinfo_arm_chipset_vendor disambiguate_chipset_vendor(
-	enum cpuinfo_arm_chipset_vendor vendor_a,
-	enum cpuinfo_arm_chipset_vendor vendor_b) {
-	/* Some UNISOC-based platforms reporting conflicting vendor names depending
-	 * on the source. For phones that report both UNISOC and Spreadtrum, treat it
-	 * as UNISOC. */
-	if ((vendor_a == cpuinfo_arm_chipset_vendor_unisoc && vendor_b == cpuinfo_arm_chipset_vendor_spreadtrum) ||
-	    (vendor_a == cpuinfo_arm_chipset_vendor_spreadtrum && vendor_b == cpuinfo_arm_chipset_vendor_unisoc)) {
-		return cpuinfo_arm_chipset_vendor_unisoc;
-	}
-
-	return cpuinfo_arm_chipset_vendor_unknown;
-}
-
 /*
 * Decodes chipset name from Android system properties:
 * - /proc/cpuinfo Hardware string
@@ -4084,19 +4009,10 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset(
 			} else if (vendor != decoded_vendor) {
 				/* Parsing different system properties produces
 				 * different chipset vendors. This situation is
-				 * rare. Try to disambiguate for known cases,
-				 * otherwise treat as unknown. */
-
-				enum cpuinfo_arm_chipset_vendor disambiguated_vendor =
-					disambiguate_chipset_vendor(vendor, decoded_vendor);
-
-				if (disambiguated_vendor != cpuinfo_arm_chipset_vendor_unknown) {
-					vendor = disambiguated_vendor;
-				} else {
-					cpuinfo_log_error(
-						"chipset detection failed: different chipset vendors reported in different system properties");
-					goto finish;
-				}
+				 * rare. */
+				cpuinfo_log_error(
+					"chipset detection failed: different chipset vendors reported in different system properties");
+				goto finish;
 			}
 		}
 	}
--- a/3rdparty/cpuinfo/src/arm/mach/init.c
+++ b/3rdparty/cpuinfo/src/arm/mach/init.c
@@ -27,45 +27,6 @@
 #ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
 #define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
 #endif
-// Following are copied over from ncnn/src/cpu.cpp
-// A16
-#ifndef CPUFAMILY_ARM_EVEREST_SAWTOOTH
-#define CPUFAMILY_ARM_EVEREST_SAWTOOTH 0x8765edea
-#endif
-// A17
-#ifndef CPUFAMILY_ARM_COLL
-#define CPUFAMILY_ARM_COLL 0x2876f5b5
-#endif
-// A18
-#ifndef CPUFAMILY_ARM_TUPAI
-#define CPUFAMILY_ARM_TUPAI 0x204526d0
-#endif
-// A18 Pro
-#ifndef CPUFAMILY_ARM_TAHITI
-#define CPUFAMILY_ARM_TAHITI 0x75d4acb9
-#endif
-// For M3/M4 we need to populate more information about
-// efficiency and perf cores.
-// M3
-#ifndef CPUFAMILY_ARM_IBIZA
-#define CPUFAMILY_ARM_IBIZA 0xfa33415e
-#endif
-// M3 Pro
-#ifndef CPUFAMILY_ARM_LOBOS
-#define CPUFAMILY_ARM_LOBOS 0x5f4dea93
-#endif
-// M3 Max
-#ifndef CPUFAMILY_ARM_PALMA
-#define CPUFAMILY_ARM_PALMA 0x72015832
-#endif
-// M4
-#ifndef CPUFAMILY_ARM_DONAN
-#define CPUFAMILY_ARM_DONAN 0x6f5129ac
-#endif
-// M4 Pro / M4 Max
-#ifndef CPUFAMILY_ARM_BRAVA
-#define CPUFAMILY_ARM_BRAVA 0x17d5b93a
-#endif

 struct cpuinfo_arm_isa cpuinfo_isa = {
 	.aes = true,
@@ -132,23 +93,6 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 		case CPUFAMILY_ARM_AVALANCHE_BLIZZARD:
 			/* Hexa-core: 2x Avalanche + 4x Blizzard */
 			return core_index + 4 < core_count ? cpuinfo_uarch_avalanche : cpuinfo_uarch_blizzard;
-		case CPUFAMILY_ARM_EVEREST_SAWTOOTH:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
-			return core_index + 4 < core_count ? cpuinfo_uarch_everest : cpuinfo_uarch_sawtooth;
-			return core_index + 4 < core_count ? cpuinfo_uarch_avalanche : cpuinfo_uarch_blizzard;
-		case CPUFAMILY_ARM_COLL:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
-			return core_index + 4 < core_count ? cpuinfo_uarch_coll_everest : cpuinfo_uarch_coll_sawtooth;
-
-		case CPUFAMILY_ARM_TUPAI:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
-			return core_index + 4 < core_count ? cpuinfo_uarch_tupai_everest : cpuinfo_uarch_tupai_sawtooth;
-
-		case CPUFAMILY_ARM_TAHITI:
-			/* Hexa-core: 2x Avalanche + 4x Blizzard */
-			return core_index + 4 < core_count ? cpuinfo_uarch_tahiti_everest
-							   : cpuinfo_uarch_tahiti_sawtooth;
-
 		default:
 			/* Use hw.cpusubtype for detection */
 			break;
--- a/3rdparty/cpuinfo/src/arm/uarch.c
+++ b/3rdparty/cpuinfo/src/arm/uarch.c
@@ -125,18 +125,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0xD4F: /* Neoverse V2 */
 					*uarch = cpuinfo_uarch_neoverse_v2;
 					break;
-				case 0xD81: /* Cortex-A720 */
-					*uarch = cpuinfo_uarch_cortex_a720;
-					break;
-				case 0xD82: /* Cortex-X4 */
-					*uarch = cpuinfo_uarch_cortex_x4;
-					break;
-				case 0xD85: /* Cortex-X925 */
-					*uarch = cpuinfo_uarch_cortex_x925;
-					break;
-				case 0xD87: /* Cortex-A725 */
-					*uarch = cpuinfo_uarch_cortex_a725;
-					break;
 				default:
 					switch (midr_get_part(midr) >> 8) {
 #if CPUINFO_ARCH_ARM
--- a/3rdparty/cpuinfo/src/arm/windows/init-by-logical-sys-info.c
+++ b/3rdparty/cpuinfo/src/arm/windows/init-by-logical-sys-info.c
@@ -750,6 +750,12 @@ void store_core_info_per_processor(
 	if (cores) {
 		processors[processor_global_index].core = cores + core_id;
 		cores[core_id].core_id = core_id;
+
+		if (chip_info->uarchs == NULL) {
+			cpuinfo_log_error("uarch is NULL for core %d", core_id);
+			return;
+		}
+
 		cores[core_id].uarch = chip_info->uarchs[0].uarch;
 		cores[core_id].frequency = chip_info->uarchs[0].frequency;

@@ -836,6 +842,7 @@ static bool connect_packages_cores_clusters_by_processors(
 		processor->cluster = cluster;

 		if (chip_info) {
+			size_t converted_chars = 0;
 			if (!WideCharToMultiByte(
 				    CP_UTF8,
 				    WC_ERR_INVALID_CHARS,
--- a/3rdparty/cpuinfo/src/arm/windows/init.c
+++ b/3rdparty/cpuinfo/src/arm/windows/init.c
@@ -21,6 +21,7 @@ static struct woa_chip_info woa_chip_unknown = {L"Unknown", {{cpuinfo_vendor_unk

 BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context) {
 	struct woa_chip_info* chip_info = NULL;
+	enum cpuinfo_vendor vendor = cpuinfo_vendor_unknown;

 	set_cpuinfo_isa_fields();

@@ -133,26 +134,6 @@ static struct core_info_by_chip_name get_core_info_from_midr(uint32_t midr, uint
 	return info;
 }

-/* https://developer.arm.com/documentation/ddi0601/2024-06/AArch64-Registers
-  CP 4000: MIDR_EL1
-  CP 4020: ID_AA64PFR0_EL1
-  CP 4021: ID_AA64PFR1_EL1
-  CP 4028: ID_AA64DFR0_EL1
-  CP 4029: ID_AA64DFR1_EL1
-  CP 402C: ID_AA64AFR0_EL1
-  CP 402D: ID_AA64AFR1_EL1
-  CP 4030: ID_AA64ISAR0_EL1
-  CP 4031: ID_AA64ISAR1_EL1
-  CP 4038: ID_AA64MMFR0_EL1
-  CP 4039: ID_AA64MMFR1_EL1
-  CP 403A: ID_AA64MMFR2_EL1
-  CP 4080: ?
-  CP 4081: ?
-  CP 4100: ?
-  CP 4510: ?
-  CP 5801: ?
-  */
-
 static struct woa_chip_info* get_system_info_from_registry(void) {
 	wchar_t* text_buffer = NULL;
 	LPCWSTR cpu0_subkey = L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0";
@@ -214,40 +195,21 @@ static void set_cpuinfo_isa_fields(void) {
 	const bool dotprod = IsProcessorFeaturePresent(PF_ARM_V82_DP_INSTRUCTIONS_AVAILABLE) != 0;
 	cpuinfo_isa.dot = dotprod;

-	cpuinfo_isa.sve = IsProcessorFeaturePresent(PF_ARM_SVE_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.sve2 = IsProcessorFeaturePresent(PF_ARM_SVE2_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.i8mm = IsProcessorFeaturePresent(PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.jscvt = IsProcessorFeaturePresent(PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.fcma = IsProcessorFeaturePresent(PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE) != 0;
-	// FEAT_FP16 Implies FEAT_FHM in 8.4
-	// https://developer.arm.com/documentation/109697/2025_09/Feature-descriptions/The-Armv8-4-architecture-extension?lang=en
-	cpuinfo_isa.fhm = IsProcessorFeaturePresent(PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.fp16arith = cpuinfo_isa.fhm;
-
-	cpuinfo_isa.sme = IsProcessorFeaturePresent(PF_ARM_SME_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.sme2 = IsProcessorFeaturePresent(PF_ARM_SME2_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.sme2p1 = IsProcessorFeaturePresent(PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.sme_b16b16 = IsProcessorFeaturePresent(PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE) != 0;
-	cpuinfo_isa.sme_f16f16 = IsProcessorFeaturePresent(PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE) != 0;
-
-	// TODO: Add when available in Windows SDK
-	// - sme_i16i32
-	// - sme_bi32i32
-
-	cpuinfo_isa.bf16 = IsProcessorFeaturePresent(PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE) != 0;
-
-	// TODO: This is not available in the Windows SDK yet , so conservatively go with the lowest value (128 bits)
-	// https://developer.arm.com/documentation/101427/0102/Register-descriptions/Scalable-vector-extensions--SVE--registers/ZCR-EL1--SVE-Control-Register--EL1
-	cpuinfo_isa.svelen =
-		cpuinfo_isa.sve ? 128 / 8 : 0; // This value is in bytes, see cpuinfo_get_max_arm_sve_length
-
-	// TODO : Fetch from feature registers when available
-	// cpuinfo_isa.smelen = 0;
-
-	// Assume that Dot Product support implies FP16
-	// arithmetics and RDM support. ARM manuals don't
-	// guarantee that, but it holds in practice.
-	cpuinfo_isa.rdm = dotprod;
+	SYSTEM_INFO system_info;
+	GetSystemInfo(&system_info);
+	switch (system_info.wProcessorLevel) {
+		case 0x803: // Kryo 385 Silver (Snapdragon 850)
+			cpuinfo_isa.fp16arith = dotprod;
+			cpuinfo_isa.rdm = dotprod;
+			break;
+		default:
+			// Assume that Dot Product support implies FP16
+			// arithmetics and RDM support. ARM manuals don't
+			// guarantee that, but it holds in practice.
+			cpuinfo_isa.fp16arith = dotprod;
+			cpuinfo_isa.rdm = dotprod;
+			break;
+	}

 	/* Windows API reports all or nothing for cryptographic instructions. */
 	const bool crypto = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) != 0;
@@ -257,4 +219,4 @@ static void set_cpuinfo_isa_fields(void) {
 	cpuinfo_isa.pmull = crypto;

 	cpuinfo_isa.crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != 0;
-}
+}
--- a/3rdparty/cpuinfo/src/arm/windows/windows-arm-init.h
+++ b/3rdparty/cpuinfo/src/arm/windows/windows-arm-init.h
@@ -19,63 +19,3 @@ struct woa_chip_info {
 };

 bool cpu_info_init_by_logical_sys_info(const struct woa_chip_info* chip_info, enum cpuinfo_vendor vendor);
-
-#ifndef PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE (27)
-#endif
-
-#ifndef PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE (34)
-#endif
-
-#ifndef PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE (44)
-#endif
-
-#ifndef PF_ARM_SVE_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SVE_INSTRUCTIONS_AVAILABLE (46)
-#endif
-
-#ifndef PF_ARM_SVE2_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SVE2_INSTRUCTIONS_AVAILABLE (47)
-#endif
-
-#ifndef PF_ARM_SME_BI32I32_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME_BI32I32_INSTRUCTIONS_AVAILABLE (55)
-#endif
-
-#ifndef PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V82_I8MM_INSTRUCTIONS_AVAILABLE (66)
-#endif
-
-#ifndef PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V86_BF16_INSTRUCTIONS_AVAILABLE (68)
-#endif
-
-#ifndef PF_ARM_SME_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME_INSTRUCTIONS_AVAILABLE (70)
-#endif
-
-#ifndef PF_ARM_SME2_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME2_INSTRUCTIONS_AVAILABLE (71)
-#endif
-
-#ifndef PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME2_1_INSTRUCTIONS_AVAILABLE (72)
-#endif
-
-#ifndef PF_ARM_SME2_2_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME2_2_INSTRUCTIONS_AVAILABLE (73)
-#endif
-
-#ifndef PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME_F16F16_INSTRUCTIONS_AVAILABLE (83)
-#endif
-
-#ifndef PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_SME_B16B16_INSTRUCTIONS_AVAILABLE (84)
-#endif
-
-#ifndef PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE
-#define PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE (67)
-#endif
--- a/3rdparty/cpuinfo/src/riscv/linux/riscv-hw.c
+++ b/3rdparty/cpuinfo/src/riscv/linux/riscv-hw.c
@@ -112,7 +112,7 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	 *
 	 * for more details.
 	 */
-	int ret = syscall(NR_riscv_hwprobe, pairs, pairs_count, cpu_set_size, cpu_set, 0 /* flags */);
+	int ret = syscall(NR_riscv_hwprobe, pairs, pairs_count, cpu_set_size, (unsigned long*)cpu_set, 0 /* flags */);
 #else
 	int ret = __riscv_hwprobe(pairs, pairs_count, cpu_set_size, (unsigned long*)cpu_set, 0 /* flags */);
 #endif
--- a/3rdparty/cpuinfo/src/x86/api.h
+++ b/3rdparty/cpuinfo/src/x86/api.h
@@ -105,7 +105,6 @@ CPUINFO_INTERNAL void cpuinfo_x86_detect_topology(
 CPUINFO_INTERNAL void cpuinfo_x86_detect_cache(
 	uint32_t max_base_index,
 	uint32_t max_extended_index,
-	/* amd_topology_extensions is not used, kept for backward compatibility */
 	bool amd_topology_extensions,
 	enum cpuinfo_vendor vendor,
 	const struct cpuinfo_x86_model_info* model_info,
--- a/3rdparty/cpuinfo/src/x86/cache/init.c
+++ b/3rdparty/cpuinfo/src/x86/cache/init.c
@@ -87,7 +87,7 @@ void cpuinfo_x86_detect_cache(
 			}
 		}
 	}
-	if (max_extended_index >= UINT32_C(0x8000001D)) {
+	if (amd_topology_extensions && max_extended_index >= UINT32_C(0x8000001D)) {
 		struct cpuid_regs leaf0x8000001D;
 		uint32_t input_ecx = 0;
 		do {
--- a/3rdparty/cpuinfo/src/x86/init.c
+++ b/3rdparty/cpuinfo/src/x86/init.c
@@ -72,7 +72,7 @@ void cpuinfo_x86_init_processor(struct cpuinfo_x86_processor* processor) {
 		for (uint32_t i = 0; i < 3; i++) {
 			brand_string[i] = cpuid(UINT32_C(0x80000002) + i);
 		}
-		memcpy(processor->brand_string, brand_string, sizeof(brand_string));
+		memcpy(processor->brand_string, brand_string, sizeof(processor->brand_string));
 		cpuinfo_log_debug("raw CPUID brand string: \"%48s\"", processor->brand_string);
 	}
 }
--- a/3rdparty/cpuinfo/src/x86/linux/cpuinfo.c
+++ b/3rdparty/cpuinfo/src/x86/linux/cpuinfo.c
@@ -80,7 +80,11 @@ struct proc_cpuinfo_parser_state {
 *	Decode a single line of /proc/cpuinfo information.
 *	Lines have format <words-with-spaces>[ ]*:[ ]<space-separated words>
 */
-static bool parse_line(const char* line_start, const char* line_end, void* context, uint64_t line_number) {
+static bool parse_line(
+	const char* line_start,
+	const char* line_end,
+	void* context,
+	uint64_t line_number) {
 	struct proc_cpuinfo_parser_state* restrict state = context;
 	/* Empty line. Skip. */
 	if (line_start == line_end) {
@@ -211,5 +215,6 @@ bool cpuinfo_x86_linux_parse_proc_cpuinfo(
 		.max_processors_count = max_processors_count,
 		.processors = processors,
 	};
-	return cpuinfo_linux_parse_multiline_file("/proc/cpuinfo", BUFFER_SIZE, parse_line, &state);
+	return cpuinfo_linux_parse_multiline_file(
+		"/proc/cpuinfo", BUFFER_SIZE, parse_line, &state);
 }
--- a/3rdparty/cpuinfo/src/x86/uarch.c
+++ b/3rdparty/cpuinfo/src/x86/uarch.c
@@ -168,9 +168,6 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 						case 0x7E: // Ice Lake-U
 							return cpuinfo_uarch_sunny_cove;

-						case 0x8C: // Tiger U
-						case 0x8D: // Tiger H
-							return cpuinfo_uarch_willow_cove;
 						/* Low-power cores */
 						case 0x1C: // Diamondville,
 							   // Silverthorne,
@@ -188,17 +185,6 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 						case 0x5A: // Moorefield
 						case 0x5D: // SoFIA
 							return cpuinfo_uarch_silvermont;
-						case 0x86: // Jasper Lake
-						case 0x8A: // Lakefield
-						case 0x96: // Elkhart Lake
-						case 0x9C: // Jacobsville
-							return cpuinfo_uarch_tremont;
-						case 0xBE: // Alder Lake-N
-							return cpuinfo_uarch_gracemont;
-						case 0xAF: // Sierra Forest
-							return cpuinfo_uarch_crestmont;
-						case 0xDD: // Clearwater Forest
-							return cpuinfo_uarch_darkmont;
 						case 0x4C: // Braswell, Cherry
 							   // Trail
 						case 0x75: // Spreadtrum
--- a/3rdparty/cubeb/README.md
+++ b/3rdparty/cubeb/README.md
@@ -1,117 +1,7 @@
-# libcubeb - Cross-platform Audio I/O Library
-
 [![Build Status](https://github.com/mozilla/cubeb/actions/workflows/build.yml/badge.svg)](https://github.com/mozilla/cubeb/actions/workflows/build.yml)

-`libcubeb` is a cross-platform C library for high and low-latency audio input/output. It provides a simple, consistent API for audio playback and recording across multiple platforms and audio backends. It is written in C, C++ and Rust, with a C ABI and [Rust](https://github.com/mozilla/cubeb-rs) bindings. While originally written for use in the Firefox Web browser, a number of other software projects have adopted it.
+See INSTALL.md for build instructions.

-## Features
+See [Backend Support](https://github.com/mozilla/cubeb/wiki/Backend-Support) in the wiki for the support level of each backend.

- **Cross-platform support**: Windows, macOS, Linux, Android, and other platforms
- **Versatile**: Optimized for low-latency real-time audio applications, or power efficient higher latency playback
- **A/V sync**: Latency compensated audio clock reporting for easy audio/video synchronization
- **Full-duplex support**: Simultaneous audio input and output, reclocked
- **Device enumeration**: Query available audio devices
- **Audio processing for speech**: Can use VoiceProcessing IO on recent macOS
-
-## Supported Backends & status
-
-| *Backend*         | *Support Level* | *Platform version* | *Notes*                                          |
-|-------------------|-----------------|--------------------|--------------------------------------------------|
-| PulseAudio (Rust) | Tier-1          |                    | Main Linux desktop backend                       |
-| AudioUnit (Rust)  | Tier-1          |                    | Main macOS backend                               |
-| WASAPI            | Tier-1          | Windows >= 7       | Main Windows backend                             |
-| AAudio            | Tier-1          | Android >= 8       | Main Android backend for most devices            |
-| OpenSL            | Tier-1          | Android >= 2.3     | Android backend for older devices                |
-| OSS               | Tier-2          |                    |                                                  |
-| sndio             | Tier-2          |                    |                                                  |
-| Sun               | Tier-2          |                    |                                                  |
-| WinMM             | Tier-3          | Windows XP         | Was Tier-1, Firefox minimum Windows version 7.   |
-| AudioTrack        | Tier-3          | Android < 2.3      | Was Tier-1, Firefox minimum Android version 4.1. |
-| ALSA              | Tier-3          |                    |                                                  |
-| JACK              | Tier-3          |                    |                                                  |
-| KAI               | Tier-3          |                    |                                                  |
-| PulseAudio (C)    | Tier-4          |                    | Was Tier-1, superseded by Rust                   |
-| AudioUnit (C++)   | Tier-4          |                    | Was Tier-1, superseded by Rust                   |
-
-Tier-1: Actively maintained.  Should have CI coverage. Critical for Firefox.
-
-Tier-2: Actively maintained by contributors.  CI coverage appreciated.
-
-Tier-3: Maintainers/patches accepted.  Status unclear.
-
-Tier-4: Deprecated, obsolete.  Scheduled to be removed.
-
-Note that the support level is not a judgement of the relative merits
-of a backend, only the current state of support, which is informed
-by Firefox's needs, the responsiveness of a backend's
-maintainer, and the level of contributions to that backend.
-
-## Building
-
-### Prerequisites
-
- CMake 3.15 or later
- Non-ancient MSVC, clang or gcc, for compiling both C and C++
- Platform-specific audio libraries (automatically detected)
- Optional but recommended: Rust compiler to compile and link more recent backends for macOS and PulseAudio
-
-### Quick build
-
-```bash
-git clone https://github.com/mozilla/cubeb.git
-cd cubeb
-cmake -B build
-cmake --build build
-```
-
-### Better build with Rust backends
-
-```bash
-git clone --recursive https://github.com/mozilla/cubeb.git
-cd cubeb
-cmake -B build -DBUILD_RUST_LIBS=ON
-cmake --build build
-```
-
-### Platform-Specific Notes
-
-**Windows**: Supports Visual Studio 2015+ and MinGW-w64. Use `-G "Visual Studio 16 2019"` or `-G "MinGW Makefiles"`.
-
-**macOS**: Requires Xcode command line tools. Audio frameworks are automatically linked.
-
-**Linux**: Development packages for desired backends:
-```bash
-# Ubuntu/Debian
-sudo apt-get install libpulse-dev libasound2-dev libjack-dev
-
-# Fedora/RHEL
-sudo dnf install pulseaudio-libs-devel alsa-lib-devel jack-audio-connection-kit-devel
-```
-
-**Android**: Use with Android NDK. AAudio requires API level 26+.
-
-## Testing
-
-Run the test suite:
-```bash
-cd build
-ctest
-```
-
-Use the interactive test tool:
-```bash
-./cubeb-test
-```
-
-## License
-
-Licensed under an ISC-style license. See [LICENSE](LICENSE) for details.
-
-## Contributing
-
-Contributions are welcome! Please see the [contribution guidelines](CONTRIBUTING.md) and check the [issue tracker](https://github.com/mozilla/cubeb/issues).
-
-## Links
-
- [GitHub Repository](https://github.com/mozilla/cubeb)
- [API Documentation](https://mozilla.github.io/cubeb/)
+Licensed under an ISC-style license.  See LICENSE for details.
--- a/3rdparty/cubeb/include/cubeb/cubeb.h
+++ b/3rdparty/cubeb/include/cubeb/cubeb.h
@@ -49,7 +49,6 @@ extern "C" {
    output_params.channels = 2;
    output_params.layout = CUBEB_LAYOUT_UNDEFINED;
    output_params.prefs = CUBEB_STREAM_PREF_NONE;
-    output_params.input_params = CUBEB_INPUT_PROCESSING_PARAM_NONE;

    rv = cubeb_get_min_latency(app_ctx, &output_params, &latency_frames);
    if (rv != CUBEB_OK) {
@@ -63,7 +62,6 @@ extern "C" {
    input_params.channels = 1;
    input_params.layout = CUBEB_LAYOUT_UNDEFINED;
    input_params.prefs = CUBEB_STREAM_PREF_NONE;
-    input_params.input_params = CUBEB_INPUT_PROCESSING_PARAM_NONE;

    cubeb_stream * stm;
    rv = cubeb_stream_init(app_ctx, &stm, "Example Stream 1",
@@ -195,39 +193,39 @@ typedef uint32_t cubeb_channel_layout;
 // Some common layout definitions.
 enum {
  CUBEB_LAYOUT_UNDEFINED = 0, // Indicate the speaker's layout is undefined.
-  CUBEB_LAYOUT_MONO = CHANNEL_FRONT_CENTER,
-  CUBEB_LAYOUT_MONO_LFE = CUBEB_LAYOUT_MONO | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_STEREO = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT,
-  CUBEB_LAYOUT_STEREO_LFE = CUBEB_LAYOUT_STEREO | CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_MONO = (uint32_t)CHANNEL_FRONT_CENTER,
+  CUBEB_LAYOUT_MONO_LFE = (uint32_t)CUBEB_LAYOUT_MONO | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_STEREO = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT,
+  CUBEB_LAYOUT_STEREO_LFE = (uint32_t)CUBEB_LAYOUT_STEREO | (uint32_t)CHANNEL_LOW_FREQUENCY,
  CUBEB_LAYOUT_3F =
-      CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_FRONT_CENTER,
-  CUBEB_LAYOUT_3F_LFE = CUBEB_LAYOUT_3F | CHANNEL_LOW_FREQUENCY,
+      (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT | (uint32_t)CHANNEL_FRONT_CENTER,
+  CUBEB_LAYOUT_3F_LFE = (uint32_t)CUBEB_LAYOUT_3F | (uint32_t)CHANNEL_LOW_FREQUENCY,
  CUBEB_LAYOUT_2F1 =
-      CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT | CHANNEL_BACK_CENTER,
-  CUBEB_LAYOUT_2F1_LFE = CUBEB_LAYOUT_2F1 | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_3F1 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                     CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER,
-  CUBEB_LAYOUT_3F1_LFE = CUBEB_LAYOUT_3F1 | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_2F2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                     CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT,
-  CUBEB_LAYOUT_2F2_LFE = CUBEB_LAYOUT_2F2 | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_QUAD = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                      CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT,
-  CUBEB_LAYOUT_QUAD_LFE = CUBEB_LAYOUT_QUAD | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_3F2 = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                     CHANNEL_FRONT_CENTER | CHANNEL_SIDE_LEFT |
-                     CHANNEL_SIDE_RIGHT,
-  CUBEB_LAYOUT_3F2_LFE = CUBEB_LAYOUT_3F2 | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_3F2_BACK = CUBEB_LAYOUT_QUAD | CHANNEL_FRONT_CENTER,
-  CUBEB_LAYOUT_3F2_LFE_BACK = CUBEB_LAYOUT_3F2_BACK | CHANNEL_LOW_FREQUENCY,
-  CUBEB_LAYOUT_3F3R_LFE = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                          CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY |
-                          CHANNEL_BACK_CENTER | CHANNEL_SIDE_LEFT |
-                          CHANNEL_SIDE_RIGHT,
-  CUBEB_LAYOUT_3F4_LFE = CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT |
-                         CHANNEL_FRONT_CENTER | CHANNEL_LOW_FREQUENCY |
-                         CHANNEL_BACK_LEFT | CHANNEL_BACK_RIGHT |
-                         CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT,
+      (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT | (uint32_t)CHANNEL_BACK_CENTER,
+  CUBEB_LAYOUT_2F1_LFE = (uint32_t)CUBEB_LAYOUT_2F1 | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_3F1 = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                     (uint32_t)CHANNEL_FRONT_CENTER | (uint32_t)CHANNEL_BACK_CENTER,
+  CUBEB_LAYOUT_3F1_LFE = (uint32_t)CUBEB_LAYOUT_3F1 | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_2F2 = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                     (uint32_t)CHANNEL_SIDE_LEFT | (uint32_t)CHANNEL_SIDE_RIGHT,
+  CUBEB_LAYOUT_2F2_LFE = (uint32_t)CUBEB_LAYOUT_2F2 | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_QUAD = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                      (uint32_t)CHANNEL_BACK_LEFT | (uint32_t)CHANNEL_BACK_RIGHT,
+  CUBEB_LAYOUT_QUAD_LFE = (uint32_t)CUBEB_LAYOUT_QUAD | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_3F2 = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                     (uint32_t)CHANNEL_FRONT_CENTER | (uint32_t)CHANNEL_SIDE_LEFT |
+                     (uint32_t)CHANNEL_SIDE_RIGHT,
+  CUBEB_LAYOUT_3F2_LFE = (uint32_t)CUBEB_LAYOUT_3F2 | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_3F2_BACK = (uint32_t)CUBEB_LAYOUT_QUAD | (uint32_t)CHANNEL_FRONT_CENTER,
+  CUBEB_LAYOUT_3F2_LFE_BACK = (uint32_t)CUBEB_LAYOUT_3F2_BACK | (uint32_t)CHANNEL_LOW_FREQUENCY,
+  CUBEB_LAYOUT_3F3R_LFE = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                          (uint32_t)CHANNEL_FRONT_CENTER | (uint32_t)CHANNEL_LOW_FREQUENCY |
+                          (uint32_t)CHANNEL_BACK_CENTER | (uint32_t)CHANNEL_SIDE_LEFT |
+                          (uint32_t)CHANNEL_SIDE_RIGHT,
+  CUBEB_LAYOUT_3F4_LFE = (uint32_t)CHANNEL_FRONT_LEFT | (uint32_t)CHANNEL_FRONT_RIGHT |
+                         (uint32_t)CHANNEL_FRONT_CENTER | (uint32_t)CHANNEL_LOW_FREQUENCY |
+                         (uint32_t)CHANNEL_BACK_LEFT | (uint32_t)CHANNEL_BACK_RIGHT |
+                         (uint32_t)CHANNEL_SIDE_LEFT | (uint32_t)CHANNEL_SIDE_RIGHT,
 };

 /** Miscellaneous stream preferences. */
@@ -281,10 +279,7 @@ typedef struct {
  cubeb_channel_layout
      layout; /**< Requested channel layout. This must be consistent with the
                 provided channels. CUBEB_LAYOUT_UNDEFINED if unknown */
-  cubeb_stream_prefs prefs;                   /**< Requested preferences. */
-  cubeb_input_processing_params input_params; /**< Requested input processing
-     params. Ignored for output streams. At present, only supported on the
-     WASAPI backend; others should use cubeb_set_input_processing_params.  */
+  cubeb_stream_prefs prefs; /**< Requested preferences. */
 } cubeb_stream_params;

 /** Audio device description */
@@ -419,13 +414,6 @@ typedef struct {
  size_t count;               /**< Device count in collection. */
 } cubeb_device_collection;

-/** Array of compiled backends returned by `cubeb_get_backend_names`. */
-typedef struct {
-  const char * const *
-      names;    /**< Array of strings representing backend names. */
-  size_t count; /**< Length of the array. */
-} cubeb_backend_names;
-
 /** User supplied data callback.
    - Calling other cubeb functions from this callback is unsafe.
    - The code in the callback should be non-blocking.
@@ -466,8 +454,6 @@ typedef void (*cubeb_device_changed_callback)(void * user_ptr);

 /**
 * User supplied callback called when the underlying device collection changed.
- * This callback will be called when devices are added or removed from the
- * system, or when the default device changes for the specified device type.
 * @param context A pointer to the cubeb context.
 * @param user_ptr The pointer passed to
 * cubeb_register_device_collection_changed. */
@@ -499,18 +485,17 @@ CUBEB_EXPORT int
 cubeb_init(cubeb ** context, char const * context_name,
           char const * backend_name);

+/** Returns a list of backend names which can be supplid to cubeb_init().
+    Array is null-terminated. */
+CUBEB_EXPORT const char**
+cubeb_get_backend_names();
+
 /** Get a read-only string identifying this context's current backend.
    @param context A pointer to the cubeb context.
    @retval Read-only string identifying current backend. */
 CUBEB_EXPORT char const *
 cubeb_get_backend_id(cubeb * context);

-/** Get a read-only array of strings identifying available backends.
-    These can be passed as `backend_name` parameter to `cubeb_init`.
-    @retval Struct containing the array with backend names. */
-CUBEB_EXPORT cubeb_backend_names
-cubeb_get_backend_names();
-
 /** Get the maximum possible number of channels.
    @param context A pointer to the cubeb context.
    @param max_channels The maximum number of channels.
@@ -689,7 +674,7 @@ cubeb_stream_get_current_device(cubeb_stream * stm,
    application is accessing audio input. When all inputs are muted they can
    prove to the user that the application is not actively capturing any input.
    @param stream the stream for which to set input mute state
-    @param mute whether the input should mute or not
+    @param muted whether the input should mute or not
    @retval CUBEB_OK
    @retval CUBEB_ERROR_INVALID_PARAMETER if this stream does not have an input
            device
@@ -760,16 +745,14 @@ cubeb_device_collection_destroy(cubeb * context,
                                cubeb_device_collection * collection);

 /** Registers a callback which is called when the system detects
-    a new device or a device is removed, or when the default device
-    changes for the specified device type.
+    a new device or a device is removed.
    @param context
    @param devtype device type to include. Different callbacks and user pointers
           can be registered for each devtype. The hybrid devtype
           `CUBEB_DEVICE_TYPE_INPUT | CUBEB_DEVICE_TYPE_OUTPUT` is also valid
           and will register the provided callback and user pointer in both
   sides.
-    @param callback a function called whenever the system device list changes,
-           including when default devices change.
+    @param callback a function called whenever the system device list changes.
           Passing NULL allow to unregister a function. You have to unregister
           first before you register a new callback.
    @param user_ptr pointer to user specified data which will be present in
--- a/3rdparty/cubeb/src/cubeb.c
+++ b/3rdparty/cubeb/src/cubeb.c
@@ -31,10 +31,6 @@ struct cubeb_stream {
 int
 pulse_init(cubeb ** context, char const * context_name);
 #endif
-#if defined(USE_PULSE_RUST)
-int
-pulse_rust_init(cubeb ** contet, char const * context_name);
-#endif
 #if defined(USE_JACK)
 int
 jack_init(cubeb ** context, char const * context_name);
@@ -47,10 +43,6 @@ alsa_init(cubeb ** context, char const * context_name);
 int
 audiounit_init(cubeb ** context, char const * context_name);
 #endif
-#if defined(USE_AUDIOUNIT_RUST)
-int
-audiounit_rust_init(cubeb ** contet, char const * context_name);
-#endif
 #if defined(USE_WINMM)
 int
 winmm_init(cubeb ** context, char const * context_name);
@@ -63,30 +55,10 @@ wasapi_init(cubeb ** context, char const * context_name);
 int
 sndio_init(cubeb ** context, char const * context_name);
 #endif
-#if defined(USE_SUN)
-int
-sun_init(cubeb ** context, char const * context_name);
-#endif
-#if defined(USE_OPENSL)
-int
-opensl_init(cubeb ** context, char const * context_name);
-#endif
 #if defined(USE_OSS)
 int
 oss_init(cubeb ** context, char const * context_name);
 #endif
-#if defined(USE_AAUDIO)
-int
-aaudio_init(cubeb ** context, char const * context_name);
-#endif
-#if defined(USE_AUDIOTRACK)
-int
-audiotrack_init(cubeb ** context, char const * context_name);
-#endif
-#if defined(USE_KAI)
-int
-kai_init(cubeb ** context, char const * context_name);
-#endif

 static int
 validate_stream_params(cubeb_stream_params * input_stream_params,
@@ -151,10 +123,6 @@ cubeb_init(cubeb ** context, char const * context_name,
    if (!strcmp(backend_name, "pulse")) {
 #if defined(USE_PULSE)
      init_oneshot = pulse_init;
-#endif
-    } else if (!strcmp(backend_name, "pulse-rust")) {
-#if defined(USE_PULSE_RUST)
-      init_oneshot = pulse_rust_init;
 #endif
    } else if (!strcmp(backend_name, "jack")) {
 #if defined(USE_JACK)
@@ -167,10 +135,6 @@ cubeb_init(cubeb ** context, char const * context_name,
    } else if (!strcmp(backend_name, "audiounit")) {
 #if defined(USE_AUDIOUNIT)
      init_oneshot = audiounit_init;
-#endif
-    } else if (!strcmp(backend_name, "audiounit-rust")) {
-#if defined(USE_AUDIOUNIT_RUST)
-      init_oneshot = audiounit_rust_init;
 #endif
    } else if (!strcmp(backend_name, "wasapi")) {
 #if defined(USE_WASAPI)
@@ -183,30 +147,10 @@ cubeb_init(cubeb ** context, char const * context_name,
    } else if (!strcmp(backend_name, "sndio")) {
 #if defined(USE_SNDIO)
      init_oneshot = sndio_init;
-#endif
-    } else if (!strcmp(backend_name, "sun")) {
-#if defined(USE_SUN)
-      init_oneshot = sun_init;
-#endif
-    } else if (!strcmp(backend_name, "opensl")) {
-#if defined(USE_OPENSL)
-      init_oneshot = opensl_init;
 #endif
    } else if (!strcmp(backend_name, "oss")) {
 #if defined(USE_OSS)
      init_oneshot = oss_init;
-#endif
-    } else if (!strcmp(backend_name, "aaudio")) {
-#if defined(USE_AAUDIO)
-      init_oneshot = aaudio_init;
-#endif
-    } else if (!strcmp(backend_name, "audiotrack")) {
-#if defined(USE_AUDIOTRACK)
-      init_oneshot = audiotrack_init;
-#endif
-    } else if (!strcmp(backend_name, "kai")) {
-#if defined(USE_KAI)
-      init_oneshot = kai_init;
 #endif
    } else {
      /* Already set */
@@ -219,9 +163,6 @@ cubeb_init(cubeb ** context, char const * context_name,
     * to override all other choices
     */
    init_oneshot,
-#if defined(USE_PULSE_RUST)
-    pulse_rust_init,
-#endif
 #if defined(USE_PULSE)
    pulse_init,
 #endif
@@ -237,9 +178,6 @@ cubeb_init(cubeb ** context, char const * context_name,
 #if defined(USE_OSS)
    oss_init,
 #endif
-#if defined(USE_AUDIOUNIT_RUST)
-    audiounit_rust_init,
-#endif
 #if defined(USE_AUDIOUNIT)
    audiounit_init,
 #endif
@@ -251,18 +189,6 @@ cubeb_init(cubeb ** context, char const * context_name,
 #endif
 #if defined(USE_SUN)
    sun_init,
-#endif
-#if defined(USE_AAUDIO)
-    aaudio_init,
-#endif
-#if defined(USE_OPENSL)
-    opensl_init,
-#endif
-#if defined(USE_AUDIOTRACK)
-    audiotrack_init,
-#endif
-#if defined(USE_KAI)
-    kai_init,
 #endif
  };
  int i;
@@ -288,26 +214,13 @@ cubeb_init(cubeb ** context, char const * context_name,
  return CUBEB_ERROR;
 }

-char const *
-cubeb_get_backend_id(cubeb * context)
-{
-  if (!context) {
-    return NULL;
-  }
-
-  return context->ops->get_backend_id(context);
-}
-
-cubeb_backend_names
+const char**
 cubeb_get_backend_names()
 {
-  static const char * const backend_names[] = {
+  static const char* backend_names[] = {
 #if defined(USE_PULSE)
    "pulse",
 #endif
-#if defined(USE_PULSE_RUST)
-    "pulse-rust",
-#endif
 #if defined(USE_JACK)
    "jack",
 #endif
@@ -317,9 +230,6 @@ cubeb_get_backend_names()
 #if defined(USE_AUDIOUNIT)
    "audiounit",
 #endif
-#if defined(USE_AUDIOUNIT_RUST)
-    "audiounit-rust",
-#endif
 #if defined(USE_WASAPI)
    "wasapi",
 #endif
@@ -329,30 +239,23 @@ cubeb_get_backend_names()
 #if defined(USE_SNDIO)
    "sndio",
 #endif
-#if defined(USE_SUN)
-    "sun",
-#endif
-#if defined(USE_OPENSL)
-    "opensl",
-#endif
 #if defined(USE_OSS)
    "oss",
 #endif
-#if defined(USE_AAUDIO)
-    "aaudio",
-#endif
-#if defined(USE_AUDIOTRACK)
-    "audiotrack",
-#endif
-#if defined(USE_KAI)
-    "kai",
-#endif
+    NULL,
  };

-  return (cubeb_backend_names){
-      .names = backend_names,
-      .count = NELEMS(backend_names),
-  };
+  return backend_names;
+}
+
+char const *
+cubeb_get_backend_id(cubeb * context)
+{
+  if (!context) {
+    return NULL;
+  }
+
+  return context->ops->get_backend_id(context);
 }

 int
--- a/3rdparty/cubeb/src/cubeb_audiounit.cpp
+++ b/3rdparty/cubeb/src/cubeb_audiounit.cpp
@@ -213,19 +213,12 @@ struct cubeb_stream {
  cubeb_device_changed_callback device_changed_callback = nullptr;
  owned_critical_section device_changed_callback_lock;
  /* Stream creation parameters */
-  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE,
-                                             0,
-                                             0,
+  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
                                             CUBEB_LAYOUT_UNDEFINED,
-                                             CUBEB_STREAM_PREF_NONE,
-                                             CUBEB_INPUT_PROCESSING_PARAM_NONE};
-  cubeb_stream_params output_stream_params = {
-      CUBEB_SAMPLE_FLOAT32NE,
-      0,
-      0,
-      CUBEB_LAYOUT_UNDEFINED,
-      CUBEB_STREAM_PREF_NONE,
-      CUBEB_INPUT_PROCESSING_PARAM_NONE};
+                                             CUBEB_STREAM_PREF_NONE};
+  cubeb_stream_params output_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
+                                              CUBEB_LAYOUT_UNDEFINED,
+                                              CUBEB_STREAM_PREF_NONE};
  device_info input_device;
  device_info output_device;
  /* Format descriptions */
--- a/3rdparty/cubeb/src/cubeb_log.cpp
+++ b/3rdparty/cubeb/src/cubeb_log.cpp
@@ -16,8 +16,8 @@
 #include <time.h>
 #endif

-std::atomic<cubeb_log_level> g_cubeb_log_level;
-std::atomic<cubeb_log_callback> g_cubeb_log_callback;
+static std::atomic<cubeb_log_level> g_cubeb_log_level;
+static std::atomic<cubeb_log_callback> g_cubeb_log_callback;

 /** The maximum size of a log message, after having been formatted. */
 const size_t CUBEB_LOG_MESSAGE_MAX_SIZE = 256;
@@ -32,133 +32,6 @@ cubeb_noop_log_callback(char const * /* fmt */, ...)
 {
 }

-/**
- * This wraps an inline buffer, that represents a log message, that must be
- * null-terminated.
- * This class should not use system calls or other potentially blocking code.
- */
-class cubeb_log_message {
-public:
-  cubeb_log_message() { *storage = '\0'; }
-  cubeb_log_message(char const str[CUBEB_LOG_MESSAGE_MAX_SIZE])
-  {
-    size_t length = strlen(str);
-    /* paranoia against malformed message */
-    assert(length < CUBEB_LOG_MESSAGE_MAX_SIZE);
-    if (length > CUBEB_LOG_MESSAGE_MAX_SIZE - 1) {
-      return;
-    }
-    PodCopy(storage, str, length);
-    storage[length] = '\0';
-  }
-  char const * get() { return storage; }
-
-private:
-  char storage[CUBEB_LOG_MESSAGE_MAX_SIZE]{};
-};
-
-/** Lock-free asynchronous logger, made so that logging from a
- *  real-time audio callback does not block the audio thread. */
-class cubeb_async_logger {
-public:
-  /* This is thread-safe since C++11 */
-  static cubeb_async_logger & get()
-  {
-    static cubeb_async_logger instance;
-    return instance;
-  }
-  void push(char const str[CUBEB_LOG_MESSAGE_MAX_SIZE])
-  {
-    cubeb_log_message msg(str);
-    auto * owned_queue = msg_queue.load();
-    // Check if the queue is being deallocated. If not, grab ownership. If yes,
-    // return, the message won't be logged.
-    if (!owned_queue ||
-        !msg_queue.compare_exchange_strong(owned_queue, nullptr)) {
-      return;
-    }
-    owned_queue->enqueue(msg);
-    // Return ownership.
-    msg_queue.store(owned_queue);
-  }
-  void run()
-  {
-    assert(logging_thread.get_id() == std::thread::id());
-    logging_thread = std::thread([this]() {
-      CUBEB_REGISTER_THREAD("cubeb_log");
-      while (!shutdown_thread) {
-        cubeb_log_message msg;
-        while (msg_queue_consumer.load()->dequeue(&msg, 1)) {
-          cubeb_log_internal_no_format(msg.get());
-        }
-        std::this_thread::sleep_for(
-            std::chrono::milliseconds(CUBEB_LOG_BATCH_PRINT_INTERVAL_MS));
-      }
-      CUBEB_UNREGISTER_THREAD();
-    });
-  }
-  // Tell the underlying queue the producer thread has changed, so it does not
-  // assert in debug. This should be called with the thread stopped.
-  void reset_producer_thread()
-  {
-    if (msg_queue) {
-      msg_queue.load()->reset_thread_ids();
-    }
-  }
-  void start()
-  {
-    auto * queue =
-        new lock_free_queue<cubeb_log_message>(CUBEB_LOG_MESSAGE_QUEUE_DEPTH);
-    msg_queue.store(queue);
-    msg_queue_consumer.store(queue);
-    shutdown_thread = false;
-    run();
-  }
-  void stop()
-  {
-    assert(((g_cubeb_log_callback == cubeb_noop_log_callback) ||
-            !g_cubeb_log_callback) &&
-           "Only call stop after logging has been disabled.");
-    shutdown_thread = true;
-    if (logging_thread.get_id() != std::thread::id()) {
-      logging_thread.join();
-      logging_thread = std::thread();
-      auto * owned_queue = msg_queue.load();
-      // Check if the queue is being used. If not, grab ownership. If yes,
-      // try again shortly. At this point, the logging thread has been joined,
-      // so nothing is going to dequeue.
-      // If there is a valid pointer here, then the real-time audio thread that
-      // logs won't attempt to write into the queue, and instead drop the
-      // message.
-      while (!msg_queue.compare_exchange_weak(owned_queue, nullptr)) {
-      }
-      delete owned_queue;
-      msg_queue_consumer.store(nullptr);
-    }
-  }
-
-private:
-  cubeb_async_logger() {}
-  ~cubeb_async_logger()
-  {
-    assert(logging_thread.get_id() == std::thread::id() &&
-           (g_cubeb_log_callback == cubeb_noop_log_callback ||
-            !g_cubeb_log_callback));
-    if (msg_queue.load()) {
-      delete msg_queue.load();
-    }
-  }
-  /** This is quite a big data structure, but is only instantiated if the
-   * asynchronous logger is used. The two pointers point to the same object, but
-   * the first one can be temporarily null when a message is being enqueued. */
-  std::atomic<lock_free_queue<cubeb_log_message> *> msg_queue = {nullptr};
-
-  std::atomic<lock_free_queue<cubeb_log_message> *> msg_queue_consumer = {
-      nullptr};
-  std::atomic<bool> shutdown_thread = {false};
-  std::thread logging_thread;
-};
-
 void
 cubeb_log_internal(char const * file, uint32_t line, char const * fmt, ...)
 {
@@ -176,29 +49,6 @@ cubeb_log_internal_no_format(const char * msg)
  g_cubeb_log_callback.load()(msg);
 }

-void
-cubeb_async_log(char const * fmt, ...)
-{
-  // This is going to copy a 256 bytes array around, which is fine.
-  // We don't want to allocate memory here, because this is made to
-  // be called from a real-time callback.
-  va_list args;
-  va_start(args, fmt);
-  char msg[CUBEB_LOG_MESSAGE_MAX_SIZE];
-  vsnprintf(msg, CUBEB_LOG_MESSAGE_MAX_SIZE, fmt, args);
-  cubeb_async_logger::get().push(msg);
-  va_end(args);
-}
-
-void
-cubeb_async_log_reset_threads(void)
-{
-  if (!g_cubeb_log_callback) {
-    return;
-  }
-  cubeb_async_logger::get().reset_producer_thread();
-}
-
 void
 cubeb_log_set(cubeb_log_level log_level, cubeb_log_callback log_callback)
 {
@@ -207,15 +57,8 @@ cubeb_log_set(cubeb_log_level log_level, cubeb_log_callback log_callback)
  // nullptr, to prevent a TOCTOU race between checking the pointer
  if (log_callback && log_level != CUBEB_LOG_DISABLED) {
    g_cubeb_log_callback = log_callback;
-    if (log_level == CUBEB_LOG_VERBOSE) {
-      cubeb_async_logger::get().start();
-    }
  } else if (!log_callback || CUBEB_LOG_DISABLED) {
    g_cubeb_log_callback = cubeb_noop_log_callback;
-    // This returns once the thread has joined.
-    // This is safe even if CUBEB_LOG_VERBOSE was not set; the thread will
-    // simply not be joinable.
-    cubeb_async_logger::get().stop();
  } else {
    assert(false && "Incorrect parameters passed to cubeb_log_set");
  }
--- a/3rdparty/cubeb/src/cubeb_log.h
+++ b/3rdparty/cubeb/src/cubeb_log.h
@@ -39,12 +39,7 @@ cubeb_log_get_callback(void);
 void
 cubeb_log_internal_no_format(const char * msg);
 void
-cubeb_log_internal(const char * filename, uint32_t line, const char * fmt, ...)
-    PRINTF_FORMAT(3, 4);
-void
-cubeb_async_log(const char * fmt, ...) PRINTF_FORMAT(1, 2);
-void
-cubeb_async_log_reset_threads(void);
+cubeb_log_internal(const char * filename, uint32_t line, const char * fmt, ...);

 #ifdef __cplusplus
 }
@@ -60,16 +55,9 @@ cubeb_async_log_reset_threads(void);
    }                                                                          \
  } while (0)

-#define ALOG_INTERNAL(level, fmt, ...)                                         \
-  do {                                                                         \
-    if (cubeb_log_get_level() >= level && cubeb_log_get_callback()) {          \
-      cubeb_async_log(fmt, ##__VA_ARGS__);                                     \
-    }                                                                          \
-  } while (0)
-
 /* Asynchronous logging macros to log in real-time callbacks. */
 /* Should not be used on android due to the use of global/static variables. */
-#define ALOGV(msg, ...) ALOG_INTERNAL(CUBEB_LOG_VERBOSE, msg, ##__VA_ARGS__)
-#define ALOG(msg, ...) ALOG_INTERNAL(CUBEB_LOG_NORMAL, msg, ##__VA_ARGS__)
+#define ALOGV(msg, ...) LOG_INTERNAL(CUBEB_LOG_VERBOSE, msg, ##__VA_ARGS__)
+#define ALOG(msg, ...) LOG_INTERNAL(CUBEB_LOG_NORMAL, msg, ##__VA_ARGS__)

 #endif // CUBEB_LOG
--- a/3rdparty/cubeb/src/cubeb_resampler.cpp
+++ b/3rdparty/cubeb/src/cubeb_resampler.cpp
@@ -371,9 +371,3 @@ cubeb_resampler_latency(cubeb_resampler * resampler)
 {
  return resampler->latency();
 }
-
-cubeb_resampler_stats
-cubeb_resampler_stats_get(cubeb_resampler * resampler)
-{
-  return resampler->stats();
-}
--- a/3rdparty/cubeb/src/cubeb_resampler.h
+++ b/3rdparty/cubeb/src/cubeb_resampler.h
@@ -84,20 +84,6 @@ cubeb_resampler_destroy(cubeb_resampler * resampler);
 long
 cubeb_resampler_latency(cubeb_resampler * resampler);

-/**
- * Test-only introspection API to ensure that there is no buffering
- * buildup when resampling.
- */
-typedef struct {
-  size_t input_input_buffer_size;
-  size_t input_output_buffer_size;
-  size_t output_input_buffer_size;
-  size_t output_output_buffer_size;
-} cubeb_resampler_stats;
-
-cubeb_resampler_stats
-cubeb_resampler_stats_get(cubeb_resampler * resampler);
-
 #if defined(__cplusplus)
 }
 #endif
--- a/3rdparty/cubeb/src/cubeb_resampler_internal.h
+++ b/3rdparty/cubeb/src/cubeb_resampler_internal.h
@@ -56,7 +56,6 @@ struct cubeb_resampler {
  virtual long fill(void * input_buffer, long * input_frames_count,
                    void * output_buffer, long frames_needed) = 0;
  virtual long latency() = 0;
-  virtual cubeb_resampler_stats stats() = 0;
  virtual ~cubeb_resampler() {}
 };

@@ -87,16 +86,6 @@ public:

  virtual long latency() { return 0; }

-  virtual cubeb_resampler_stats stats()
-  {
-    cubeb_resampler_stats stats;
-    stats.input_input_buffer_size = internal_input_buffer.length();
-    stats.input_output_buffer_size = 0;
-    stats.output_input_buffer_size = 0;
-    stats.output_output_buffer_size = 0;
-    return stats;
-  }
-
  void drop_audio_if_needed()
  {
    uint32_t to_keep = min_buffered_audio_frame(sample_rate);
@@ -133,20 +122,6 @@ public:
  virtual long fill(void * input_buffer, long * input_frames_count,
                    void * output_buffer, long output_frames_needed);

-  virtual cubeb_resampler_stats stats()
-  {
-    cubeb_resampler_stats stats = {};
-    if (input_processor) {
-      stats.input_input_buffer_size = input_processor->input_buffer_size();
-      stats.input_output_buffer_size = input_processor->output_buffer_size();
-    }
-    if (output_processor) {
-      stats.output_input_buffer_size = output_processor->input_buffer_size();
-      stats.output_output_buffer_size = output_processor->output_buffer_size();
-    }
-    return stats;
-  }
-
  virtual long latency()
  {
    if (input_processor && output_processor) {
@@ -305,28 +280,29 @@ public:
  }

  /** Returns the number of frames to pass in the input of the resampler to have
-   * at least `output_frame_count` resampled frames. */
+   * exactly `output_frame_count` resampled frames. This can return a number
+   * slightly bigger than what is strictly necessary, but it guaranteed that the
+   * number of output frames will be exactly equal. */
  uint32_t input_needed_for_output(int32_t output_frame_count) const
  {
    assert(output_frame_count >= 0); // Check overflow
    int32_t unresampled_frames_left =
        samples_to_frames(resampling_in_buffer.length());
-    float input_frames_needed_frac =
-        static_cast<float>(output_frame_count) * resampling_ratio;
-    // speex_resample()` can be irregular in its consumption of input samples.
-    // Provide one more frame than the number that would be required with
-    // regular consumption, to make the speex resampler behave more regularly,
-    // and so predictably.
-    auto input_frame_needed =
-        1 + static_cast<int32_t>(ceilf(input_frames_needed_frac));
-    input_frame_needed -= std::min(unresampled_frames_left, input_frame_needed);
-    return input_frame_needed;
+    int32_t resampled_frames_left =
+        samples_to_frames(resampling_out_buffer.length());
+    float input_frames_needed =
+        (output_frame_count - unresampled_frames_left) * resampling_ratio -
+        resampled_frames_left;
+    if (input_frames_needed < 0) {
+      return 0;
+    }
+    return (uint32_t)ceilf(input_frames_needed);
  }

  /** Returns a pointer to the input buffer, that contains empty space for at
-   * least `frame_count` elements. This is useful so that consumer can
-   * directly write into the input buffer of the resampler. The pointer
-   * returned is adjusted so that leftover data are not overwritten.
+   * least `frame_count` elements. This is useful so that consumer can directly
+   * write into the input buffer of the resampler. The pointer returned is
+   * adjusted so that leftover data are not overwritten.
   */
  T * input_buffer(size_t frame_count)
  {
@@ -336,8 +312,8 @@ public:
    return resampling_in_buffer.data() + leftover_samples;
  }

-  /** This method works with `input_buffer`, and allows to inform the
-     processor how much frames have been written in the provided buffer. */
+  /** This method works with `input_buffer`, and allows to inform the processor
+      how much frames have been written in the provided buffer. */
  void written(size_t written_frames)
  {
    resampling_in_buffer.set_length(leftover_samples +
@@ -355,9 +331,6 @@ public:
    }
  }

-  size_t input_buffer_size() const { return resampling_in_buffer.length(); }
-  size_t output_buffer_size() const { return resampling_out_buffer.length(); }
-
 private:
  /** Wrapper for the speex resampling functions to have a typed
   * interface. */
@@ -386,7 +359,6 @@ private:
            output_frame_count);
    assert(rv == RESAMPLER_ERR_SUCCESS);
  }
-
  /** The state for the speex resampler used internaly. */
  SpeexResamplerState * speex_resampler;
  /** Source rate / target rate. */
@@ -399,8 +371,8 @@ private:
  auto_array<T> resampling_out_buffer;
  /** Additional latency inserted into the pipeline for synchronisation. */
  uint32_t additional_latency;
-  /** When `input_buffer` is called, this allows tracking the number of
-     samples that were in the buffer. */
+  /** When `input_buffer` is called, this allows tracking the number of samples
+      that were in the buffer. */
  uint32_t leftover_samples;
 };

@@ -445,8 +417,8 @@ public:
    return delay_output_buffer.data();
  }
  /** Get a pointer to the first writable location in the input buffer>
-   * @parameter frames_needed the number of frames the user needs to write
-   * into the buffer.
+   * @parameter frames_needed the number of frames the user needs to write into
+   * the buffer.
   * @returns a pointer to a location in the input buffer where #frames_needed
   * can be writen. */
  T * input_buffer(uint32_t frames_needed)
@@ -456,8 +428,8 @@ public:
                               frames_to_samples(frames_needed));
    return delay_input_buffer.data() + leftover_samples;
  }
-  /** This method works with `input_buffer`, and allows to inform the
-     processor how much frames have been written in the provided buffer. */
+  /** This method works with `input_buffer`, and allows to inform the processor
+      how much frames have been written in the provided buffer. */
  void written(size_t frames_written)
  {
    delay_input_buffer.set_length(leftover_samples +
@@ -478,8 +450,8 @@ public:

    return to_pop;
  }
-  /** Returns the number of frames one needs to input into the delay line to
-   * get #frames_needed frames back.
+  /** Returns the number of frames one needs to input into the delay line to get
+   * #frames_needed frames back.
   * @parameter frames_needed the number of frames one want to write into the
   * delay_line
   * @returns the number of frames one will get. */
@@ -497,23 +469,19 @@ public:

  void drop_audio_if_needed()
  {
-    uint32_t available = samples_to_frames(delay_input_buffer.length());
+    size_t available = samples_to_frames(delay_input_buffer.length());
    uint32_t to_keep = min_buffered_audio_frame(sample_rate);
    if (available > to_keep) {
      ALOGV("Dropping %u frames", available - to_keep);
-
      delay_input_buffer.pop(nullptr, frames_to_samples(available - to_keep));
    }
  }

-  size_t input_buffer_size() const { return delay_input_buffer.length(); }
-  size_t output_buffer_size() const { return delay_output_buffer.length(); }
-
 private:
  /** The length, in frames, of this delay line */
  uint32_t length;
-  /** When `input_buffer` is called, this allows tracking the number of
-     samples that where in the buffer. */
+  /** When `input_buffer` is called, this allows tracking the number of samples
+      that where in the buffer. */
  uint32_t leftover_samples;
  /** The input buffer, where the delay is applied. */
  auto_array<T> delay_input_buffer;
@@ -543,8 +511,8 @@ cubeb_resampler_create_internal(cubeb_stream * stream,
         "need at least one valid parameter pointer.");

  /* All the streams we have have a sample rate that matches the target
-     sample rate, use a no-op resampler, that simply forwards the buffers to
-     the callback. */
+     sample rate, use a no-op resampler, that simply forwards the buffers to the
+     callback. */
  if (((input_params && input_params->rate == target_rate) &&
       (output_params && output_params->rate == target_rate)) ||
      (input_params && !output_params && (input_params->rate == target_rate)) ||
--- a/3rdparty/cubeb/src/cubeb_wasapi.cpp
+++ b/3rdparty/cubeb/src/cubeb_wasapi.cpp
@@ -4,12 +4,8 @@
 * This program is made available under an ISC-style license.  See the
 * accompanying file LICENSE for details.
 */
-#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0603
-#endif // !_WIN32_WINNT
-#ifndef NOMINMAX
 #define NOMINMAX
-#endif // !NOMINMAX

 #include <algorithm>
 #include <atomic>
@@ -41,6 +37,31 @@
 #include "cubeb_tracing.h"
 #include "cubeb_utils.h"

+// Some people have reported glitches with IAudioClient3 capture streams:
+// http://blog.nirbheek.in/2018/03/low-latency-audio-on-windows-with.html
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1590902
+#define ALLOW_AUDIO_CLIENT_3_FOR_INPUT 0
+// IAudioClient3::GetSharedModeEnginePeriod() seem to return min latencies
+// bigger than IAudioClient::GetDevicePeriod(), which is confusing (10ms vs
+// 3ms), though the default latency is usually the same and we should use the
+// IAudioClient3 function anyway, as it's more correct
+#define USE_AUDIO_CLIENT_3_MIN_PERIOD 1
+// If this is true, we allow IAudioClient3 the creation of sessions with a
+// latency above the default one (usually 10ms).
+// Whether we should default this to true or false depend on many things:
+// -Does creating a shared IAudioClient3 session (not locked to a format)
+//  actually forces all the IAudioClient(1) sessions to have the same latency?
+//  I could find no proof of that.
+// -Does creating a shared IAudioClient3 session with a latency >= the default
+//  one actually improve the latency (as in how late the audio is) at all?
+// -Maybe we could expose this as cubeb stream pref
+//  (e.g. take priority over other apps)?
+#define ALLOW_AUDIO_CLIENT_3_LATENCY_OVER_DEFAULT 1
+// If this is true and the user specified a target latency >= the IAudioClient3
+// max one, then we reject it and fall back to IAudioClient(1). There wouldn't
+// be much point in having a low latency if that's not what the user wants.
+#define REJECT_AUDIO_CLIENT_3_LATENCY_OVER_MAX 0
+
 // Windows 10 exposes the IAudioClient3 interface to create low-latency streams.
 // Copy the interface definition from audioclient.h here to make the code
 // simpler and so that we can still access IAudioClient3 via COM if cubeb was
@@ -208,6 +229,11 @@ struct auto_stream_ref {
  cubeb_stream * stm;
 };

+using set_mm_thread_characteristics_function =
+    decltype(&AvSetMmThreadCharacteristicsW);
+using revert_mm_thread_characteristics_function =
+    decltype(&AvRevertMmThreadCharacteristics);
+
 extern cubeb_ops const wasapi_ops;

 static com_heap_ptr<wchar_t>
@@ -278,8 +304,8 @@ wasapi_enumerate_devices_internal(cubeb * context, cubeb_device_type type,
 static int
 wasapi_device_collection_destroy(cubeb * ctx,
                                 cubeb_device_collection * collection);
-static std::unique_ptr<char const[]>
-wstr_to_utf8(LPCWSTR str);
+static char const *
+wstr_to_utf8(wchar_t const * str);
 static std::unique_ptr<wchar_t const[]>
 utf8_to_wstr(char const * str);

@@ -288,15 +314,6 @@ utf8_to_wstr(char const * str);
 class wasapi_collection_notification_client;
 class monitor_device_notifications;

-typedef enum {
-  /* Clear options */
-  CUBEB_AUDIO_CLIENT2_NONE,
-  /* Use AUDCLNT_STREAMOPTIONS_RAW  */
-  CUBEB_AUDIO_CLIENT2_RAW,
-  /* Use CUBEB_STREAM_PREF_COMMUNICATIONS */
-  CUBEB_AUDIO_CLIENT2_VOICE
-} AudioClient2Option;
-
 struct cubeb {
  cubeb_ops const * ops = &wasapi_ops;
  owned_critical_section lock;
@@ -314,6 +331,13 @@ struct cubeb {
      nullptr;
  void * output_collection_changed_user_ptr = nullptr;
  UINT64 performance_counter_frequency;
+  /* Library dynamically opened to increase the render thread priority, and
+     the two function pointers we need. */
+  HMODULE mmcss_module = nullptr;
+  set_mm_thread_characteristics_function set_mm_thread_characteristics =
+      nullptr;
+  revert_mm_thread_characteristics_function revert_mm_thread_characteristics =
+      nullptr;
 };

 class wasapi_endpoint_notification_client;
@@ -336,33 +360,20 @@ struct cubeb_stream {
  /* Mixer pameters. We need to convert the input stream to this
     samplerate/channel layout, as WASAPI does not resample nor upmix
     itself. */
-  cubeb_stream_params input_mix_params = {CUBEB_SAMPLE_FLOAT32NE,
-                                          0,
-                                          0,
+  cubeb_stream_params input_mix_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
                                          CUBEB_LAYOUT_UNDEFINED,
-                                          CUBEB_STREAM_PREF_NONE,
-                                          CUBEB_INPUT_PROCESSING_PARAM_NONE};
-  cubeb_stream_params output_mix_params = {CUBEB_SAMPLE_FLOAT32NE,
-                                           0,
-                                           0,
+                                          CUBEB_STREAM_PREF_NONE};
+  cubeb_stream_params output_mix_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
                                           CUBEB_LAYOUT_UNDEFINED,
-                                           CUBEB_STREAM_PREF_NONE,
-                                           CUBEB_INPUT_PROCESSING_PARAM_NONE};
+                                           CUBEB_STREAM_PREF_NONE};
  /* Stream parameters. This is what the client requested,
   * and what will be presented in the callback. */
-  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE,
-                                             0,
-                                             0,
+  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
                                             CUBEB_LAYOUT_UNDEFINED,
-                                             CUBEB_STREAM_PREF_NONE,
-                                             CUBEB_INPUT_PROCESSING_PARAM_NONE};
-  cubeb_stream_params output_stream_params = {
-      CUBEB_SAMPLE_FLOAT32NE,
-      0,
-      0,
-      CUBEB_LAYOUT_UNDEFINED,
-      CUBEB_STREAM_PREF_NONE,
-      CUBEB_INPUT_PROCESSING_PARAM_NONE};
+                                             CUBEB_STREAM_PREF_NONE};
+  cubeb_stream_params output_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
+                                              CUBEB_LAYOUT_UNDEFINED,
+                                              CUBEB_STREAM_PREF_NONE};
  /* A MMDevice role for this stream: either communication or console here. */
  ERole role;
  /* True if this stream will transport voice-data. */
@@ -651,10 +662,6 @@ public:
                                                   LPCWSTR device_id)
  {
    LOG("collection: Audio device default changed, id = %S.", device_id);
-
-    /* Default device changes count as device collection changes */
-    monitor_notifications.notify(flow);
-
    return S_OK;
  }

@@ -765,7 +772,7 @@ public:
                                                   LPCWSTR device_id)
  {
    LOG("endpoint: Audio device default changed flow=%d role=%d "
-        "new_device_id=%S.",
+        "new_device_id=%ws.",
        flow, role, device_id);

    /* we only support a single stream type for now. */
@@ -776,13 +783,11 @@ public:
    DWORD last_change_ms = timeGetTime() - last_device_change;
    bool same_device = default_device_id && device_id &&
                       wcscmp(default_device_id.get(), device_id) == 0;
-    LOG("endpoint: Audio device default changed last_change=%lu same_device=%d",
+    LOG("endpoint: Audio device default changed last_change=%u same_device=%d",
        last_change_ms, same_device);
    if (last_change_ms > DEVICE_CHANGE_DEBOUNCE_MS || !same_device) {
      if (device_id) {
-        wchar_t * new_device_id = new wchar_t[wcslen(device_id) + 1];
-        wcscpy(new_device_id, device_id);
-        default_device_id.reset(new_device_id);
+        default_device_id.reset(_wcsdup(device_id));
      } else {
        default_device_id.reset();
      }
@@ -858,12 +863,16 @@ intern_device_id(cubeb * ctx, wchar_t const * id)

  auto_lock lock(ctx->lock);

-  std::unique_ptr<char const[]> tmp = wstr_to_utf8(id);
+  char const * tmp = wstr_to_utf8(id);
  if (!tmp) {
    return nullptr;
  }

-  return cubeb_strings_intern(ctx->device_ids, tmp.get());
+  char const * interned = cubeb_strings_intern(ctx->device_ids, tmp);
+
+  free((void *)tmp);
+
+  return interned;
 }

 bool
@@ -968,7 +977,7 @@ refill(cubeb_stream * stm, void * input_buffer, long input_frames_count,
      cubeb_resampler_fill(stm->resampler.get(), input_buffer,
                           &input_frames_count, dest, output_frames_needed);
  if (out_frames < 0) {
-    ALOGV("Callback refill error: %ld", out_frames);
+    ALOGV("Callback refill error: %d", out_frames);
    wasapi_state_callback(stm, stm->user_ptr, CUBEB_STATE_ERROR);
    return out_frames;
  }
@@ -1254,8 +1263,8 @@ refill_callback_duplex(cubeb_stream * stm)
  XASSERT(has_input(stm) && has_output(stm));

  if (stm->input_stream_params.prefs & CUBEB_STREAM_PREF_LOOPBACK) {
-    rv = get_input_buffer(stm);
-    if (!rv) {
+    HRESULT rv = get_input_buffer(stm);
+    if (FAILED(rv)) {
      return rv;
    }
  }
@@ -1265,6 +1274,7 @@ refill_callback_duplex(cubeb_stream * stm)

  rv = get_output_buffer(stm, output_buffer, output_frames);
  if (!rv) {
+    hr = stm->render_client->ReleaseBuffer(output_frames, 0);
    return rv;
  }

@@ -1281,11 +1291,9 @@ refill_callback_duplex(cubeb_stream * stm)

  stm->total_output_frames += output_frames;

-  ALOGV("in: %llu, out: %llu, missing: %ld, ratio: %f",
-        (unsigned long long)stm->total_input_frames,
-        (unsigned long long)stm->total_output_frames,
-        static_cast<long long>(stm->total_output_frames) -
-            static_cast<long long>(stm->total_input_frames),
+  ALOGV("in: %zu, out: %zu, missing: %ld, ratio: %f", stm->total_input_frames,
+        stm->total_output_frames,
+        static_cast<long>(stm->total_output_frames) - stm->total_input_frames,
        static_cast<float>(stm->total_output_frames) / stm->total_input_frames);

  long got;
@@ -1430,7 +1438,8 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)

  /* We could consider using "Pro Audio" here for WebAudio and
     maybe WebRTC. */
-  mmcss_handle = AvSetMmThreadCharacteristicsA("Audio", &mmcss_task_index);
+  mmcss_handle =
+      stm->context->set_mm_thread_characteristics(L"Audio", &mmcss_task_index);
  if (!mmcss_handle) {
    /* This is not fatal, but we might glitch under heavy load. */
    LOG("Unable to use mmcss to bump the render thread priority: %lx",
@@ -1510,8 +1519,8 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      is_playing = stm->refill_callback(stm);
      break;
    case WAIT_OBJECT_0 + 3: { /* input available */
-      bool rv = get_input_buffer(stm);
-      if (!rv) {
+      HRESULT rv = get_input_buffer(stm);
+      if (FAILED(rv)) {
        is_playing = false;
        continue;
      }
@@ -1523,11 +1532,8 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      break;
    }
    default:
-      LOG("render_loop: waitResult=%lu (lastError=%lu) unhandled, exiting",
-          waitResult, GetLastError());
-      is_playing = false;
-      hr = E_FAIL;
-      continue;
+      LOG("case %lu not handled in render loop.", waitResult);
+      XASSERT(false);
    }
  }

@@ -1541,7 +1547,7 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
  }

  if (mmcss_handle) {
-    AvRevertMmThreadCharacteristics(mmcss_handle);
+    stm->context->revert_mm_thread_characteristics(mmcss_handle);
  }

  if (FAILED(hr)) {
@@ -1554,6 +1560,18 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
 void
 wasapi_destroy(cubeb * context);

+HANDLE WINAPI
+set_mm_thread_characteristics_noop(LPCWSTR, LPDWORD mmcss_task_index)
+{
+  return (HANDLE)1;
+}
+
+BOOL WINAPI
+revert_mm_thread_characteristics_noop(HANDLE mmcss_handle)
+{
+  return true;
+}
+
 HRESULT
 register_notification_client(cubeb_stream * stm)
 {
@@ -1789,6 +1807,31 @@ wasapi_init(cubeb ** context, char const * context_name)
    ctx->performance_counter_frequency = 0;
  }

+  ctx->mmcss_module = LoadLibraryW(L"Avrt.dll");
+
+  bool success = false;
+  if (ctx->mmcss_module) {
+    ctx->set_mm_thread_characteristics =
+        reinterpret_cast<set_mm_thread_characteristics_function>(
+            GetProcAddress(ctx->mmcss_module, "AvSetMmThreadCharacteristicsW"));
+    ctx->revert_mm_thread_characteristics =
+        reinterpret_cast<revert_mm_thread_characteristics_function>(
+            GetProcAddress(ctx->mmcss_module,
+                           "AvRevertMmThreadCharacteristics"));
+    success = ctx->set_mm_thread_characteristics &&
+              ctx->revert_mm_thread_characteristics;
+  }
+  if (!success) {
+    // This is not a fatal error, but we might end up glitching when
+    // the system is under high load.
+    LOG("Could not load avrt.dll or fetch AvSetMmThreadCharacteristicsW "
+        "AvRevertMmThreadCharacteristics: %lx",
+        GetLastError());
+    ctx->set_mm_thread_characteristics = &set_mm_thread_characteristics_noop;
+    ctx->revert_mm_thread_characteristics =
+        &revert_mm_thread_characteristics_noop;
+  }
+
  *context = ctx;

  return CUBEB_OK;
@@ -1796,6 +1839,7 @@ wasapi_init(cubeb ** context, char const * context_name)
 }

 namespace {
+enum ShutdownPhase { OnStop, OnDestroy };

 bool
 stop_and_join_render_thread(cubeb_stream * stm)
@@ -1811,7 +1855,16 @@ stop_and_join_render_thread(cubeb_stream * stm)
    return false;
  }

-  DWORD r = WaitForSingleObject(stm->thread, INFINITE);
+  /* Wait five seconds for the rendering thread to return. It's supposed to
+   * check its event loop very often, five seconds is rather conservative.
+   * Note: 5*1s loop to work around timer sleep issues on pre-Windows 8. */
+  DWORD r;
+  for (int i = 0; i < 5; ++i) {
+    r = WaitForSingleObject(stm->thread, 1000);
+    if (r == WAIT_OBJECT_0) {
+      break;
+    }
+  }
  if (r != WAIT_OBJECT_0) {
    LOG("stop_and_join_render_thread: WaitForSingleObject on thread failed: "
        "%lx, %lx",
@@ -1835,6 +1888,10 @@ wasapi_destroy(cubeb * context)
    }
  }

+  if (context->mmcss_module) {
+    FreeLibrary(context->mmcss_module);
+  }
+
  delete context;
 }

@@ -1892,6 +1949,44 @@ wasapi_get_min_latency(cubeb * ctx, cubeb_stream_params params,
    return CUBEB_ERROR;
  }

+#if USE_AUDIO_CLIENT_3_MIN_PERIOD
+  // This is unreliable as we can't know the actual mixer format cubeb will
+  // ask for later on (nor we can branch on ALLOW_AUDIO_CLIENT_3_FOR_INPUT),
+  // and the min latency can change based on that.
+  com_ptr<IAudioClient3> client3;
+  hr = device->Activate(__uuidof(IAudioClient3), CLSCTX_INPROC_SERVER, NULL,
+                        client3.receive_vpp());
+  if (SUCCEEDED(hr)) {
+    WAVEFORMATEX * mix_format = nullptr;
+    hr = client3->GetMixFormat(&mix_format);
+
+    if (SUCCEEDED(hr)) {
+      uint32_t default_period = 0, fundamental_period = 0, min_period = 0,
+               max_period = 0;
+      hr = client3->GetSharedModeEnginePeriod(mix_format, &default_period,
+                                              &fundamental_period, &min_period,
+                                              &max_period);
+
+      auto sample_rate = mix_format->nSamplesPerSec;
+      CoTaskMemFree(mix_format);
+      if (SUCCEEDED(hr)) {
+        // Print values in the same format as IAudioDevice::GetDevicePeriod()
+        REFERENCE_TIME min_period_rt(frames_to_hns(sample_rate, min_period));
+        REFERENCE_TIME default_period_rt(
+            frames_to_hns(sample_rate, default_period));
+        LOG("default device period: %I64d, minimum device period: %I64d",
+            default_period_rt, min_period_rt);
+
+        *latency_frames = hns_to_frames(params.rate, min_period_rt);
+
+        LOG("Minimum latency in frames: %u", *latency_frames);
+
+        return CUBEB_OK;
+      }
+    }
+  }
+#endif
+
  com_ptr<IAudioClient> client;
  hr = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
                        client.receive_vpp());
@@ -1911,18 +2006,8 @@ wasapi_get_min_latency(cubeb * ctx, cubeb_stream_params params,
  LOG("default device period: %I64d, minimum device period: %I64d",
      default_period, minimum_period);

-  /* If we're on Windows 10, we can use IAudioClient3 to get minimal latency.
-     Otherwise, according to the docs, the best latency we can achieve is by
-     synchronizing the stream and the engine.
-     http://msdn.microsoft.com/en-us/library/windows/desktop/dd370871%28v=vs.85%29.aspx
-   */
-
-  // #ifdef _WIN32_WINNT_WIN10
-#if 0
-     *latency_frames = hns_to_frames(params.rate, minimum_period);
-#else
+  // The minimum_period is only relevant in exclusive streams.
  *latency_frames = hns_to_frames(params.rate, default_period);
-#endif

  LOG("Minimum latency in frames: %u", *latency_frames);

@@ -1959,21 +2044,6 @@ wasapi_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate)
  return CUBEB_OK;
 }

-int
-wasapi_get_supported_input_processing_params(
-    cubeb * ctx, cubeb_input_processing_params * params)
-{
-  // This is not entirely accurate -- windows doesn't document precisely what
-  // AudioCategory_Communications does -- but assume that we can set all or none
-  // of them.
-  *params = static_cast<cubeb_input_processing_params>(
-      CUBEB_INPUT_PROCESSING_PARAM_ECHO_CANCELLATION |
-      CUBEB_INPUT_PROCESSING_PARAM_NOISE_SUPPRESSION |
-      CUBEB_INPUT_PROCESSING_PARAM_AUTOMATIC_GAIN_CONTROL |
-      CUBEB_INPUT_PROCESSING_PARAM_VOICE_ISOLATION);
-  return CUBEB_OK;
-}
-
 static void
 waveformatex_update_derived_properties(WAVEFORMATEX * format)
 {
@@ -2027,7 +2097,10 @@ handle_channel_layout(cubeb_stream * stm, EDataFlow direction,
  if (hr == S_FALSE) {
    /* Channel layout not supported, but WASAPI gives us a suggestion. Use it,
       and handle the eventual upmix/downmix ourselves. Ignore the subformat of
-       the suggestion, since it seems to always be IEEE_FLOAT. */
+       the suggestion, since it seems to always be IEEE_FLOAT.
+       This fallback doesn't update the bit depth, so if a device
+       only supported bit depths cubeb doesn't support, so IAudioClient3
+       streams might fail */
    LOG("Using WASAPI suggested format: channels: %d", closest->nChannels);
    XASSERT(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE);
    WAVEFORMATEXTENSIBLE * closest_pcm =
@@ -2049,8 +2122,7 @@ handle_channel_layout(cubeb_stream * stm, EDataFlow direction,
 }

 static int
-initialize_iaudioclient2(com_ptr<IAudioClient> & audio_client,
-                         AudioClient2Option option)
+initialize_iaudioclient2(com_ptr<IAudioClient> & audio_client)
 {
  com_ptr<IAudioClient2> audio_client2;
  audio_client->QueryInterface<IAudioClient2>(audio_client2.receive());
@@ -2059,14 +2131,10 @@ initialize_iaudioclient2(com_ptr<IAudioClient> & audio_client,
        "AUDCLNT_STREAMOPTIONS_RAW.");
    return CUBEB_OK;
  }
-  AudioClientProperties properties = {};
+  AudioClientProperties properties = {0};
  properties.cbSize = sizeof(AudioClientProperties);
 #ifndef __MINGW32__
-  if (option == CUBEB_AUDIO_CLIENT2_RAW) {
-    properties.Options |= AUDCLNT_STREAMOPTIONS_RAW;
-  } else if (option == CUBEB_AUDIO_CLIENT2_VOICE) {
-    properties.eCategory = AudioCategory_Communications;
-  }
+  properties.Options |= AUDCLNT_STREAMOPTIONS_RAW;
 #endif
  HRESULT hr = audio_client2->SetClientProperties(&properties);
  if (FAILED(hr)) {
@@ -2076,12 +2144,12 @@ initialize_iaudioclient2(com_ptr<IAudioClient> & audio_client,
  return CUBEB_OK;
 }

-#if 0
 bool
 initialize_iaudioclient3(com_ptr<IAudioClient> & audio_client,
                         cubeb_stream * stm,
                         const com_heap_ptr<WAVEFORMATEX> & mix_format,
-                         DWORD flags, EDataFlow direction)
+                         DWORD flags, EDataFlow direction,
+                         REFERENCE_TIME latency_hns)
 {
  com_ptr<IAudioClient3> audio_client3;
  audio_client->QueryInterface<IAudioClient3>(audio_client3.receive());
@@ -2097,24 +2165,22 @@ initialize_iaudioclient3(com_ptr<IAudioClient> & audio_client,
    return false;
  }

-  // Some people have reported glitches with capture streams:
-  // http://blog.nirbheek.in/2018/03/low-latency-audio-on-windows-with.html
-  if (direction == eCapture) {
-    LOG("Audio stream is capture, not using IAudioClient3");
-    return false;
-  }
-
  // Possibly initialize a shared-mode stream using IAudioClient3. Initializing
  // a stream this way lets you request lower latencies, but also locks the
  // global WASAPI engine at that latency.
  // - If we request a shared-mode stream, streams created with IAudioClient
-  // will
-  //   have their latency adjusted to match. When  the shared-mode stream is
-  //   closed, they'll go back to normal.
-  // - If there's already a shared-mode stream running, then we cannot request
-  //   the engine change to a different latency - we have to match it.
-  // - It's antisocial to lock the WASAPI engine at its default latency. If we
-  //   would do this, then stop and use IAudioClient instead.
+  //   might have their latency adjusted to match. When the shared-mode stream
+  //   is closed, they'll go back to normal.
+  // - If there's already a shared-mode stream running, if it created with the
+  //   AUDCLNT_STREAMOPTIONS_MATCH_FORMAT option, the audio engine would be
+  //   locked to that format, so we have to match it (a custom one would fail).
+  // - We don't lock the WASAPI engine to a format, as it's antisocial towards
+  //   other apps, especially if we locked to a latency >= than its default.
+  // - If the user requested latency is >= the default one, we might still
+  //   accept it (without locking the format) depending on
+  //   ALLOW_AUDIO_CLIENT_3_LATENCY_OVER_DEFAULT, as we might want to prioritize
+  //   to lower our latency over other apps
+  //   (there might still be latency advantages compared to IAudioDevice(1)).

  HRESULT hr;
  uint32_t default_period = 0, fundamental_period = 0, min_period = 0,
@@ -2126,28 +2192,59 @@ initialize_iaudioclient3(com_ptr<IAudioClient> & audio_client,
    LOG("Could not get shared mode engine period: error: %lx", hr);
    return false;
  }
-  uint32_t requested_latency = stm->latency;
+  uint32_t requested_latency =
+      hns_to_frames(mix_format->nSamplesPerSec, latency_hns);
+#if !ALLOW_AUDIO_CLIENT_3_LATENCY_OVER_DEFAULT
  if (requested_latency >= default_period) {
-    LOG("Requested latency %i greater than default latency %i, not using "
-        "IAudioClient3",
+    LOG("Requested latency %i equal or greater than default latency %i,"
+        " not using IAudioClient3",
        requested_latency, default_period);
    return false;
  }
+#elif REJECT_AUDIO_CLIENT_3_LATENCY_OVER_MAX
+  if (requested_latency > max_period) {
+    // Fallback to IAudioClient(1) as it's more accepting of large latencies
+    LOG("Requested latency %i greater than max latency %i,"
+        " not using IAudioClient3",
+        requested_latency, max_period);
+    return false;
+  }
+#endif
  LOG("Got shared mode engine period: default=%i fundamental=%i min=%i max=%i",
      default_period, fundamental_period, min_period, max_period);
  // Snap requested latency to a valid value
  uint32_t old_requested_latency = requested_latency;
+  // The period is required to be a multiple of the fundamental period
+  // (and >= min and <= max, which should still be true)
+  requested_latency -= requested_latency % fundamental_period;
  if (requested_latency < min_period) {
    requested_latency = min_period;
  }
-  requested_latency -= (requested_latency - min_period) % fundamental_period;
+  // Likely unnecessary, but won't hurt
+  if (requested_latency > max_period) {
+    requested_latency = max_period;
+  }
  if (requested_latency != old_requested_latency) {
    LOG("Requested latency %i was adjusted to %i", old_requested_latency,
        requested_latency);
  }

-  hr = audio_client3->InitializeSharedAudioStream(flags, requested_latency,
+  DWORD new_flags = flags;
+  // Always add these flags to IAudioClient3, they might help
+  // if the stream doesn't have the same format as the audio engine.
+  new_flags |= AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM;
+  new_flags |= AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY;
+
+  hr = audio_client3->InitializeSharedAudioStream(new_flags, requested_latency,
                                                  mix_format.get(), NULL);
+  // This error should be returned first even if
+  // the period was locked (AUDCLNT_E_ENGINE_PERIODICITY_LOCKED)
+  if (hr == AUDCLNT_E_INVALID_STREAM_FLAG) {
+    LOG("Got AUDCLNT_E_INVALID_STREAM_FLAG, removing some flags");
+    hr = audio_client3->InitializeSharedAudioStream(flags, requested_latency,
+                                                    mix_format.get(), NULL);
+  }
+
  if (SUCCEEDED(hr)) {
    return true;
  } else if (hr == AUDCLNT_E_ENGINE_PERIODICITY_LOCKED) {
@@ -2159,23 +2256,38 @@ initialize_iaudioclient3(com_ptr<IAudioClient> & audio_client,
  }

  uint32_t current_period = 0;
-  WAVEFORMATEX * current_format = nullptr;
+  WAVEFORMATEX * current_format_ptr = nullptr;
  // We have to pass a valid WAVEFORMATEX** and not nullptr, otherwise
  // GetCurrentSharedModeEnginePeriod will return E_POINTER
-  hr = audio_client3->GetCurrentSharedModeEnginePeriod(&current_format,
+  hr = audio_client3->GetCurrentSharedModeEnginePeriod(&current_format_ptr,
                                                       &current_period);
-  CoTaskMemFree(current_format);
  if (FAILED(hr)) {
    LOG("Could not get current shared mode engine period: error: %lx", hr);
    return false;
  }
-
-  if (current_period >= default_period) {
-    LOG("Current shared mode engine period %i too high, not using IAudioClient",
-        current_period);
+  com_heap_ptr<WAVEFORMATEX> current_format(current_format_ptr);
+  if (current_format->nSamplesPerSec != mix_format->nSamplesPerSec) {
+    // Unless some other external app locked the shared mode engine period
+    // within our audio initialization, this is unlikely to happen, though we
+    // can't respect the user selected latency, so we fallback on IAudioClient
+    LOG("IAudioClient3::GetCurrentSharedModeEnginePeriod() returned a "
+        "different mixer format (nSamplesPerSec) from "
+        "IAudioClient::GetMixFormat(); not using IAudioClient3");
    return false;
  }

+#if REJECT_AUDIO_CLIENT_3_LATENCY_OVER_MAX
+  // Reject IAudioClient3 if we can't respect the user target latency.
+  // We don't need to check against default_latency anymore,
+  // as the current_period is already the best one we could get.
+  if (old_requested_latency > current_period) {
+    LOG("Requested latency %i greater than currently locked shared mode "
+        "latency %i, not using IAudioClient3",
+        old_requested_latency, current_period);
+    return false;
+  }
+#endif
+
  hr = audio_client3->InitializeSharedAudioStream(flags, current_period,
                                                  mix_format.get(), NULL);
  if (SUCCEEDED(hr)) {
@@ -2187,7 +2299,6 @@ initialize_iaudioclient3(com_ptr<IAudioClient> & audio_client,
  LOG("Could not initialize shared stream with IAudioClient3: error: %lx", hr);
  return false;
 }
-#endif

 #define DIRECTION_NAME (direction == eCapture ? "capture" : "render")

@@ -2211,6 +2322,12 @@ setup_wasapi_stream_one_side(cubeb_stream * stm,
    return CUBEB_ERROR;
  }

+#if ALLOW_AUDIO_CLIENT_3_FOR_INPUT
+  constexpr bool allow_audio_client_3 = true;
+#else
+  const bool allow_audio_client_3 = direction == eRender;
+#endif
+
  stm->stream_reset_lock.assert_current_thread_owns();
  // If user doesn't specify a particular device, we can choose another one when
  // the given devid is unavailable.
@@ -2247,17 +2364,14 @@ setup_wasapi_stream_one_side(cubeb_stream * stm,

    /* Get a client. We will get all other interfaces we need from
     * this pointer. */
-#if 0 // See https://bugzilla.mozilla.org/show_bug.cgi?id=1590902
-    hr = device->Activate(__uuidof(IAudioClient3),
-                          CLSCTX_INPROC_SERVER,
-                          NULL, audio_client.receive_vpp());
-    if (hr == E_NOINTERFACE) {
-#endif
-    hr = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
-                          audio_client.receive_vpp());
-#if 0
+    if (allow_audio_client_3) {
+      hr = device->Activate(__uuidof(IAudioClient3), CLSCTX_INPROC_SERVER, NULL,
+                            audio_client.receive_vpp());
+    }
+    if (!allow_audio_client_3 || hr == E_NOINTERFACE) {
+      hr = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, NULL,
+                            audio_client.receive_vpp());
    }
-#endif

    if (FAILED(hr)) {
      LOG("Could not activate the device to get an audio"
@@ -2380,41 +2494,21 @@ setup_wasapi_stream_one_side(cubeb_stream * stm,
  }

  if (stream_params->prefs & CUBEB_STREAM_PREF_RAW) {
-    if (initialize_iaudioclient2(audio_client, CUBEB_AUDIO_CLIENT2_RAW) !=
-        CUBEB_OK) {
+    if (initialize_iaudioclient2(audio_client) != CUBEB_OK) {
      LOG("Can't initialize an IAudioClient2, error: %lx", GetLastError());
      // This is not fatal.
    }
-  } else if (direction == eCapture &&
-             (stream_params->prefs & CUBEB_STREAM_PREF_VOICE) &&
-             stream_params->input_params != CUBEB_INPUT_PROCESSING_PARAM_NONE) {
-    if (stream_params->input_params ==
-        (CUBEB_INPUT_PROCESSING_PARAM_ECHO_CANCELLATION |
-         CUBEB_INPUT_PROCESSING_PARAM_NOISE_SUPPRESSION |
-         CUBEB_INPUT_PROCESSING_PARAM_AUTOMATIC_GAIN_CONTROL |
-         CUBEB_INPUT_PROCESSING_PARAM_VOICE_ISOLATION)) {
-      if (initialize_iaudioclient2(audio_client, CUBEB_AUDIO_CLIENT2_VOICE) !=
-          CUBEB_OK) {
-        LOG("Can't initialize an IAudioClient2, error: %lx", GetLastError());
-        // This is not fatal.
-      }
-    } else {
-      LOG("Invalid combination of input processing params %#x",
-          stream_params->input_params);
-      return CUBEB_ERROR;
-    }
  }

-#if 0 // See https://bugzilla.mozilla.org/show_bug.cgi?id=1590902
-  if (initialize_iaudioclient3(audio_client, stm, mix_format, flags, direction)) {
+  if (allow_audio_client_3 &&
+      initialize_iaudioclient3(audio_client, stm, mix_format, flags, direction,
+                               latency_hns)) {
    LOG("Initialized with IAudioClient3");
  } else {
-#endif
-  hr = audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, flags, latency_hns, 0,
-                                mix_format.get(), NULL);
-#if 0
+    hr = audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, flags, latency_hns,
+                                  0, mix_format.get(), NULL);
  }
-#endif
+
  if (FAILED(hr)) {
    LOG("Unable to initialize audio client for %s: %lx.", DIRECTION_NAME, hr);
    return CUBEB_ERROR;
@@ -2876,7 +2970,6 @@ wasapi_stream_init(cubeb * context, cubeb_stream ** stream,
    }
  }

-  cubeb_async_log_reset_threads();
  stm->thread =
      (HANDLE)_beginthreadex(NULL, 512 * 1024, wasapi_stream_render_loop, stm,
                             STACK_SIZE_PARAM_IS_A_RESERVATION, NULL);
@@ -2938,7 +3031,7 @@ wasapi_stream_add_ref(cubeb_stream * stm)
 {
  XASSERT(stm);
  LONG result = InterlockedIncrement(&stm->ref_count);
-  LOGV("Stream ref count incremented = %ld (%p)", result, stm);
+  LOGV("Stream ref count incremented = %i (%p)", result, stm);
  return result;
 }

@@ -2948,7 +3041,7 @@ wasapi_stream_release(cubeb_stream * stm)
  XASSERT(stm);

  LONG result = InterlockedDecrement(&stm->ref_count);
-  LOGV("Stream ref count decremented = %ld (%p)", result, stm);
+  LOGV("Stream ref count decremented = %i (%p)", result, stm);
  if (result == 0) {
    LOG("Stream ref count hit zero, destroying (%p)", stm);

@@ -3210,7 +3303,7 @@ wasapi_stream_set_volume(cubeb_stream * stm, float volume)
  return CUBEB_OK;
 }

-static std::unique_ptr<char const[]>
+static char const *
 wstr_to_utf8(LPCWSTR str)
 {
  int size = ::WideCharToMultiByte(CP_UTF8, 0, str, -1, nullptr, 0, NULL, NULL);
@@ -3218,8 +3311,8 @@ wstr_to_utf8(LPCWSTR str)
    return nullptr;
  }

-  std::unique_ptr<char[]> ret(new char[size]);
-  ::WideCharToMultiByte(CP_UTF8, 0, str, -1, ret.get(), size, NULL, NULL);
+  char * ret = static_cast<char *>(malloc(size));
+  ::WideCharToMultiByte(CP_UTF8, 0, str, -1, ret, size, NULL, NULL);
  return ret;
 }

@@ -3347,7 +3440,7 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
  prop_variant namevar;
  hr = propstore->GetValue(PKEY_Device_FriendlyName, &namevar);
  if (SUCCEEDED(hr) && namevar.vt == VT_LPWSTR) {
-    ret.friendly_name = wstr_to_utf8(namevar.pwszVal).release();
+    ret.friendly_name = wstr_to_utf8(namevar.pwszVal);
  }
  if (!ret.friendly_name) {
    // This is not fatal, but a valid string is expected in all cases.
@@ -3368,7 +3461,7 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
    prop_variant instancevar;
    hr = ps->GetValue(PKEY_Device_InstanceId, &instancevar);
    if (SUCCEEDED(hr) && instancevar.vt == VT_LPWSTR) {
-      ret.group_id = wstr_to_utf8(instancevar.pwszVal).release();
+      ret.group_id = wstr_to_utf8(instancevar.pwszVal);
    }
  }

@@ -3384,8 +3477,7 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
    ret.preferred =
        (cubeb_device_pref)(ret.preferred | CUBEB_DEVICE_PREF_MULTIMEDIA |
                            CUBEB_DEVICE_PREF_NOTIFICATION);
-  }
-  if (defaults->is_default(flow, eCommunications, device_id.get())) {
+  } else if (defaults->is_default(flow, eCommunications, device_id.get())) {
    ret.preferred =
        (cubeb_device_pref)(ret.preferred | CUBEB_DEVICE_PREF_VOICE);
  }
@@ -3412,6 +3504,7 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
                                             CUBEB_DEVICE_FMT_S16NE);
  ret.default_format = CUBEB_DEVICE_FMT_F32NE;
  prop_variant fmtvar;
+  WAVEFORMATEX * wfx = NULL;
  hr = propstore->GetValue(PKEY_AudioEngine_DeviceFormat, &fmtvar);
  if (SUCCEEDED(hr) && fmtvar.vt == VT_BLOB) {
    if (fmtvar.blob.cbSize == sizeof(PCMWAVEFORMAT)) {
@@ -3421,8 +3514,7 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
      ret.max_rate = ret.min_rate = ret.default_rate = pcm->wf.nSamplesPerSec;
      ret.max_channels = pcm->wf.nChannels;
    } else if (fmtvar.blob.cbSize >= sizeof(WAVEFORMATEX)) {
-      WAVEFORMATEX * wfx =
-          reinterpret_cast<WAVEFORMATEX *>(fmtvar.blob.pBlobData);
+      wfx = reinterpret_cast<WAVEFORMATEX *>(fmtvar.blob.pBlobData);

      if (fmtvar.blob.cbSize >= sizeof(WAVEFORMATEX) + wfx->cbSize ||
          wfx->wFormatTag == WAVE_FORMAT_PCM) {
@@ -3432,9 +3524,30 @@ wasapi_create_device(cubeb * ctx, cubeb_device_info & ret,
    }
  }

-  if (SUCCEEDED(dev->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER,
-                              NULL, client.receive_vpp())) &&
-      SUCCEEDED(client->GetDevicePeriod(&def_period, &min_period))) {
+#if USE_AUDIO_CLIENT_3_MIN_PERIOD
+  // Here we assume an IAudioClient3 stream will successfully
+  // be initialized later (it might fail)
+#if ALLOW_AUDIO_CLIENT_3_FOR_INPUT
+  constexpr bool allow_audio_client_3 = true;
+#else
+  const bool allow_audio_client_3 = flow == eRender;
+#endif
+  com_ptr<IAudioClient3> client3;
+  uint32_t def, fun, min, max;
+  if (allow_audio_client_3 && wfx &&
+      SUCCEEDED(dev->Activate(__uuidof(IAudioClient3), CLSCTX_INPROC_SERVER,
+                              NULL, client3.receive_vpp())) &&
+      SUCCEEDED(
+          client3->GetSharedModeEnginePeriod(wfx, &def, &fun, &min, &max))) {
+    ret.latency_lo = min;
+    // This latency might actually be used as "default" and not "max" later on,
+    // so we return the default (we never really want to use the max anyway)
+    ret.latency_hi = def;
+  } else
+#endif
+      if (SUCCEEDED(dev->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER,
+                                  NULL, client.receive_vpp())) &&
+          SUCCEEDED(client->GetDevicePeriod(&def_period, &min_period))) {
    ret.latency_lo = hns_to_frames(ret.default_rate, min_period);
    ret.latency_hi = hns_to_frames(ret.default_rate, def_period);
  } else {
@@ -3525,7 +3638,7 @@ wasapi_enumerate_devices(cubeb * context, cubeb_device_type type,
 {
  return wasapi_enumerate_devices_internal(
      context, type, out,
-      DEVICE_STATE_ACTIVE | DEVICE_STATE_DISABLED | DEVICE_STATE_UNPLUGGED);
+      DEVICE_STATE_ACTIVE /*| DEVICE_STATE_DISABLED | DEVICE_STATE_UNPLUGGED*/);
 }

 static int
@@ -3543,14 +3656,6 @@ wasapi_device_collection_destroy(cubeb * /*ctx*/,
  return CUBEB_OK;
 }

-int
-wasapi_set_input_processing_params(cubeb_stream * stream,
-                                   cubeb_input_processing_params params)
-{
-  LOG("Cannot set voice processing params after init. Use cubeb_stream_init.");
-  return CUBEB_ERROR_NOT_SUPPORTED;
-}
-
 static int
 wasapi_register_device_collection_changed(
    cubeb * context, cubeb_device_type devtype,
@@ -3631,8 +3736,7 @@ cubeb_ops const wasapi_ops = {
    /*.get_max_channel_count =*/wasapi_get_max_channel_count,
    /*.get_min_latency =*/wasapi_get_min_latency,
    /*.get_preferred_sample_rate =*/wasapi_get_preferred_sample_rate,
-    /*.get_supported_input_processing_params =*/
-    wasapi_get_supported_input_processing_params,
+    /*.get_supported_input_processing_params =*/NULL,
    /*.enumerate_devices =*/wasapi_enumerate_devices,
    /*.device_collection_destroy =*/wasapi_device_collection_destroy,
    /*.destroy =*/wasapi_destroy,
@@ -3647,7 +3751,7 @@ cubeb_ops const wasapi_ops = {
    /*.stream_set_name =*/NULL,
    /*.stream_get_current_device =*/NULL,
    /*.stream_set_input_mute =*/NULL,
-    /*.stream_set_input_processing_params =*/wasapi_set_input_processing_params,
+    /*.stream_set_input_processing_params =*/NULL,
    /*.stream_device_destroy =*/NULL,
    /*.stream_register_device_changed_callback =*/NULL,
    /*.register_device_collection_changed =*/
--- a/3rdparty/cubeb/subprojects/speex/arch.h
+++ b/3rdparty/cubeb/subprojects/speex/arch.h
@@ -41,10 +41,10 @@
 #ifdef FLOATING_POINT
 #error You cannot compile as floating point and fixed point at the same time
 #endif
-#ifdef USE_SSE
+#ifdef _USE_SSE
 #error SSE is only for floating-point
 #endif
-#if defined(ARM4_ASM) + defined(ARM5E_ASM) + defined(BFIN_ASM) > 1
+#if ((defined (ARM4_ASM)||defined (ARM4_ASM)) && defined(BFIN_ASM)) || (defined (ARM4_ASM)&&defined(ARM5E_ASM))
 #error Make up your mind. What CPU do you have?
 #endif
 #ifdef VORBIS_PSYCHO
@@ -56,10 +56,10 @@
 #ifndef FLOATING_POINT
 #error You now need to define either FIXED_POINT or FLOATING_POINT
 #endif
-#if defined(ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
+#if defined (ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
 #error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions?
 #endif
-#ifdef FIXED_DEBUG
+#ifdef FIXED_POINT_DEBUG
 #error "Don't you think enabling fixed-point is a good thing to do if you want to debug that?"
 #endif

@@ -117,9 +117,9 @@ typedef spx_word32_t spx_sig_t;

 #ifdef ARM5E_ASM
 #include "fixed_arm5e.h"
-#elif defined(ARM4_ASM)
+#elif defined (ARM4_ASM)
 #include "fixed_arm4.h"
-#elif defined(BFIN_ASM)
+#elif defined (BFIN_ASM)
 #include "fixed_bfin.h"
 #endif

@@ -177,13 +177,16 @@ typedef float spx_word32_t;
 #define ADD32(a,b) ((a)+(b))
 #define SUB32(a,b) ((a)-(b))
 #define MULT16_16_16(a,b)     ((a)*(b))
-#define MULT16_32_32(a,b)     ((a)*(b))
 #define MULT16_16(a,b)     ((spx_word32_t)(a)*(spx_word32_t)(b))
 #define MAC16_16(c,a,b)     ((c)+(spx_word32_t)(a)*(spx_word32_t)(b))

+#define MULT16_32_Q11(a,b)     ((a)*(b))
+#define MULT16_32_Q13(a,b)     ((a)*(b))
+#define MULT16_32_Q14(a,b)     ((a)*(b))
 #define MULT16_32_Q15(a,b)     ((a)*(b))
 #define MULT16_32_P15(a,b)     ((a)*(b))

+#define MAC16_32_Q11(c,a,b)     ((c)+(a)*(b))
 #define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))

 #define MAC16_16_Q11(c,a,b)     ((c)+(a)*(b))
@@ -207,7 +210,7 @@ typedef float spx_word32_t;
 #endif


-#if defined(CONFIG_TI_C54X) || defined(CONFIG_TI_C55X)
+#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)

 /* 2 on TI C5x DSP */
 #define BYTES_PER_CHAR 2
--- a/3rdparty/cubeb/subprojects/speex/fixed_generic.h
+++ b/3rdparty/cubeb/subprojects/speex/fixed_generic.h
@@ -69,18 +69,22 @@


 /* result fits in 16 bits */
-#define MULT16_16_16(a,b)     (((spx_word16_t)(a))*((spx_word16_t)(b)))
-/* result fits in 32 bits */
-#define MULT16_32_32(a,b)     (((spx_word16_t)(a))*((spx_word32_t)(b)))
+#define MULT16_16_16(a,b)     ((((spx_word16_t)(a))*((spx_word16_t)(b))))

 /* (spx_word32_t)(spx_word16_t) gives TI compiler a hint that it's 16x16->32 multiply */
 #define MULT16_16(a,b)     (((spx_word32_t)(spx_word16_t)(a))*((spx_word32_t)(spx_word16_t)(b)))

 #define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b))))
+#define MULT16_32_Q12(a,b) ADD32(MULT16_16((a),SHR((b),12)), SHR(MULT16_16((a),((b)&0x00000fff)),12))
+#define MULT16_32_Q13(a,b) ADD32(MULT16_16((a),SHR((b),13)), SHR(MULT16_16((a),((b)&0x00001fff)),13))
+#define MULT16_32_Q14(a,b) ADD32(MULT16_16((a),SHR((b),14)), SHR(MULT16_16((a),((b)&0x00003fff)),14))

-#define MULT16_32_P15(a,b) ADD32(MULT16_32_32(a,SHR((b),15)), PSHR(MULT16_16((a),((b)&0x00007fff)),15))
-#define MULT16_32_Q15(a,b) ADD32(MULT16_32_32(a,SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15))
-#define MAC16_32_Q15(c,a,b) ADD32(c,MULT16_32_Q15(a,b))
+#define MULT16_32_Q11(a,b) ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11))
+#define MAC16_32_Q11(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11)))
+
+#define MULT16_32_P15(a,b) ADD32(MULT16_16((a),SHR((b),15)), PSHR(MULT16_16((a),((b)&0x00007fff)),15))
+#define MULT16_32_Q15(a,b) ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15))
+#define MAC16_32_Q15(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15)))


 #define MAC16_16_Q11(c,a,b)     (ADD32((c),SHR(MULT16_16((a),(b)),11)))
--- a/3rdparty/cubeb/subprojects/speex/resample.c
+++ b/3rdparty/cubeb/subprojects/speex/resample.c
@@ -46,7 +46,7 @@
   Smith, Julius O. Digital Audio Resampling Home Page
   Center for Computer Research in Music and Acoustics (CCRMA),
   Stanford University, 2007.
-   Web published at https://ccrma.stanford.edu/~jos/resample/.
+   Web published at http://ccrma.stanford.edu/~jos/resample/.

   There is one main difference, though. This resampler uses cubic
   interpolation instead of linear interpolation in the above paper. This
@@ -63,12 +63,9 @@

 #ifdef OUTSIDE_SPEEX
 #include <stdlib.h>
-static void *speex_alloc(int size) {return calloc(size,1);}
-static void *speex_realloc(void *ptr, int size) {return realloc(ptr, size);}
-static void speex_free(void *ptr) {free(ptr);}
-#ifndef EXPORT
-#define EXPORT
-#endif
+static void *speex_alloc (int size) {return calloc(size,1);}
+static void *speex_realloc (void *ptr, int size) {return realloc(ptr, size);}
+static void speex_free (void *ptr) {free(ptr);}
 #include "speex_resampler.h"
 #include "arch.h"
 #else /* OUTSIDE_SPEEX */
@@ -78,6 +75,7 @@ static void speex_free(void *ptr) {free(ptr);}
 #include "os_support.h"
 #endif /* OUTSIDE_SPEEX */

+#include "stack_alloc.h"
 #include <math.h>
 #include <limits.h>

@@ -93,18 +91,18 @@ static void speex_free(void *ptr) {free(ptr);}
 #endif

 #ifndef UINT32_MAX
-#define UINT32_MAX 4294967295U
+#define UINT32_MAX 4294967296U
 #endif

-#ifdef USE_SSE
+#ifdef _USE_SSE
 #include "resample_sse.h"
 #endif

-#ifdef USE_NEON
+#ifdef _USE_NEON
 #include "resample_neon.h"
 #endif

-/* Number of elements to allocate on the stack */
+/* Numer of elements to allocate on the stack */
 #ifdef VAR_ARRAYS
 #define FIXED_STACK_ALLOC 8192
 #else
@@ -196,14 +194,16 @@ struct FuncDef {
   int oversample;
 };

-static const struct FuncDef kaiser12_funcdef = {kaiser12_table, 64};
-#define KAISER12 (&kaiser12_funcdef)
-static const struct FuncDef kaiser10_funcdef = {kaiser10_table, 32};
-#define KAISER10 (&kaiser10_funcdef)
-static const struct FuncDef kaiser8_funcdef = {kaiser8_table, 32};
-#define KAISER8 (&kaiser8_funcdef)
-static const struct FuncDef kaiser6_funcdef = {kaiser6_table, 32};
-#define KAISER6 (&kaiser6_funcdef)
+static const struct FuncDef _KAISER12 = {kaiser12_table, 64};
+#define KAISER12 (&_KAISER12)
+/*static struct FuncDef _KAISER12 = {kaiser12_table, 32};
+#define KAISER12 (&_KAISER12)*/
+static const struct FuncDef _KAISER10 = {kaiser10_table, 32};
+#define KAISER10 (&_KAISER10)
+static const struct FuncDef _KAISER8 = {kaiser8_table, 32};
+#define KAISER8 (&_KAISER8)
+static const struct FuncDef _KAISER6 = {kaiser6_table, 32};
+#define KAISER6 (&_KAISER6)

 struct QualityMapping {
   int base_length;
@@ -473,7 +473,7 @@ static int resampler_basic_interpolate_single(SpeexResamplerState *st, spx_uint3
      }

      cubic_coef(frac, interp);
-      sum = MULT16_32_Q15(interp[0],accum[0]) + MULT16_32_Q15(interp[1],accum[1]) + MULT16_32_Q15(interp[2],accum[2]) + MULT16_32_Q15(interp[3],accum[3]);
+      sum = MULT16_32_Q15(interp[0],SHR32(accum[0], 1)) + MULT16_32_Q15(interp[1],SHR32(accum[1], 1)) + MULT16_32_Q15(interp[2],SHR32(accum[2], 1)) + MULT16_32_Q15(interp[3],SHR32(accum[3], 1));
      sum = SATURATE32PSHR(sum, 15, 32767);
 #else
      cubic_coef(frac, interp);
@@ -572,7 +572,6 @@ static int resampler_basic_zero(SpeexResamplerState *st, spx_uint32_t channel_in
   const int frac_advance = st->frac_advance;
   const spx_uint32_t den_rate = st->den_rate;

-   (void)in;
   while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
   {
      out[out_stride * out_sample++] = 0;
@@ -590,15 +589,16 @@ static int resampler_basic_zero(SpeexResamplerState *st, spx_uint32_t channel_in
   return out_sample;
 }

-static int multiply_frac(spx_uint32_t *result, spx_uint32_t value, spx_uint32_t num, spx_uint32_t den)
+static int _muldiv(spx_uint32_t *result, spx_uint32_t value, spx_uint32_t mul, spx_uint32_t div)
 {
-   spx_uint32_t major = value / den;
-   spx_uint32_t remain = value % den;
+   speex_assert(result);
+   spx_uint32_t major = value / div;
+   spx_uint32_t remainder = value % div;
   /* TODO: Could use 64 bits operation to check for overflow. But only guaranteed in C99+ */
-   if (remain > UINT32_MAX / num || major > UINT32_MAX / num
-       || major * num > UINT32_MAX - remain * num / den)
+   if (remainder > UINT32_MAX / mul || major > UINT32_MAX / mul
+       || major * mul > UINT32_MAX - remainder * mul / div)
      return RESAMPLER_ERR_OVERFLOW;
-   *result = remain * num / den + major * num;
+   *result = remainder * mul / div + major * mul;
   return RESAMPLER_ERR_SUCCESS;
 }

@@ -619,7 +619,7 @@ static int update_filter(SpeexResamplerState *st)
   {
      /* down-sampling */
      st->cutoff = quality_map[st->quality].downsample_bandwidth * st->den_rate / st->num_rate;
-      if (multiply_frac(&st->filt_len,st->filt_len,st->num_rate,st->den_rate) != RESAMPLER_ERR_SUCCESS)
+      if (_muldiv(&st->filt_len,st->filt_len,st->num_rate,st->den_rate) != RESAMPLER_ERR_SUCCESS)
         goto fail;
      /* Round up to make sure we have a multiple of 8 for SSE */
      st->filt_len = ((st->filt_len-1)&(~0x7))+8;
@@ -638,12 +638,12 @@ static int update_filter(SpeexResamplerState *st)
      st->cutoff = quality_map[st->quality].upsample_bandwidth;
   }

+   /* Choose the resampling type that requires the least amount of memory */
 #ifdef RESAMPLE_FULL_SINC_TABLE
   use_direct = 1;
   if (INT_MAX/sizeof(spx_word16_t)/st->den_rate < st->filt_len)
      goto fail;
 #else
-   /* Choose the resampling type that requires the least amount of memory */
   use_direct = st->filt_len*st->den_rate <= st->filt_len*st->oversample+8
                && INT_MAX/sizeof(spx_word16_t)/st->den_rate >= st->filt_len;
 #endif
@@ -733,18 +733,16 @@ static int update_filter(SpeexResamplerState *st)
      {
         spx_uint32_t j;
         spx_uint32_t olen = old_length;
-         spx_uint32_t start = i*st->mem_alloc_size;
-         spx_uint32_t magic_samples = st->magic_samples[i];
         /*if (st->magic_samples[i])*/
         {
            /* Try and remove the magic samples as if nothing had happened */

            /* FIXME: This is wrong but for now we need it to avoid going over the array bounds */
-            olen = old_length + 2*magic_samples;
-            for (j=old_length-1+magic_samples;j--;)
-               st->mem[start+j+magic_samples] = st->mem[i*old_alloc_size+j];
-            for (j=0;j<magic_samples;j++)
-               st->mem[start+j] = 0;
+            olen = old_length + 2*st->magic_samples[i];
+            for (j=old_length-1+st->magic_samples[i];j--;)
+               st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]] = st->mem[i*old_alloc_size+j];
+            for (j=0;j<st->magic_samples[i];j++)
+               st->mem[i*st->mem_alloc_size+j] = 0;
            st->magic_samples[i] = 0;
         }
         if (st->filt_len > olen)
@@ -752,18 +750,17 @@ static int update_filter(SpeexResamplerState *st)
            /* If the new filter length is still bigger than the "augmented" length */
            /* Copy data going backward */
            for (j=0;j<olen-1;j++)
-               st->mem[start+(st->filt_len-2-j)] = st->mem[start+(olen-2-j)];
+               st->mem[i*st->mem_alloc_size+(st->filt_len-2-j)] = st->mem[i*st->mem_alloc_size+(olen-2-j)];
            /* Then put zeros for lack of anything better */
            for (;j<st->filt_len-1;j++)
-               st->mem[start+(st->filt_len-2-j)] = 0;
+               st->mem[i*st->mem_alloc_size+(st->filt_len-2-j)] = 0;
            /* Adjust last_sample */
            st->last_sample[i] += (st->filt_len - olen)/2;
         } else {
            /* Put back some of the magic! */
-            magic_samples = (olen - st->filt_len)/2;
-            for (j=0;j<st->filt_len-1+magic_samples;j++)
-               st->mem[start+j] = st->mem[start+j+magic_samples];
-            st->magic_samples[i] = magic_samples;
+            st->magic_samples[i] = (olen - st->filt_len)/2;
+            for (j=0;j<st->filt_len-1+st->magic_samples[i];j++)
+               st->mem[i*st->mem_alloc_size+j] = st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]];
         }
      }
   } else if (st->filt_len < old_length)
@@ -980,7 +977,8 @@ EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t cha
   const spx_uint32_t xlen = st->mem_alloc_size - (st->filt_len - 1);
 #ifdef VAR_ARRAYS
   const unsigned int ylen = (olen < FIXED_STACK_ALLOC) ? olen : FIXED_STACK_ALLOC;
-   spx_word16_t ystack[ylen];
+   VARDECL(spx_word16_t *ystack);
+   ALLOC(ystack, ylen, spx_word16_t);
 #else
   const unsigned int ylen = FIXED_STACK_ALLOC;
   spx_word16_t ystack[FIXED_STACK_ALLOC];
@@ -1095,7 +1093,7 @@ EXPORT void speex_resampler_get_rate(SpeexResamplerState *st, spx_uint32_t *in_r
   *out_rate = st->out_rate;
 }

-static inline spx_uint32_t compute_gcd(spx_uint32_t a, spx_uint32_t b)
+static inline spx_uint32_t _gcd(spx_uint32_t a, spx_uint32_t b)
 {
   while (b != 0)
   {
@@ -1125,7 +1123,7 @@ EXPORT int speex_resampler_set_rate_frac(SpeexResamplerState *st, spx_uint32_t r
   st->num_rate = ratio_num;
   st->den_rate = ratio_den;

-   fact = compute_gcd(st->num_rate, st->den_rate);
+   fact = _gcd (st->num_rate, st->den_rate);

   st->num_rate /= fact;
   st->den_rate /= fact;
@@ -1134,7 +1132,7 @@ EXPORT int speex_resampler_set_rate_frac(SpeexResamplerState *st, spx_uint32_t r
   {
      for (i=0;i<st->nb_channels;i++)
      {
-         if (multiply_frac(&st->samp_frac_num[i],st->samp_frac_num[i],st->den_rate,old_den) != RESAMPLER_ERR_SUCCESS)
+         if (_muldiv(&st->samp_frac_num[i],st->samp_frac_num[i],st->den_rate,old_den) != RESAMPLER_ERR_SUCCESS)
            return RESAMPLER_ERR_OVERFLOW;
         /* Safety net */
         if (st->samp_frac_num[i] >= st->den_rate)
--- a/3rdparty/cubeb/subprojects/speex/resample_neon.h
+++ b/3rdparty/cubeb/subprojects/speex/resample_neon.h
@@ -36,26 +36,14 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdint.h>
+#include <arm_neon.h>

 #ifdef FIXED_POINT
-#if defined(__aarch64__)
-static inline int32_t saturate_32bit_to_16bit(int32_t a) {
-    int32_t ret;
-    asm ("fmov s0, %w[a]\n"
-         "sqxtn h0, s0\n"
-         "sxtl v0.4s, v0.4h\n"
-         "fmov %w[ret], s0\n"
-         : [ret] "=r" (ret)
-         : [a] "r" (a)
-         : "v0" );
-    return ret;
-}
-#elif defined(__thumb2__)
+#ifdef __thumb2__
 static inline int32_t saturate_32bit_to_16bit(int32_t a) {
    int32_t ret;
    asm ("ssat %[ret], #16, %[a]"
-         : [ret] "=r" (ret)
+         : [ret] "=&r" (ret)
         : [a] "r" (a)
         : );
    return ret;
@@ -66,7 +54,7 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) {
    asm ("vmov.s32 d0[0], %[a]\n"
         "vqmovn.s32 d0, q0\n"
         "vmov.s16 %[ret], d0[0]\n"
-         : [ret] "=r" (ret)
+         : [ret] "=&r" (ret)
         : [a] "r" (a)
         : "q0");
    return ret;
@@ -76,63 +64,7 @@ static inline int32_t saturate_32bit_to_16bit(int32_t a) {
 #define WORD2INT(x) (saturate_32bit_to_16bit(x))

 #define OVERRIDE_INNER_PRODUCT_SINGLE
-/* Only works when len % 4 == 0 and len >= 4 */
-#if defined(__aarch64__)
-static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len)
-{
-    int32_t ret;
-    uint32_t remainder = len % 16;
-    len = len - remainder;
-
-    asm volatile ("	 cmp %w[len], #0\n"
-		  "	 b.ne 1f\n"
-		  "	 ld1 {v16.4h}, [%[b]], #8\n"
-		  "	 ld1 {v20.4h}, [%[a]], #8\n"
-		  "	 subs %w[remainder], %w[remainder], #4\n"
-		  "	 smull v0.4s, v16.4h, v20.4h\n"
-		  "      b.ne 4f\n"
-		  "	 b 5f\n"
-		  "1:"
-		  "	 ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n"
-		  "	 ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n"
-		  "	 subs %w[len], %w[len], #16\n"
-		  "	 smull v0.4s, v16.4h, v20.4h\n"
-		  "	 smlal v0.4s, v17.4h, v21.4h\n"
-		  "	 smlal v0.4s, v18.4h, v22.4h\n"
-		  "	 smlal v0.4s, v19.4h, v23.4h\n"
-		  "	 b.eq 3f\n"
-		  "2:"
-		  "	 ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n"
-		  "	 ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n"
-		  "	 subs %w[len], %w[len], #16\n"
-		  "	 smlal v0.4s, v16.4h, v20.4h\n"
-		  "	 smlal v0.4s, v17.4h, v21.4h\n"
-		  "	 smlal v0.4s, v18.4h, v22.4h\n"
-		  "	 smlal v0.4s, v19.4h, v23.4h\n"
-		  "	 b.ne 2b\n"
-		  "3:"
-		  "	 cmp %w[remainder], #0\n"
-		  "	 b.eq 5f\n"
-		  "4:"
-		  "	 ld1 {v18.4h}, [%[b]], #8\n"
-		  "	 ld1 {v22.4h}, [%[a]], #8\n"
-		  "	 subs %w[remainder], %w[remainder], #4\n"
-		  "	 smlal v0.4s, v18.4h, v22.4h\n"
-		  "	 b.ne 4b\n"
-		  "5:"
-		  "	 saddlv d0, v0.4s\n"
-		  "	 sqxtn s0, d0\n"
-		  "	 sqrshrn h0, s0, #15\n"
-		  "	 sxtl v0.4s, v0.4h\n"
-		  "	 fmov %w[ret], s0\n"
-		  : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
-		    [len] "+r" (len), [remainder] "+r" (remainder)
-		  :
-		  : "cc", "v0",
-		    "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23");
-    return ret;
-}
-#else
+/* Only works when len % 4 == 0 */
 static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len)
 {
    int32_t ret;
@@ -180,104 +112,33 @@ static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, u
 		  "	 vqmovn.s64 d0, q0\n"
 		  "	 vqrshrn.s32 d0, q0, #15\n"
 		  "	 vmov.s16 %[ret], d0[0]\n"
-		  : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
+		  : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b),
 		    [len] "+r" (len), [remainder] "+r" (remainder)
 		  :
 		  : "cc", "q0",
-		    "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23");
+		    "d16", "d17", "d18", "d19",
+		    "d20", "d21", "d22", "d23");

    return ret;
 }
-#endif  // !defined(__aarch64__)
-
 #elif defined(FLOATING_POINT)
-#if defined(__aarch64__)
-static inline int32_t saturate_float_to_16bit(float a) {
-    int32_t ret;
-    asm ("fcvtas s1, %s[a]\n"
-         "sqxtn h1, s1\n"
-         "sxtl v1.4s, v1.4h\n"
-         "fmov %w[ret], s1\n"
-         : [ret] "=r" (ret)
-         : [a] "w" (a)
-         : "v1");
-    return ret;
-}
-#else
+
 static inline int32_t saturate_float_to_16bit(float a) {
    int32_t ret;
    asm ("vmov.f32 d0[0], %[a]\n"
         "vcvt.s32.f32 d0, d0, #15\n"
         "vqrshrn.s32 d0, q0, #15\n"
         "vmov.s16 %[ret], d0[0]\n"
-         : [ret] "=r" (ret)
+         : [ret] "=&r" (ret)
         : [a] "r" (a)
         : "q0");
    return ret;
 }
-#endif
-
 #undef WORD2INT
 #define WORD2INT(x) (saturate_float_to_16bit(x))

 #define OVERRIDE_INNER_PRODUCT_SINGLE
-/* Only works when len % 4 == 0 and len >= 4 */
-#if defined(__aarch64__)
-static inline float inner_product_single(const float *a, const float *b, unsigned int len)
-{
-    float ret;
-    uint32_t remainder = len % 16;
-    len = len - remainder;
-
-    asm volatile ("	 cmp %w[len], #0\n"
-		  "	 b.ne 1f\n"
-		  "	 ld1 {v16.4s}, [%[b]], #16\n"
-		  "	 ld1 {v20.4s}, [%[a]], #16\n"
-		  "	 subs %w[remainder], %w[remainder], #4\n"
-		  "	 fmul v1.4s, v16.4s, v20.4s\n"
-		  "      b.ne 4f\n"
-		  "	 b 5f\n"
-		  "1:"
-		  "	 ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n"
-		  "	 ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n"
-		  "	 subs %w[len], %w[len], #16\n"
-		  "	 fmul v1.4s, v16.4s, v20.4s\n"
-		  "	 fmul v2.4s, v17.4s, v21.4s\n"
-		  "	 fmul v3.4s, v18.4s, v22.4s\n"
-		  "	 fmul v4.4s, v19.4s, v23.4s\n"
-		  "	 b.eq 3f\n"
-		  "2:"
-		  "	 ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n"
-		  "	 ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n"
-		  "	 subs %w[len], %w[len], #16\n"
-		  "	 fmla v1.4s, v16.4s, v20.4s\n"
-		  "	 fmla v2.4s, v17.4s, v21.4s\n"
-		  "	 fmla v3.4s, v18.4s, v22.4s\n"
-		  "	 fmla v4.4s, v19.4s, v23.4s\n"
-		  "	 b.ne 2b\n"
-		  "3:"
-		  "	 fadd v16.4s, v1.4s, v2.4s\n"
-		  "	 fadd v17.4s, v3.4s, v4.4s\n"
-		  "	 cmp %w[remainder], #0\n"
-		  "	 fadd v1.4s, v16.4s, v17.4s\n"
-		  "	 b.eq 5f\n"
-		  "4:"
-		  "	 ld1 {v18.4s}, [%[b]], #16\n"
-		  "	 ld1 {v22.4s}, [%[a]], #16\n"
-		  "	 subs %w[remainder], %w[remainder], #4\n"
-		  "	 fmla v1.4s, v18.4s, v22.4s\n"
-		  "	 b.ne 4b\n"
-		  "5:"
-		  "	 faddp v1.4s, v1.4s, v1.4s\n"
-		  "	 faddp %[ret].4s, v1.4s, v1.4s\n"
-		  : [ret] "=w" (ret), [a] "+r" (a), [b] "+r" (b),
-		    [len] "+r" (len), [remainder] "+r" (remainder)
-		  :
-		  : "cc", "v1", "v2", "v3", "v4",
-		    "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23");
-    return ret;
-}
-#else
+/* Only works when len % 4 == 0 */
 static inline float inner_product_single(const float *a, const float *b, unsigned int len)
 {
    float ret;
@@ -330,12 +191,11 @@ static inline float inner_product_single(const float *a, const float *b, unsigne
 		  "	 vadd.f32 d0, d0, d1\n"
 		  "	 vpadd.f32 d0, d0, d0\n"
 		  "	 vmov.f32 %[ret], d0[0]\n"
-		  : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b),
+		  : [ret] "=&r" (ret), [a] "+r" (a), [b] "+r" (b),
 		    [len] "+l" (len), [remainder] "+l" (remainder)
 		  :
-		  : "cc", "q0", "q1", "q2", "q3",
-		    "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11");
+		  : "cc", "q0", "q1", "q2", "q3", "q4", "q5", "q6", "q7", "q8",
+                    "q9", "q10", "q11");
    return ret;
 }
-#endif  // defined(__aarch64__)
 #endif
--- a/3rdparty/cubeb/subprojects/speex/resample_sse.h
+++ b/3rdparty/cubeb/subprojects/speex/resample_sse.h
@@ -71,7 +71,7 @@ static inline float interpolate_product_single(const float *a, const float *b, u
   return ret;
 }

-#ifdef USE_SSE2
+#ifdef _USE_SSE2
 #include <emmintrin.h>
 #define OVERRIDE_INNER_PRODUCT_DOUBLE

--- a/3rdparty/d3d12memalloc/CHANGELOG.md
+++ b/3rdparty/d3d12memalloc/CHANGELOG.md
@@ -1,34 +1,3 @@
-# 3.0.1 (2025-05-08)
-
- Fixed macros `D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS`, `D3D12MA_RECOMMENDED_POOL_FLAGS` (#73).
-
-# 3.0.0 (2025-05-05)
-
-It has been a long time since the previous official release, so hopefully everyone has been using the latest code from "master" branch, which is always maintained in a good state, not the old version. For completeness, here is the list of changes since v2.0.1. The major version number has changed, so there are some compatibility-breaking changes, but the basic API stays the same and is mostly backward-compatible.
-
- Added helper structs: `CALLOCATION_DESC`, `CPOOL_DESC`, `CVIRTUAL_BLOCK_DESC`, `CVIRTUAL_ALLOCATION_DESC`.
- Added macros: `D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS`, `D3D12MA_RECOMMENDED_HEAP_FLAGS`, `D3D12MA_RECOMMENDED_POOL_FLAGS`.
- Added functions: `Allocator::CreateResource3`, `CreateAliasingResource2`.
-    - They support parameters: `D3D12_BARRIER_LAYOUT InitialLayout`, `const DXGI_FORMAT* pCastableFormats`.
-    - They require recent DirectX 12 Agility SDK. To use them, `ID3D12Device10` must be available.
-      To use non-empty list of castable formats, `ID3D12Device12` must be available.
- Added support for GPU Upload Heaps (`D3D12_HEAP_TYPE_GPU_UPLOAD`).
-    - Requires recent DirectX 12 Agility SDK. Support on the user's machine is available only when supported by the motherboard, GPU, drivers, and enabled as "Resizable BAR" in UEFI settings. It can be queried using new `Allocator::IsGPUUploadHeapSupported` function.
-    - `TotalStatistics::HeapType` array was extended from 4 to 5 elements.
- Added missing function `Allocator::CreateAliasingResource1`.
- Added `POOL_DESC::ResidencyPriority` member.
- Removed `Allocation::WasZeroInitialized` function. It wasn't fully implemented anyway.
- Added `POOL_FLAG_ALWAYS_COMMITTED`.
- Added a heuristic that prefers creating small buffers as committed to save memory.
-    - It is enabled by default. It can be disabled by new flag `ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED`.
- Macro `D3D12MA_OPTIONS16_SUPPORTED` is no longer exposed in the header or Cmake script.
-  It is defined automatically based on the Agility SDK version.
- Added macro `D3D12MA_DEBUG_LOG`, which can be used to log unfreed allocations.
- Many improvements in the documentation, including new chapters: "Frequently asked questions", "Optimal resource allocation".
- Countless fixes and improvements, including performance optimizations, compatibility with various compilers, tests.
- Major changes in the Cmake script.
- Fixes in "GpuMemDumpVis.py" script.
-
 # 2.0.1 (2022-04-05)

 A maintenance release with some bug fixes and improvements. There are no changes in the library API.
--- a/3rdparty/d3d12memalloc/LICENSE.txt
+++ b/3rdparty/d3d12memalloc/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/3rdparty/d3d12memalloc/README.md
+++ b/3rdparty/d3d12memalloc/README.md
@@ -10,6 +10,10 @@ Easy to integrate memory allocation library for Direct3D 12.

 **Product page:** [D3D12 Memory Allocator on GPUOpen](https://gpuopen.com/gaming-product/d3d12-memory-allocator/)

+**Build status:**
+
+Windows: [![Build status](https://ci.appveyor.com/api/projects/status/860i07bxv55ydgvg?svg=true)](https://ci.appveyor.com/project/adam-sawicki-amd/d3d12memoryallocator)
+
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.svg)](http://isitmaintained.com/project/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator "Average time to resolve an issue")

 # Problem
@@ -87,7 +91,7 @@ With this one function call:

 # Binaries

-The release comes with precompiled binary executable for "D3D12Sample" application which contains test suite. It is compiled using Visual Studio 2022, so it requires appropriate libraries to work, including "MSVCP140.dll", "VCRUNTIME140.dll", "VCRUNTIME140_1.dll". If its launch fails with error message telling about those files missing, please download and install [Microsoft Visual C++ Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170), "X64" version.
+The release comes with precompiled binary executable for "D3D12Sample" application which contains test suite. It is compiled using Visual Studio 2019, so it requires appropriate libraries to work, including "MSVCP140.dll", "VCRUNTIME140.dll", "VCRUNTIME140_1.dll". If its launch fails with error message telling about those files missing, please download and install [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads), "x64" version.

 # Copyright notice

@@ -109,8 +113,7 @@ For more information see [NOTICES.txt](NOTICES.txt).

 - **[Qt Project](https://github.com/qt)**
 - **[Ghost of Tsushima: Director's Cut PC](https://www.youtube.com/watch?v=cPKBDbCYctc&t=698s)** - Information avaliable in 11:38 of credits
- **[Godot Engine](https://github.com/godotengine/godot/)** - multi-platform 2D and 3D game engine. License: MIT.
 - **[The Forge](https://github.com/ConfettiFX/The-Forge)** - cross-platform rendering framework. Apache License 2.0.
- **[Wicked Engine](https://github.com/turanszkij/WickedEngine)** - 3D engine with modern graphics
+- **[Wicked Engine<img src="https://github.com/turanszkij/WickedEngine/blob/master/Content/logo_small.png" width="28px" align="center"/>](https://github.com/turanszkij/WickedEngine)** - 3D engine with modern graphics

 [Some other projects on GitHub](https://github.com/search?q=D3D12MemAlloc.h&type=Code) and some game development studios that use DX12 in their games.
--- a/3rdparty/d3d12memalloc/include/D3D12MemAlloc.h
+++ b/3rdparty/d3d12memalloc/include/D3D12MemAlloc.h
--- a/3rdparty/d3d12memalloc/src/D3D12MemAlloc.cpp
+++ b/3rdparty/d3d12memalloc/src/D3D12MemAlloc.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2024 Advanced Micro Devices, Inc. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -33,13 +33,6 @@
    #include <shared_mutex>
 #endif

-// Includes needed for MinGW - see #71.
-#ifndef _MSC_VER
-    #include <guiddef.h>
-    // guiddef.h must be included first.
-    #include <dxguids.h>
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -49,14 +42,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 #ifndef _D3D12MA_CONFIGURATION

-#if !defined(D3D12MA_CPP20)
-    #if __cplusplus >= 202002L || _MSVC_LANG >= 202002L // C++20
-        #define D3D12MA_CPP20 1
-    #else
-        #define D3D12MA_CPP20 0
-    #endif
-#endif
-
 #ifdef _WIN32
    #if !defined(WINVER) || WINVER < 0x0600
        #error Required at least WinAPI version supporting: client = Windows Vista, server = Windows Server 2008.
@@ -79,10 +64,6 @@
    #define D3D12MA_ASSERT(cond) assert(cond)
 #endif

-#if D3D12MA_CPP20
-    #include <bit>
-#endif
-
 // Assert that will be called very often, like inside data structures e.g. operator[].
 // Making it non-empty can make program slow.
 #ifndef D3D12MA_HEAVY_ASSERT
@@ -126,14 +107,6 @@ especially to test compatibility with D3D12_RESOURCE_HEAP_TIER_1 on modern GPUs.
   #define D3D12MA_DEFAULT_BLOCK_SIZE (64ull * 1024 * 1024)
 #endif

-#ifndef D3D12MA_OPTIONS16_SUPPORTED
-    #if D3D12_SDK_VERSION >= 610
-        #define D3D12MA_OPTIONS16_SUPPORTED 1
-    #else
-        #define D3D12MA_OPTIONS16_SUPPORTED 0
-    #endif
-#endif
-
 #ifndef D3D12MA_DEBUG_LOG
   #define D3D12MA_DEBUG_LOG(format, ...)
   /*
@@ -155,6 +128,10 @@ especially to test compatibility with D3D12_RESOURCE_HEAP_TIER_1 on modern GPUs.

 #define D3D12MA_IID_PPV_ARGS(ppType)   __uuidof(**(ppType)), reinterpret_cast<void**>(ppType)

+#ifdef __ID3D12Device8_INTERFACE_DEFINED__
+    #define D3D12MA_CREATE_NOT_ZEROED_AVAILABLE 1
+#endif
+
 namespace D3D12MA
 {
 static constexpr UINT HEAP_TYPE_COUNT = 5;
@@ -315,10 +292,6 @@ static UINT8 BitScanLSB(UINT64 mask)
    if (_BitScanForward64(&pos, mask))
        return static_cast<UINT8>(pos);
    return UINT8_MAX;
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return static_cast<uint8_t>(std::countr_zero(mask));
-    return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
    return static_cast<UINT8>(__builtin_ffsll(mask)) - 1U;
 #else
@@ -341,10 +314,6 @@ static UINT8 BitScanLSB(UINT32 mask)
    if (_BitScanForward(&pos, mask))
        return static_cast<UINT8>(pos);
    return UINT8_MAX;
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return static_cast<uint8_t>(std::countr_zero(mask));
-    return UINT8_MAX;
 #elif defined __GNUC__ || defined __clang__
    return static_cast<UINT8>(__builtin_ffs(mask)) - 1U;
 #else
@@ -367,9 +336,6 @@ static UINT8 BitScanMSB(UINT64 mask)
    unsigned long pos;
    if (_BitScanReverse64(&pos, mask))
        return static_cast<UINT8>(pos);
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return 63 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
    if (mask)
        return 63 - static_cast<UINT8>(__builtin_clzll(mask));
@@ -392,9 +358,6 @@ static UINT8 BitScanMSB(UINT32 mask)
    unsigned long pos;
    if (_BitScanReverse(&pos, mask))
        return static_cast<UINT8>(pos);
-#elif D3D12MA_CPP20
-    if (mask != 0)
-        return 31 - static_cast<uint8_t>(std::countl_zero(mask));
 #elif defined __GNUC__ || defined __clang__
    if (mask)
        return 31 - static_cast<UINT8>(__builtin_clz(mask));
@@ -2828,7 +2791,7 @@ class AllocationObjectAllocator
    D3D12MA_CLASS_NO_COPY(AllocationObjectAllocator);
 public:
    AllocationObjectAllocator(const ALLOCATION_CALLBACKS& allocationCallbacks, bool useMutex)
-		: m_UseMutex(useMutex), m_Allocator(allocationCallbacks, 1024) {}
+        : m_Allocator(allocationCallbacks, 1024), m_UseMutex(useMutex) {}

    template<typename... Types>
    Allocation* Allocate(Types... args);
@@ -3019,7 +2982,7 @@ void BlockMetadata::DebugLogAllocation(UINT64 offset, UINT64 size, void* private
        LPCWSTR name = allocation->GetName();

        D3D12MA_DEBUG_LOG(L"UNFREED ALLOCATION; Offset: %llu; Size: %llu; PrivateData: %p; Name: %s",
-            offset, size, privateData, name ? name : L"");
+            offset, size, privateData, name ? name : L"D3D12MA_Empty");
    }
 }

@@ -5406,8 +5369,8 @@ struct CREATE_RESOURCE_PARAMS
 {
    CREATE_RESOURCE_PARAMS() = delete;
    CREATE_RESOURCE_PARAMS(
-        const D3D12_RESOURCE_DESC* pResourceDesc,
-        D3D12_RESOURCE_STATES InitialResourceState,
+        const D3D12_RESOURCE_DESC* pResourceDesc, 
+        D3D12_RESOURCE_STATES InitialResourceState, 
        const D3D12_CLEAR_VALUE* pOptimizedClearValue)
        : Variant(VARIANT_WITH_STATE)
        , pResourceDesc(pResourceDesc)
@@ -5417,8 +5380,8 @@ struct CREATE_RESOURCE_PARAMS
    }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    CREATE_RESOURCE_PARAMS(
-        const D3D12_RESOURCE_DESC1* pResourceDesc,
-        D3D12_RESOURCE_STATES InitialResourceState,
+        const D3D12_RESOURCE_DESC1* pResourceDesc, 
+        D3D12_RESOURCE_STATES InitialResourceState, 
        const D3D12_CLEAR_VALUE* pOptimizedClearValue)
        : Variant(VARIANT_WITH_STATE_AND_DESC1)
        , pResourceDesc1(pResourceDesc)
@@ -5433,7 +5396,7 @@ struct CREATE_RESOURCE_PARAMS
        D3D12_BARRIER_LAYOUT InitialLayout,
        const D3D12_CLEAR_VALUE* pOptimizedClearValue,
        UINT32 NumCastableFormats,
-        const DXGI_FORMAT* pCastableFormats)
+        DXGI_FORMAT* pCastableFormats)
        : Variant(VARIANT_WITH_LAYOUT)
        , pResourceDesc1(pResourceDesc)
        , InitialLayout(InitialLayout)
@@ -5503,7 +5466,7 @@ struct CREATE_RESOURCE_PARAMS
        D3D12MA_ASSERT(Variant >= VARIANT_WITH_LAYOUT);
        return NumCastableFormats;
    }
-    const DXGI_FORMAT* GetCastableFormats() const
+    DXGI_FORMAT* GetCastableFormats() const
    {
        D3D12MA_ASSERT(Variant >= VARIANT_WITH_LAYOUT);
        return pCastableFormats;
@@ -5528,7 +5491,7 @@ private:
    const D3D12_CLEAR_VALUE* pOptimizedClearValue;
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
    UINT32 NumCastableFormats;
-    const DXGI_FORMAT* pCastableFormats;
+    DXGI_FORMAT* pCastableFormats;
 #endif
 };

@@ -5578,7 +5541,6 @@ public:
        UINT64 size,
        UINT64 alignment,
        const ALLOCATION_DESC& allocDesc,
-        bool committedAllowed,
        size_t allocationCount,
        Allocation** pAllocations);

@@ -5589,7 +5551,6 @@ public:
        UINT64 alignment,
        const ALLOCATION_DESC& allocDesc,
        const CREATE_RESOURCE_PARAMS& createParams,
-        bool committedAllowed,
        Allocation** ppAllocation,
        REFIID riidResource,
        void** ppvResource);
@@ -5640,7 +5601,6 @@ private:
        UINT64 size,
        UINT64 alignment,
        const ALLOCATION_DESC& allocDesc,
-        bool committedAllowed,
        Allocation** pAllocation);

    HRESULT AllocateFromBlock(
@@ -5746,31 +5706,29 @@ HRESULT CurrentBudgetData::UpdateBudget(IDXGIAdapter3* adapter3, bool useMutex)
    DXGI_QUERY_VIDEO_MEMORY_INFO infoLocal = {};
    DXGI_QUERY_VIDEO_MEMORY_INFO infoNonLocal = {};
    const HRESULT hrLocal = adapter3->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &infoLocal);
-    if (FAILED(hrLocal))
-    {
-        return hrLocal;
-    }
    const HRESULT hrNonLocal = adapter3->QueryVideoMemoryInfo(0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &infoNonLocal);
-    if (FAILED(hrNonLocal))
-    {
-        return hrNonLocal;
-    }

+    if (SUCCEEDED(hrLocal) || SUCCEEDED(hrNonLocal))
    {
        MutexLockWrite lockWrite(m_BudgetMutex, useMutex);

-        m_D3D12Usage[0] = infoLocal.CurrentUsage;
-        m_D3D12Budget[0] = infoLocal.Budget;
-
-        m_D3D12Usage[1] = infoNonLocal.CurrentUsage;
-        m_D3D12Budget[1] = infoNonLocal.Budget;
+        if (SUCCEEDED(hrLocal))
+        {
+            m_D3D12Usage[0] = infoLocal.CurrentUsage;
+            m_D3D12Budget[0] = infoLocal.Budget;
+        }
+        if (SUCCEEDED(hrNonLocal))
+        {
+            m_D3D12Usage[1] = infoNonLocal.CurrentUsage;
+            m_D3D12Budget[1] = infoNonLocal.Budget;
+        }

        m_BlockBytesAtD3D12Fetch[0] = m_BlockBytes[0];
        m_BlockBytesAtD3D12Fetch[1] = m_BlockBytes[1];
        m_OperationsSinceBudgetFetch = 0;
    }

-    return S_OK;
+    return FAILED(hrLocal) ? hrLocal : hrNonLocal;
 }
 #endif // #if D3D12MA_DXGI_1_4

@@ -5889,7 +5847,6 @@ public:

    AllocatorPimpl* GetAllocator() const { return m_Allocator; }
    const POOL_DESC& GetDesc() const { return m_Desc; }
-    bool AlwaysCommitted() const { return (m_Desc.Flags & POOL_FLAG_ALWAYS_COMMITTED) != 0; }
    bool SupportsCommittedAllocations() const { return m_Desc.BlockSize == 0; }
    LPCWSTR GetName() const { return m_Name; }

@@ -5946,12 +5903,6 @@ public:
 #endif
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    ID3D12Device8* GetDevice8() const { return m_Device8; }
-#endif
-#ifdef __ID3D12Device10_INTERFACE_DEFINED__
-    ID3D12Device10* GetDevice10() const { return m_Device10; }
-#endif
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    ID3D12Device12* GetDevice12() const { return m_Device12; }
 #endif
    // Shortcut for "Allocation Callbacks", because this function is called so often.
    const ALLOCATION_CALLBACKS& GetAllocs() const { return m_AllocationCallbacks; }
@@ -6060,9 +6011,6 @@ private:
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
    ID3D12Device10* m_Device10 = NULL;  // AddRef, optional
-#endif
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    ID3D12Device12* m_Device12 = NULL;  // AddRef, optional
 #endif
    IDXGIAdapter* m_Adapter; // AddRef
 #if D3D12MA_DXGI_1_4
@@ -6123,26 +6071,12 @@ private:
    HRESULT UpdateD3D12Budget();
    
    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC& resourceDesc) const;
-    HRESULT GetResourceAllocationInfoMiddle(D3D12_RESOURCE_DESC& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
-
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo2Native(const D3D12_RESOURCE_DESC1& resourceDesc) const;
-    HRESULT GetResourceAllocationInfoMiddle(D3D12_RESOURCE_DESC1& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
-#endif
-
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo3Native(const D3D12_RESOURCE_DESC1& resourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats) const;
+    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC1& resourceDesc) const;
 #endif

    template<typename D3D12_RESOURCE_DESC_T>
-    HRESULT GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc,
-        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;
+    D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc) const;

    bool NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size);

@@ -6214,10 +6148,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
    m_Device->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Device10));
 #endif

-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    m_Device->QueryInterface(D3D12MA_IID_PPV_ARGS(&m_Device12));
-#endif
-
    HRESULT hr = m_Adapter->GetDesc(&m_AdapterDesc);
    if (FAILED(hr))
    {
@@ -6233,6 +6163,9 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
    m_D3D12Options.ResourceHeapTier = (D3D12MA_FORCE_RESOURCE_HEAP_TIER);
 #endif

+// You must define this macro to like `#define D3D12MA_OPTIONS16_SUPPORTED 1` to enable GPU Upload Heaps!
+// Unfortunately there is no way to programmatically check if the included <d3d12.h> defines D3D12_FEATURE_DATA_D3D12_OPTIONS16 or not.
+// Main interfaces have respective macros like __ID3D12Device4_INTERFACE_DEFINED__, but structures like this do not.
 #if D3D12MA_OPTIONS16_SUPPORTED
    {
        D3D12_FEATURE_DATA_D3D12_OPTIONS16 options16 = {};
@@ -6242,7 +6175,7 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
            m_GPUUploadHeapSupported = options16.GPUUploadHeapSupported;
        }
    }
-#endif // #if D3D12MA_OPTIONS16_SUPPORTED
+#endif

    hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &m_D3D12Architecture, sizeof(m_D3D12Architecture));
    if (FAILED(hr))
@@ -6290,9 +6223,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)

 AllocatorPimpl::~AllocatorPimpl()
 {
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-    SAFE_RELEASE(m_Device12);
-#endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
    SAFE_RELEASE(m_Device10);
 #endif
@@ -6389,15 +6319,12 @@ HRESULT AllocatorPimpl::CreatePlacedResourceWrap(
        {
            return E_NOINTERFACE;
        }
-        // Microsoft defined pCastableFormats parameter as pointer to non-const and only fixed it in later Agility SDK,
-        // thus we need const_cast.
        return m_Device10->CreatePlacedResource2(pHeap, HeapOffset,
            createParams.GetResourceDesc1(), createParams.GetInitialLayout(),
            createParams.GetOptimizedClearValue(), createParams.GetNumCastableFormats(),
-            const_cast<DXGI_FORMAT*>(createParams.GetCastableFormats()), riidResource, ppvResource);
-    }
+            createParams.GetCastableFormats(), riidResource, ppvResource);
+    } else
 #endif
-
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
    {
@@ -6408,20 +6335,22 @@ HRESULT AllocatorPimpl::CreatePlacedResourceWrap(
        return m_Device8->CreatePlacedResource1(pHeap, HeapOffset,
            createParams.GetResourceDesc1(), createParams.GetInitialResourceState(),
            createParams.GetOptimizedClearValue(), riidResource, ppvResource);
-    }
+    } else 
 #endif
-
    if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE)
    {
        return m_Device->CreatePlacedResource(pHeap, HeapOffset,
            createParams.GetResourceDesc(), createParams.GetInitialResourceState(),
            createParams.GetOptimizedClearValue(), riidResource, ppvResource);
    }
-
-    D3D12MA_ASSERT(0);
-    return E_INVALIDARG;
+    else
+    {
+        D3D12MA_ASSERT(0);
+        return E_INVALIDARG;
+    }
 }

+
 HRESULT AllocatorPimpl::CreateResource(
    const ALLOCATION_DESC* pAllocDesc,
    const CREATE_RESOURCE_PARAMS& createParams,
@@ -6437,7 +6366,6 @@ HRESULT AllocatorPimpl::CreateResource(
        *ppvResource = NULL;
    }

-    HRESULT hr = E_NOINTERFACE;
    CREATE_RESOURCE_PARAMS finalCreateParams = createParams;
    D3D12_RESOURCE_DESC finalResourceDesc;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
@@ -6448,49 +6376,45 @@ HRESULT AllocatorPimpl::CreateResource(
    {
        finalResourceDesc = *createParams.GetResourceDesc();
        finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc);
    }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
    {
-        if (m_Device8 != NULL)
+        if (!m_Device8)
        {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
+            return E_NOINTERFACE;
        }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
    }
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_LAYOUT)
    {
-        if (m_Device10 != NULL)
+        if (!m_Device10)
        {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
+            return E_NOINTERFACE;
        }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
    }
 #endif
    else
    {
        D3D12MA_ASSERT(0);
-        hr = E_INVALIDARG;
+        return E_INVALIDARG;
    }
-
-    if (FAILED(hr))
-        return hr;
-
    D3D12MA_ASSERT(IsPow2(resAllocInfo.Alignment));
-    // We've seen UINT64_MAX returned when the call to GetResourceAllocationInfo was invalid.
-    D3D12MA_ASSERT(resAllocInfo.SizeInBytes != UINT64_MAX);
    D3D12MA_ASSERT(resAllocInfo.SizeInBytes > 0);

    BlockVector* blockVector = NULL;
    CommittedAllocationParameters committedAllocationParams = {};
    bool preferCommitted = false;
    
+    HRESULT hr;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    if (createParams.Variant >= CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
    {
@@ -6521,7 +6445,7 @@ HRESULT AllocatorPimpl::CreateResource(
    if (blockVector != NULL)
    {
        hr = blockVector->CreateResource(resAllocInfo.SizeInBytes, resAllocInfo.Alignment,
-            *pAllocDesc, finalCreateParams, committedAllocationParams.IsValid(),
+            *pAllocDesc, finalCreateParams,
            ppAllocation, riidResource, ppvResource);
        if (SUCCEEDED(hr))
            return hr;
@@ -6564,7 +6488,7 @@ HRESULT AllocatorPimpl::AllocateMemory(
    if (blockVector != NULL)
    {
        hr = blockVector->Allocate(pAllocInfo->SizeInBytes, pAllocInfo->Alignment,
-            *pAllocDesc, committedAllocationParams.IsValid(), 1, (Allocation**)ppAllocation);
+            *pAllocDesc, 1, (Allocation**)ppAllocation);
        if (SUCCEEDED(hr))
            return hr;
    }
@@ -6586,7 +6510,6 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
 {
    *ppvResource = NULL;

-    HRESULT hr = E_NOINTERFACE;
    CREATE_RESOURCE_PARAMS finalCreateParams = createParams;
    D3D12_RESOURCE_DESC finalResourceDesc;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
@@ -6597,40 +6520,37 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
    {
        finalResourceDesc = *createParams.GetResourceDesc();
        finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc);
    }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
    {
-        if (m_Device8 != NULL)
+        if (!m_Device8)
        {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
+            return E_NOINTERFACE;
        }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
    }
 #endif
 #ifdef __ID3D12Device10_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_LAYOUT)
    {
-        if (m_Device10 != NULL)
+        if (!m_Device10)
        {
-            finalResourceDesc1 = *createParams.GetResourceDesc1();
-            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
+            return E_NOINTERFACE;
        }
+        finalResourceDesc1 = *createParams.GetResourceDesc1();
+        finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
+        resAllocInfo = GetResourceAllocationInfo(finalResourceDesc1);
    }
 #endif
    else
    {
        D3D12MA_ASSERT(0);
-        hr = E_INVALIDARG;
+        return E_INVALIDARG;
    }
-
-    if (FAILED(hr))
-        return hr;
-
    D3D12MA_ASSERT(IsPow2(resAllocInfo.Alignment));
    D3D12MA_ASSERT(resAllocInfo.SizeInBytes > 0);

@@ -6853,41 +6773,42 @@ void AllocatorPimpl::GetBudget(Budget* outLocalBudget, Budget* outNonLocalBudget
                outLocalBudget ? &outLocalBudget->BudgetBytes : NULL,
                outNonLocalBudget ? &outNonLocalBudget->UsageBytes : NULL,
                outNonLocalBudget ? &outNonLocalBudget->BudgetBytes : NULL);
-            return;
        }
-
-        if (SUCCEEDED(UpdateD3D12Budget()))
+        else
        {
-            GetBudget(outLocalBudget, outNonLocalBudget); // Recursion.
-            return;
+            UpdateD3D12Budget();
+            GetBudget(outLocalBudget, outNonLocalBudget); // Recursion
        }
    }
+    else
 #endif
-
-    // Fallback path - manual calculation, not real budget.
-    if (outLocalBudget)
    {
-        outLocalBudget->UsageBytes = outLocalBudget->Stats.BlockBytes;
-        outLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY) * 8 / 10; // 80% heuristics.
-    }
-    if (outNonLocalBudget)
-    {
-        outNonLocalBudget->UsageBytes = outNonLocalBudget->Stats.BlockBytes;
-        outNonLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        if (outLocalBudget)
+        {
+            outLocalBudget->UsageBytes = outLocalBudget->Stats.BlockBytes;
+            outLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        }
+        if (outNonLocalBudget)
+        {
+            outNonLocalBudget->UsageBytes = outNonLocalBudget->Stats.BlockBytes;
+            outNonLocalBudget->BudgetBytes = GetMemoryCapacity(DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL_COPY) * 8 / 10; // 80% heuristics.
+        }
    }
 }

 void AllocatorPimpl::GetBudgetForHeapType(Budget& outBudget, D3D12_HEAP_TYPE heapType)
 {
-    const bool isLocal = StandardHeapTypeToMemorySegmentGroup(heapType) ==
-        DXGI_MEMORY_SEGMENT_GROUP_LOCAL_COPY;
-    if (isLocal)
+    switch (heapType)
    {
+    case D3D12_HEAP_TYPE_DEFAULT:
+    case D3D12_HEAP_TYPE_GPU_UPLOAD_COPY:
        GetBudget(&outBudget, NULL);
-    }
-    else
-    {
+        break;
+    case D3D12_HEAP_TYPE_UPLOAD:
+    case D3D12_HEAP_TYPE_READBACK:
        GetBudget(NULL, &outBudget);
+        break;
+    default: D3D12MA_ASSERT(0);
    }
 }

@@ -7327,15 +7248,12 @@ HRESULT AllocatorPimpl::AllocateCommittedResource(
        {
            return E_NOINTERFACE;
        }
-
-        // Microsoft defined pCastableFormats parameter as pointer to non-const and only fixed it in later Agility SDK,
-        // thus we need const_cast.
        hr = m_Device10->CreateCommittedResource3(
                &committedAllocParams.m_HeapProperties,
                committedAllocParams.m_HeapFlags & ~RESOURCE_CLASS_HEAP_FLAGS,
                createParams.GetResourceDesc1(), createParams.GetInitialLayout(),
                createParams.GetOptimizedClearValue(), committedAllocParams.m_ProtectedSession,
-                createParams.GetNumCastableFormats(), const_cast<DXGI_FORMAT*>(createParams.GetCastableFormats()),
+                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(),
                D3D12MA_IID_PPV_ARGS(&res));
    } else
 #endif
@@ -7478,8 +7396,8 @@ HRESULT AllocatorPimpl::CalcAllocationParams(const ALLOCATION_DESC& allocDesc, U
    outCommittedAllocationParams = CommittedAllocationParameters();
    outPreferCommitted = false;

-    if (allocDesc.HeapType == D3D12_HEAP_TYPE_GPU_UPLOAD_COPY && !IsGPUUploadHeapSupported())
-        return E_NOTIMPL;
+    D3D12MA_ASSERT((allocDesc.HeapType != D3D12_HEAP_TYPE_GPU_UPLOAD_COPY || IsGPUUploadHeapSupported()) &&
+        "Trying to allocate from D3D12_HEAP_TYPE_GPU_UPLOAD while GPUUploadHeapSupported == FALSE or D3D12MA_OPTIONS16_SUPPORTED macro was not defined when compiling D3D12MA library.");

    bool msaaAlwaysCommitted;
    if (allocDesc.CustomPool != NULL)
@@ -7487,8 +7405,7 @@ HRESULT AllocatorPimpl::CalcAllocationParams(const ALLOCATION_DESC& allocDesc, U
        PoolPimpl* const pool = allocDesc.CustomPool->m_Pimpl;

        msaaAlwaysCommitted = pool->GetBlockVector()->DeniesMsaaTextures();
-        if(!pool->AlwaysCommitted())
-            outBlockVector = pool->GetBlockVector();
+        outBlockVector = pool->GetBlockVector();

        const auto& desc = pool->GetDesc();
        outCommittedAllocationParams.m_ProtectedSession = desc.pProtectedSession;
@@ -7527,6 +7444,12 @@ HRESULT AllocatorPimpl::CalcAllocationParams(const ALLOCATION_DESC& allocDesc, U
                outPreferCommitted = true;
            }
        }
+
+        const D3D12_HEAP_FLAGS extraHeapFlags = allocDesc.ExtraHeapFlags & ~RESOURCE_CLASS_HEAP_FLAGS;
+        if (outBlockVector != NULL && extraHeapFlags != 0)
+        {
+            outBlockVector = NULL;
+        }
    }

    if ((allocDesc.Flags & ALLOCATION_FLAG_COMMITTED) != 0 ||
@@ -7556,7 +7479,12 @@ UINT AllocatorPimpl::CalcDefaultPoolIndex(const ALLOCATION_DESC& allocDesc, Reso
    D3D12_HEAP_FLAGS extraHeapFlags = allocDesc.ExtraHeapFlags & ~RESOURCE_CLASS_HEAP_FLAGS;

 #if D3D12MA_CREATE_NOT_ZEROED_AVAILABLE
-    extraHeapFlags &= ~D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
+    // If allocator was created with ALLOCATOR_FLAG_DEFAULT_POOLS_NOT_ZEROED, also ignore
+    // D3D12_HEAP_FLAG_CREATE_NOT_ZEROED.
+    if(m_DefaultPoolsNotZeroed)
+    {
+        extraHeapFlags &= ~D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
+    }
 #endif

    if (extraHeapFlags != 0)
@@ -7675,7 +7603,7 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(c
 }

 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo2Native(const D3D12_RESOURCE_DESC1& resourceDesc) const
+D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfoNative(const D3D12_RESOURCE_DESC1& resourceDesc) const
 {
    D3D12MA_ASSERT(m_Device8 != NULL);
    D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
@@ -7691,71 +7619,8 @@ D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo2Native(
 }
 #endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__

-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo3Native(const D3D12_RESOURCE_DESC1& resourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats) const
-{
-    D3D12MA_ASSERT(m_Device12 != NULL);
-    D3D12_RESOURCE_ALLOCATION_INFO1 info1Unused;
-
-    // This is how new D3D12 headers define GetResourceAllocationInfo function -
-    // different signature depending on these macros.
-#if defined(_MSC_VER) || !defined(_WIN32)
-    return m_Device12->GetResourceAllocationInfo3(0, 1, &resourceDesc,
-        &NumCastableFormats, &pCastableFormats, &info1Unused);
-#else
-    D3D12_RESOURCE_ALLOCATION_INFO retVal;
-    return *m_Device12->GetResourceAllocationInfo3(&retVal, 0, 1, &resourceDesc,
-        &NumCastableFormats, &pCastableFormats, &info1Unused);
-#endif
-}
-#endif // #ifdef __ID3D12Device12_INTERFACE_DEFINED__
-
-HRESULT AllocatorPimpl::GetResourceAllocationInfoMiddle(
-    D3D12_RESOURCE_DESC& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
-{
-    if (NumCastableFormats > 0)
-    {
-        return E_NOTIMPL;
-    }
-    
-    outAllocInfo = GetResourceAllocationInfoNative(inOutResourceDesc);
-    return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-}
-
-#ifdef __ID3D12Device8_INTERFACE_DEFINED__
-
-HRESULT AllocatorPimpl::GetResourceAllocationInfoMiddle(
-    D3D12_RESOURCE_DESC1& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
-{
-    if (NumCastableFormats > 0)
-    {
-#ifdef __ID3D12Device12_INTERFACE_DEFINED__
-        if (m_Device12 != NULL)
-        {
-            outAllocInfo = GetResourceAllocationInfo3Native(inOutResourceDesc, NumCastableFormats, pCastableFormats);
-            return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-        }
-#else
-        return E_NOTIMPL;
-#endif
-    }
-
-    outAllocInfo = GetResourceAllocationInfo2Native(inOutResourceDesc);
-    return outAllocInfo.SizeInBytes != UINT64_MAX ? S_OK : E_INVALIDARG;
-}
-
-#endif // #ifdef __ID3D12Device8_INTERFACE_DEFINED__
-
 template<typename D3D12_RESOURCE_DESC_T>
-HRESULT AllocatorPimpl::GetResourceAllocationInfo(
-    D3D12_RESOURCE_DESC_T& inOutResourceDesc,
-    UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
+D3D12_RESOURCE_ALLOCATION_INFO AllocatorPimpl::GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc) const
 {
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
    /* Optional optimization: Microsoft documentation says:
@@ -7769,15 +7634,12 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    if (inOutResourceDesc.Alignment == 0 &&
        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
    {
-        outAllocInfo = {
+        return {
            AlignUp<UINT64>(inOutResourceDesc.Width, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT), // SizeInBytes
            D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT }; // Alignment
-        return S_OK;
    }
 #endif // #ifdef __ID3D12Device1_INTERFACE_DEFINED__

-    HRESULT hr = S_OK;
-
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT
    if (inOutResourceDesc.Alignment == 0 &&
        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
@@ -7795,19 +7657,17 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
            D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT :
            D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT;
        inOutResourceDesc.Alignment = smallAlignmentToTry;
-        hr = GetResourceAllocationInfoMiddle(
-            inOutResourceDesc, NumCastableFormats, pCastableFormats, outAllocInfo);
+        const D3D12_RESOURCE_ALLOCATION_INFO smallAllocInfo = GetResourceAllocationInfoNative(inOutResourceDesc);
        // Check if alignment requested has been granted.
-        if (SUCCEEDED(hr) && outAllocInfo.Alignment == smallAlignmentToTry)
+        if (smallAllocInfo.Alignment == smallAlignmentToTry)
        {
-            return S_OK;
+            return smallAllocInfo;
        }
        inOutResourceDesc.Alignment = 0; // Restore original
    }
 #endif // #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT

-    return GetResourceAllocationInfoMiddle(
-        inOutResourceDesc, NumCastableFormats, pCastableFormats, outAllocInfo);
+    return GetResourceAllocationInfoNative(inOutResourceDesc);
 }

 bool AllocatorPimpl::NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size)
@@ -8128,7 +7988,6 @@ HRESULT BlockVector::Allocate(
    UINT64 size,
    UINT64 alignment,
    const ALLOCATION_DESC& allocDesc,
-    bool committedAllowed,
    size_t allocationCount,
    Allocation** pAllocations)
 {
@@ -8143,7 +8002,6 @@ HRESULT BlockVector::Allocate(
                size,
                alignment,
                allocDesc,
-                committedAllowed,
                pAllocations + allocIndex);
            if (FAILED(hr))
            {
@@ -8232,43 +8090,40 @@ HRESULT BlockVector::CreateResource(
    UINT64 alignment,
    const ALLOCATION_DESC& allocDesc,
    const CREATE_RESOURCE_PARAMS& createParams,
-    bool committedAllowed,
    Allocation** ppAllocation,
    REFIID riidResource,
    void** ppvResource)
 {
-    HRESULT hr = Allocate(size, alignment, allocDesc, committedAllowed, 1, ppAllocation);
-    if (FAILED(hr))
-    {
-        return hr;
-    }
-
-    ID3D12Resource* res = NULL;
-    hr = m_hAllocator->CreatePlacedResourceWrap(
-        (*ppAllocation)->m_Placed.block->GetHeap(),
-        (*ppAllocation)->GetOffset(),
-        createParams,
-        D3D12MA_IID_PPV_ARGS(&res));
+    HRESULT hr = Allocate(size, alignment, allocDesc, 1, ppAllocation);
    if (SUCCEEDED(hr))
    {
-        if (ppvResource != NULL)
-        {
-            hr = res->QueryInterface(riidResource, ppvResource);
-        }
+        ID3D12Resource* res = NULL;
+        hr = m_hAllocator->CreatePlacedResourceWrap(
+            (*ppAllocation)->m_Placed.block->GetHeap(),
+            (*ppAllocation)->GetOffset(),
+            createParams,
+            D3D12MA_IID_PPV_ARGS(&res));
        if (SUCCEEDED(hr))
        {
-            (*ppAllocation)->SetResourcePointer(res, createParams.GetBaseResourceDesc());
+            if (ppvResource != NULL)
+            {
+                hr = res->QueryInterface(riidResource, ppvResource);
+            }
+            if (SUCCEEDED(hr))
+            {
+                (*ppAllocation)->SetResourcePointer(res, createParams.GetBaseResourceDesc());
+            }
+            else
+            {
+                res->Release();
+                SAFE_RELEASE(*ppAllocation);
+            }
        }
        else
        {
-            res->Release();
            SAFE_RELEASE(*ppAllocation);
        }
    }
-    else
-    {
-        SAFE_RELEASE(*ppAllocation);
-    }
    return hr;
 }

@@ -8386,7 +8241,6 @@ HRESULT BlockVector::AllocatePage(
    UINT64 size,
    UINT64 alignment,
    const ALLOCATION_DESC& allocDesc,
-    bool committedAllowed,
    Allocation** pAllocation)
 {
    // Early reject: requested allocation size is larger that maximum block size for this block vector.
@@ -8403,19 +8257,13 @@ HRESULT BlockVector::AllocatePage(
        freeMemory = (budget.UsageBytes < budget.BudgetBytes) ? (budget.BudgetBytes - budget.UsageBytes) : 0;
    }

-    const bool canExceedFreeMemory = !committedAllowed;
-
-    bool canCreateNewBlock =
+    const bool canCreateNewBlock =
        ((allocDesc.Flags & ALLOCATION_FLAG_NEVER_ALLOCATE) == 0) &&
-        (m_Blocks.size() < m_MaxBlockCount);
-
-    // Even if we don't have to stay within budget with this allocation, when the
-    // budget would be exceeded, we don't want to allocate new blocks, but always
-    // create resources as committed.
-    if (freeMemory < size && !canExceedFreeMemory)
-    {
-        canCreateNewBlock = false;
-    }
+        (m_Blocks.size() < m_MaxBlockCount) &&
+        // Even if we don't have to stay within budget with this allocation, when the
+        // budget would be exceeded, we don't want to allocate new blocks, but always
+        // create resources as committed.
+        freeMemory >= size;

    // 1. Search existing allocations
    {
@@ -8465,29 +8313,26 @@ HRESULT BlockVector::AllocatePage(
            }
        }

-        size_t newBlockIndex = SIZE_MAX;
-        HRESULT hr = E_OUTOFMEMORY;
-        if (newBlockSize <= freeMemory || canExceedFreeMemory)
-        {
-            hr = CreateBlock(newBlockSize, &newBlockIndex);
-        }
+        size_t newBlockIndex = 0;
+        HRESULT hr = newBlockSize <= freeMemory ?
+            CreateBlock(newBlockSize, &newBlockIndex) : E_OUTOFMEMORY;
        // Allocation of this size failed? Try 1/2, 1/4, 1/8 of m_PreferredBlockSize.
        if (!m_ExplicitBlockSize)
        {
            while (FAILED(hr) && newBlockSizeShift < NEW_BLOCK_SIZE_SHIFT_MAX)
            {
                const UINT64 smallerNewBlockSize = newBlockSize / 2;
-                if (smallerNewBlockSize < size)
+                if (smallerNewBlockSize >= size)
+                {
+                    newBlockSize = smallerNewBlockSize;
+                    ++newBlockSizeShift;
+                    hr = newBlockSize <= freeMemory ?
+                        CreateBlock(newBlockSize, &newBlockIndex) : E_OUTOFMEMORY;
+                }
+                else
                {
                    break;
                }
-
-                newBlockSize = smallerNewBlockSize;
-                ++newBlockSizeShift;
-                if (newBlockSize <= freeMemory || canExceedFreeMemory)
-                {
-                    hr = CreateBlock(newBlockSize, &newBlockIndex);
-                }
            }
        }

@@ -9664,8 +9509,6 @@ HRESULT Pool::BeginDefragmentation(const DEFRAGMENTATION_DESC* pDesc, Defragment
    // Check for support
    if (m_Pimpl->GetBlockVector()->GetAlgorithm() & POOL_FLAG_ALGORITHM_LINEAR)
        return E_NOINTERFACE;
-    if(m_Pimpl->AlwaysCommitted())
-        return E_NOINTERFACE;

    AllocatorPimpl* allocator = m_Pimpl->GetAllocator();
    *ppContext = D3D12MA_NEW(allocator->GetAllocs(), DefragmentationContext)(allocator, *pDesc, m_Pimpl->GetBlockVector());
@@ -9769,7 +9612,7 @@ HRESULT Allocator::CreateResource3(
    D3D12_BARRIER_LAYOUT InitialLayout,
    const D3D12_CLEAR_VALUE* pOptimizedClearValue,
    UINT32 NumCastableFormats,
-    const DXGI_FORMAT* pCastableFormats,
+    DXGI_FORMAT* pCastableFormats,
    Allocation** ppAllocation,
    REFIID riidResource,
    void** ppvResource)
@@ -9859,7 +9702,7 @@ HRESULT Allocator::CreateAliasingResource2(
    D3D12_BARRIER_LAYOUT InitialLayout,
    const D3D12_CLEAR_VALUE* pOptimizedClearValue,
    UINT32 NumCastableFormats,
-    const DXGI_FORMAT* pCastableFormats,
+    DXGI_FORMAT* pCastableFormats,
    REFIID riidResource,
    void** ppvResource)
 {
@@ -9889,12 +9732,6 @@ HRESULT Allocator::CreatePool(
        D3D12MA_ASSERT(0 && "Invalid arguments passed to Allocator::CreatePool.");
        return E_INVALIDARG;
    }
-    if ((pPoolDesc->Flags & POOL_FLAG_ALWAYS_COMMITTED) != 0 &&
-        (pPoolDesc->BlockSize != 0 || pPoolDesc->MinBlockCount > 0))
-    {
-        D3D12MA_ASSERT(0 && "Invalid arguments passed to Allocator::CreatePool while POOL_FLAG_ALWAYS_COMMITTED is specified.");
-        return E_INVALIDARG;
-    }
    if (!m_Pimpl->HeapFlagsFulfillResourceHeapTier(pPoolDesc->HeapFlags))
    {
        D3D12MA_ASSERT(0 && "Invalid pPoolDesc->HeapFlags passed to Allocator::CreatePool. Did you forget to handle ResourceHeapTier=1?");
--- a/3rdparty/fast_float/CONTRIBUTORS
+++ b/3rdparty/fast_float/CONTRIBUTORS
@@ -8,4 +8,3 @@ Lénárd Szolnoki
 Jan Pharago
 Maya Warrier
 Taha Khokhar
-Anders Dalvander
--- a/3rdparty/fast_float/README.md
+++ b/3rdparty/fast_float/README.md
@@ -1,253 +1,160 @@

 ## fast_float number parsing library: 4x faster than strtod
-
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/fast_float.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:fast_float)
 [![Ubuntu 22.04 CI (GCC 11)](https://github.com/fastfloat/fast_float/actions/workflows/ubuntu22.yml/badge.svg)](https://github.com/fastfloat/fast_float/actions/workflows/ubuntu22.yml)

-The fast_float library provides fast header-only implementations for the C++
-from_chars functions for `float` and `double` types as well as integer types.
-These functions convert ASCII strings representing decimal values (e.g.,
-`1.3e10`) into binary types. We provide exact rounding (including round to
-even). In our experience, these `fast_float` functions many times faster than
-comparable number-parsing functions from existing C++ standard libraries.
+The fast_float library provides fast header-only implementations for the C++ from_chars
+functions for `float` and `double` types as well as integer types.  These functions convert ASCII strings representing decimal values (e.g., `1.3e10`) into binary types. We provide exact rounding (including
+round to even). In our experience, these `fast_float` functions many times faster than comparable number-parsing functions from existing C++ standard libraries.

-Specifically, `fast_float` provides the following two functions to parse
-floating-point numbers with a C++17-like syntax (the library itself only
-requires C++11):
+Specifically, `fast_float` provides the following two functions to parse floating-point numbers with a C++17-like syntax (the library itself only requires C++11):

 ```C++
-from_chars_result from_chars(char const *first, char const *last, float &value, ...);
-from_chars_result from_chars(char const *first, char const *last, double &value, ...);
+from_chars_result from_chars(const char* first, const char* last, float& value, ...);
+from_chars_result from_chars(const char* first, const char* last, double& value, ...);
 ```

 You can also parse integer types:

-```C++
-from_chars_result from_chars(char const *first, char const *last, int &value, ...);
-from_chars_result from_chars(char const *first, char const *last, unsigned &value, ...);
-```
+
+

 The return type (`from_chars_result`) is defined as the struct:
-
 ```C++
 struct from_chars_result {
-  char const *ptr;
-  std::errc ec;
+    const char* ptr;
+    std::errc ec;
 };
 ```

-It parses the character sequence `[first, last)` for a number. It parses
-floating-point numbers expecting a locale-independent format equivalent to the
-C++17 from_chars function. The resulting floating-point value is the closest
-floating-point values (using either `float` or `double`), using the "round to
-even" convention for values that would otherwise fall right in-between two
-values. That is, we provide exact parsing according to the IEEE standard.
+It parses the character sequence [first,last) for a number. It parses floating-point numbers expecting
+a locale-independent format equivalent to the C++17 from_chars function.
+The resulting floating-point value is the closest floating-point values (using either float or double),
+using the "round to even" convention for values that would otherwise fall right in-between two values.
+That is, we provide exact parsing according to the IEEE standard.

-Given a successful parse, the pointer (`ptr`) in the returned value is set to
-point right after the parsed number, and the `value` referenced is set to the
-parsed value. In case of error, the returned `ec` contains a representative
-error, otherwise the default (`std::errc()`) value is stored.

-The implementation does not throw and does not allocate memory (e.g., with `new`
-or `malloc`).
+Given a successful parse, the pointer (`ptr`) in the returned value is set to point right after the
+parsed number, and the `value` referenced is set to the parsed value. In case of error, the returned
+`ec` contains a representative error, otherwise the default (`std::errc()`) value is stored.
+
+The implementation does not throw and does not allocate memory (e.g., with `new` or `malloc`).

 It will parse infinity and nan values.

 Example:

-```C++
+``` C++
 #include "fast_float/fast_float.h"
 #include <iostream>
-#include <string>

 int main() {
-  std::string input = "3.1416 xyz ";
-  double result;
-  auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result);
-  if (answer.ec != std::errc()) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
-  std::cout << "parsed the number " << result << std::endl;
-  return EXIT_SUCCESS;
-}
-```
-
-Though the C++17 standard has you do a comparison with `std::errc()` to check whether the conversion worked, you can avoid it by casting the result to a `bool` like so:
-
-```cpp
-#include "fast_float/fast_float.h"
-#include <iostream>
-#include <string>
-
-int main() {
-  std::string input = "3.1416 xyz ";
-  double result;
-  if(auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result)) {
+    const std::string input =  "3.1416 xyz ";
+    double result;
+    auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result);
+    if(answer.ec != std::errc()) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
    std::cout << "parsed the number " << result << std::endl;
    return EXIT_SUCCESS;
-  }
-  std::cerr << "failed to parse " << result << std::endl;
-  return EXIT_FAILURE;
 }
 ```

 You can parse delimited numbers:
-
 ```C++
-  std::string input = "234532.3426362,7869234.9823,324562.645";
+  const std::string input =   "234532.3426362,7869234.9823,324562.645";
  double result;
-  auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result);
-  if (answer.ec != std::errc()) {
+  auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result);
+  if(answer.ec != std::errc()) {
    // check error
  }
  // we have result == 234532.3426362.
-  if (answer.ptr[0] != ',') {
+  if(answer.ptr[0] != ',') {
    // unexpected delimiter
  }
-  answer = fast_float::from_chars(answer.ptr + 1, input.data() + input.size(), result);
-  if (answer.ec != std::errc()) {
+  answer = fast_float::from_chars(answer.ptr + 1, input.data()+input.size(), result);
+  if(answer.ec != std::errc()) {
    // check error
  }
  // we have result == 7869234.9823.
-  if (answer.ptr[0] != ',') {
+  if(answer.ptr[0] != ',') {
    // unexpected delimiter
  }
-  answer = fast_float::from_chars(answer.ptr + 1, input.data() + input.size(), result);
-  if (answer.ec != std::errc()) {
+  answer = fast_float::from_chars(answer.ptr + 1, input.data()+input.size(), result);
+  if(answer.ec != std::errc()) {
    // check error
  }
  // we have result == 324562.645.
 ```

-Like the C++17 standard, the `fast_float::from_chars` functions take an optional
-last argument of the type `fast_float::chars_format`. It is a bitset value: we
-check whether `fmt & fast_float::chars_format::fixed` and `fmt &
-fast_float::chars_format::scientific` are set to determine whether we allow the
-fixed point and scientific notation respectively. The default is
-`fast_float::chars_format::general` which allows both `fixed` and `scientific`.

-The library seeks to follow the C++17 (see
-[28.2.3.(6.1)](https://eel.is/c++draft/charconv.from.chars#6.1)) specification.

-* The `from_chars` function does not skip leading white-space characters (unless
-  `fast_float::chars_format::skip_white_space` is set).
-* [A leading `+` sign](https://en.cppreference.com/w/cpp/utility/from_chars) is
-  forbidden (unless `fast_float::chars_format::allow_leading_plus` is set).
-* It is generally impossible to represent a decimal value exactly as binary
-  floating-point number (`float` and `double` types). We seek the nearest value.
-  We round to an even mantissa when we are in-between two binary floating-point
-  numbers.
+Like the C++17 standard, the `fast_float::from_chars` functions take an optional last argument of
+the type `fast_float::chars_format`. It is a bitset value: we check whether
+`fmt & fast_float::chars_format::fixed` and `fmt & fast_float::chars_format::scientific` are set
+to determine whether we allow the fixed point and scientific notation respectively.
+The default is  `fast_float::chars_format::general` which allows both `fixed` and `scientific`.
+
+The library seeks to follow the C++17 (see [20.19.3](http://eel.is/c++draft/charconv.from.chars).(7.1))  specification.
+* The `from_chars` function does not skip leading white-space characters.
+* [A leading `+` sign](https://en.cppreference.com/w/cpp/utility/from_chars) is forbidden.
+* It is generally impossible to represent a decimal value exactly as binary floating-point number (`float` and `double` types). We seek the nearest value. We round to an even mantissa when we are in-between two binary floating-point numbers.

 Furthermore, we have the following restrictions:
-
-* We support `float` and `double`, but not `long double`. We also support
-  fixed-width floating-point types such as `std::float64_t`, `std::float32_t`,
-  `std::float16_t`, and `std::bfloat16_t`.
+* We only support `float` and `double` types at this time.
 * We only support the decimal format: we do not support hexadecimal strings.
-* For values that are either very large or very small (e.g., `1e9999`), we
-  represent it using the infinity or negative infinity value and the returned
-  `ec` is set to `std::errc::result_out_of_range`.
+* For values that are either very large or very small (e.g., `1e9999`), we represent it using the infinity or negative infinity value and the returned `ec` is set to `std::errc::result_out_of_range`.

-We support Visual Studio, macOS, Linux, freeBSD. We support big and little
-endian. We support 32-bit and 64-bit systems.
+We support Visual Studio, macOS, Linux, freeBSD. We support big and little endian. We support 32-bit and 64-bit systems.
+
+We assume that the rounding mode is set to nearest (`std::fegetround() == FE_TONEAREST`).

-We assume that the rounding mode is set to nearest (`std::fegetround() ==
-FE_TONEAREST`).

 ## Integer types

-You can also parse integer types using different bases (e.g., 2, 10, 16). The
-following code will print the number 22250738585072012 three times:
+You can also parse integer types using different bases (e.g., 2, 10, 16). The following code will
+print the number 22250738585072012 three times:
+

 ```C++
-#include "fast_float/fast_float.h"
-#include <iostream>
-
-int main() {
  uint64_t i;
-  std::string str = "22250738585072012";
-  auto answer = fast_float::from_chars(str.data(), str.data() + str.size(), i);
+  const char str[] = "22250738585072012";
+  auto answer = fast_float::from_chars(str, str + strlen(str), i);
  if (answer.ec != std::errc()) {
    std::cerr << "parsing failure\n";
    return EXIT_FAILURE;
  }
-  std::cout << "parsed the number " << i << std::endl;
+  std::cout << "parsed the number "<< i << std::endl;

-  std::string binstr = "1001111000011001110110111001001010110100111000110001100";
+  const char binstr[] = "1001111000011001110110111001001010110100111000110001100";

-  answer = fast_float::from_chars(binstr.data(), binstr.data() + binstr.size(), i, 2);
+  answer = fast_float::from_chars(binstr, binstr + strlen(binstr), i, 2);
  if (answer.ec != std::errc()) {
    std::cerr << "parsing failure\n";
    return EXIT_FAILURE;
  }
-  std::cout << "parsed the number " << i << std::endl;
+  std::cout << "parsed the number "<< i << std::endl;

-  std::string hexstr = "4f0cedc95a718c";

-  answer = fast_float::from_chars(hexstr.data(), hexstr.data() + hexstr.size(), i, 16);
+  const char hexstr[] = "4f0cedc95a718c";
+
+  answer = fast_float::from_chars(hexstr, hexstr + strlen(hexstr), i, 16);
  if (answer.ec != std::errc()) {
    std::cerr << "parsing failure\n";
    return EXIT_FAILURE;
  }
-  std::cout << "parsed the number " << i << std::endl;
-  return EXIT_SUCCESS;
-}
-```
-
-## Behavior of result_out_of_range
-
-When parsing floating-point values, the numbers can sometimes be too small
-(e.g., `1e-1000`) or too large (e.g., `1e1000`). The C language established the
-precedent that these small values are out of range. In such cases, it is
-customary to parse small values to zero and large values to infinity. That is
-the behaviour of the C language (e.g., `stdtod`). That is the behaviour followed
-by the fast_float library.
-
-Specifically, we follow Jonathan Wakely's interpretation of the standard:
-
-> In any case, the resulting value is one of at most two floating-point values
-> closest to the value of the string matching the pattern.
-
-It is also the approach taken by the [Microsoft C++
-library](https://github.com/microsoft/STL/blob/62205ab155d093e71dd9588a78f02c5396c3c14b/tests/std/tests/P0067R5_charconv/test.cpp#L943-L946).
-
-Hence, we have the following examples:
-
-```cpp
-  double result = -1;
-  std::string str = "3e-1000";
-  auto r = fast_float::from_chars(str.data(), str.data() + str.size(), result);
-  // r.ec == std::errc::result_out_of_range
-  // r.ptr == str.data() + 7
-  // result == 0
-```
-
-```cpp
-  double result = -1;
-  std::string str = "3e1000";
-  auto r = fast_float::from_chars(str.data(), str.data() + str.size(), result);
-  // r.ec == std::errc::result_out_of_range
-  // r.ptr == str.data() + 6
-  // result == std::numeric_limits<double>::infinity()
-```
-
-Users who wish for the value to be left unmodified given
-`std::errc::result_out_of_range` may do so by adding two lines of code:
-
-```cpp
-  double old_result = result; // make copy
-  auto r = fast_float::from_chars(start, end, result);
-  if (r.ec == std::errc::result_out_of_range) { result = old_result; }
+  std::cout << "parsed the number "<< i << std::endl;
 ```

 ## C++20: compile-time evaluation (constexpr)

-In C++20, you may use `fast_float::from_chars` to parse strings at compile-time,
-as in the following example:
+In C++20, you may use `fast_float::from_chars` to parse strings
+at compile-time, as in the following example:

 ```C++
 // consteval forces compile-time evaluation of the function in C++20.
 consteval double parse(std::string_view input) {
  double result;
-  auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result);
-  if (answer.ec != std::errc()) { return -1.0; }
+  auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result);
+  if(answer.ec != std::errc()) { return -1.0; }
  return result;
 }

@@ -260,107 +167,108 @@ constexpr double constexptest() {

 ## C++23: Fixed width floating-point types

-The library also supports fixed-width floating-point types such as
-`std::float64_t`, `std::float32_t`, `std::float16_t`, and `std::bfloat16_t`.
-E.g., you can write:
+The library also supports fixed-width floating-point types such as `std::float32_t` and `std::float64_t`. E.g., you can write:

 ```C++
 std::float32_t result;
 auto answer = fast_float::from_chars(f.data(), f.data() + f.size(), result);
-```
+``````
+

 ## Non-ASCII Inputs

-We also support UTF-16 and UTF-32 inputs, as well as ASCII/UTF-8, as in the
-following example:
+We also support UTF-16 and UTF-32 inputs, as well as ASCII/UTF-8, as in the following example:

-```C++
+``` C++
 #include "fast_float/fast_float.h"
 #include <iostream>

 int main() {
-  std::u16string input = u"3.1416 xyz ";
-  double result;
-  auto answer = fast_float::from_chars(input.data(), input.data() + input.size(), result);
-  if (answer.ec != std::errc()) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
-  std::cout << "parsed the number " << result << std::endl;
-  return EXIT_SUCCESS;
+    const std::u16string input =  u"3.1416 xyz ";
+    double result;
+    auto answer = fast_float::from_chars(input.data(), input.data()+input.size(), result);
+    if(answer.ec != std::errc()) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
+    std::cout << "parsed the number " << result << std::endl;
+    return EXIT_SUCCESS;
 }
 ```

-## Advanced options: using commas as decimal separator, JSON and Fortran
+## Advanced options:  using commas as decimal separator, JSON and Fortran
+

 The C++ standard stipulate that `from_chars` has to be locale-independent. In
-particular, the decimal separator has to be the period (`.`). However, some
-users still want to use the `fast_float` library with in a locale-dependent
-manner. Using a separate function called `from_chars_advanced`, we allow the
-users to pass a `parse_options` instance which contains a custom decimal
-separator (e.g., the comma). You may use it as follows.
+particular, the decimal separator has to be the period (`.`). However,
+some users still want to use the `fast_float` library with in a locale-dependent
+manner. Using a separate function called `from_chars_advanced`, we allow the users
+to pass a `parse_options` instance which contains a custom decimal separator (e.g.,
+the comma). You may use it as follows.

 ```C++
 #include "fast_float/fast_float.h"
 #include <iostream>

 int main() {
-  std::string input = "3,1416 xyz ";
-  double result;
-  fast_float::parse_options options{fast_float::chars_format::general, ','};
-  auto answer = fast_float::from_chars_advanced(input.data(), input.data() + input.size(), result, options);
-  if ((answer.ec != std::errc()) || ((result != 3.1416))) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
-  std::cout << "parsed the number " << result << std::endl;
-  return EXIT_SUCCESS;
+    const std::string input =  "3,1416 xyz ";
+    double result;
+    fast_float::parse_options options{fast_float::chars_format::general, ','};
+    auto answer = fast_float::from_chars_advanced(input.data(), input.data()+input.size(), result, options);
+    if((answer.ec != std::errc()) || ((result != 3.1416))) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
+    std::cout << "parsed the number " << result << std::endl;
+    return EXIT_SUCCESS;
 }
 ```

-### You can also parse Fortran-like inputs
+You can also parse Fortran-like inputs:

 ```C++
 #include "fast_float/fast_float.h"
 #include <iostream>

 int main() {
-  std::string input = "1d+4";
-  double result;
-  fast_float::parse_options options{fast_float::chars_format::fortran};
-  auto answer = fast_float::from_chars_advanced(input.data(), input.data() + input.size(), result, options);
-  if ((answer.ec != std::errc()) || ((result != 10000))) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
-  std::cout << "parsed the number " << result << std::endl;
-  return EXIT_SUCCESS;
+    const std::string input =  "1d+4";
+    double result;
+    fast_float::parse_options options{ fast_float::chars_format::fortran };
+    auto answer = fast_float::from_chars_advanced(input.data(), input.data()+input.size(), result, options);
+    if((answer.ec != std::errc()) || ((result != 10000))) { std::cerr << "parsing failure\n"; return EXIT_FAILURE; }
+    std::cout << "parsed the number " << result << std::endl;
+    return EXIT_SUCCESS;
 }
 ```

-### You may also enforce the JSON format ([RFC 8259](https://datatracker.ietf.org/doc/html/rfc8259#section-6))
+You may also enforce the JSON format ([RFC 8259](https://datatracker.ietf.org/doc/html/rfc8259#section-6)):
+

 ```C++
 #include "fast_float/fast_float.h"
 #include <iostream>

 int main() {
-  std::string input = "+.1"; // not valid
-  double result;
-  fast_float::parse_options options{fast_float::chars_format::json};
-  auto answer = fast_float::from_chars_advanced(input.data(), input.data() + input.size(), result, options);
-  if (answer.ec == std::errc()) { std::cerr << "should have failed\n"; return EXIT_FAILURE; }
-  return EXIT_SUCCESS;
+    const std::string input =  "+.1"; // not valid
+    double result;
+    fast_float::parse_options options{ fast_float::chars_format::json };
+    auto answer = fast_float::from_chars_advanced(input.data(), input.data()+input.size(), result, options);
+    if(answer.ec == std::errc()) { std::cerr << "should have failed\n"; return EXIT_FAILURE; }
+    return EXIT_SUCCESS;
 }
 ```

 By default the JSON format does not allow `inf`:

 ```C++
+
 #include "fast_float/fast_float.h"
 #include <iostream>

 int main() {
-  std::string input = "inf"; // not valid in JSON
-  double result;
-  fast_float::parse_options options{fast_float::chars_format::json};
-  auto answer = fast_float::from_chars_advanced(input.data(), input.data() + input.size(), result, options);
-  if (answer.ec == std::errc()) { std::cerr << "should have failed\n"; return EXIT_FAILURE; }
-  return EXIT_SUCCESS;
+    const std::string input =  "inf"; // not valid in JSON
+    double result;
+    fast_float::parse_options options{ fast_float::chars_format::json };
+    auto answer = fast_float::from_chars_advanced(input.data(), input.data()+input.size(), result, options);
+    if(answer.ec == std::errc()) { std::cerr << "should have failed\n"; return EXIT_FAILURE; }
 }
 ```

+
 You can allow it with a non-standard `json_or_infnan` variant:

 ```C++
@@ -368,118 +276,55 @@ You can allow it with a non-standard `json_or_infnan` variant:
 #include <iostream>

 int main() {
-  std::string input = "inf"; // not valid in JSON but we allow it with json_or_infnan
-  double result;
-  fast_float::parse_options options{fast_float::chars_format::json_or_infnan};
-  auto answer = fast_float::from_chars_advanced(input.data(), input.data() + input.size(), result, options);
-  if (answer.ec != std::errc() || (!std::isinf(result))) { std::cerr << "should have parsed infinity\n"; return EXIT_FAILURE; }
-  return EXIT_SUCCESS;
+    const std::string input =  "inf"; // not valid in JSON but we allow it with json_or_infnan
+    double result;
+    fast_float::parse_options options{ fast_float::chars_format::json_or_infnan };
+    auto answer = fast_float::from_chars_advanced(input.data(), input.data()+input.size(), result, options);
+    if(answer.ec != std::errc() || (!std::isinf(result))) { std::cerr << "should have parsed infinity\n"; return EXIT_FAILURE; }
+    return EXIT_SUCCESS;
 }
-```
+``````

-## Multiplication of an integer by a power of 10
-An integer `W` can be multiplied by a power of ten `10^Q` and
-converted to `double` with correctly rounded value
-(in "round to nearest, tie to even" fashion) using
-`fast_float::integer_times_pow10()`, e.g.:
-```C++
-const uint64_t W = 12345678901234567;
-const int Q = 23;
-const double result = fast_float::integer_times_pow10(W, Q);
-std::cout.precision(17);
-std::cout << W << " * 10^" << Q << " = " << result << " ("
-  << (result == 12345678901234567e23 ? "==" : "!=") << "expected)\n";
-```
-outputs
-```
-12345678901234567 * 10^23 = 1.2345678901234567e+39 (==expected)
-```
-`fast_float::integer_times_pow10()` gives the same result as
-using `fast_float::from_chars()` when parsing the string `"WeQ"`
-(in this example `"12345678901234567e23"`),
-except `fast_float::integer_times_pow10()` does not report out-of-range errors, and
-underflows to zero or overflows to infinity when the resulting value is
-out of range.
-
-Overloads of `fast_float::integer_times_pow10()` are provided for
-signed and unsigned integer types: `int64_t`, `uint64_t`, etc.
-
-
-## Users and Related Work
+## Relation With Other Work

 The fast_float library is part of:

-* GCC (as of version 12): the `from_chars` function in GCC relies on fast_float,
-* [Chromium](https://github.com/Chromium/Chromium), the engine behind Google
-  Chrome, Microsoft Edge, and Opera,
-* Boost JSON, MySQL, etc.
-* Blender
-* [WebKit](https://github.com/WebKit/WebKit), the engine behind Safari (Apple's
-  web browser),
-* [DuckDB](https://duckdb.org),
-* [Redis](https://github.com/redis/redis) and [Valkey](https://github.com/valkey-io/valkey),
-* [Apache Arrow](https://github.com/apache/arrow/pull/8494) where it multiplied
-  the number parsing speed by two or three times,
-* [Google Jsonnet](https://github.com/google/jsonnet),
-* [ClickHouse](https://github.com/ClickHouse/ClickHouse).
-
-The fastfloat algorithm is part of the [LLVM standard
-libraries](https://github.com/llvm/llvm-project/commit/87c016078ad72c46505461e4ff8bfa04819fe7ba).
-There is a [derived implementation part of
-AdaCore](https://github.com/AdaCore/VSS). The [SerenityOS operating
-system](https://github.com/SerenityOS/serenity/commit/53b7f5e6a11e663c83df8030c3171c5945cb75ec)
-has a derived implementation that is inherited by the [Ladybird
-Browser](https://github.com/LadybirdBrowser/ladybird).
-
-The fast_float library provides a performance similar to that of the
-[fast_double_parser](https://github.com/lemire/fast_double_parser) library but
-using an updated algorithm reworked from the ground up, and while offering an
-API more in line with the expectations of C++ programmers. The
-fast_double_parser library is part of the [Microsoft LightGBM machine-learning
-framework](https://github.com/microsoft/LightGBM).
+- GCC (as of version 12): the `from_chars` function in GCC relies on fast_float.
+- [WebKit](https://github.com/WebKit/WebKit), the engine behind Safari (Apple's web browser)


+The fastfloat algorithm is part of the [LLVM standard libraries](https://github.com/llvm/llvm-project/commit/87c016078ad72c46505461e4ff8bfa04819fe7ba).

-Packages
------
+There is a [derived implementation part of AdaCore](https://github.com/AdaCore/VSS).

-[![Packaging status](https://repology.org/badge/vertical-allrepos/fastfloat.svg)](https://repology.org/project/fastfloat/versions)

+The fast_float library provides a performance similar to that of the [fast_double_parser](https://github.com/lemire/fast_double_parser) library but using an updated algorithm reworked from the ground up, and while offering an API more in line with the expectations of C++ programmers. The fast_double_parser library is part of the [Microsoft LightGBM machine-learning framework](https://github.com/microsoft/LightGBM).

 ## References

-* Daniel Lemire, [Number Parsing at a Gigabyte per
-  Second](https://arxiv.org/abs/2101.11408), Software: Practice and Experience
-  51 (8), 2021.
-* Noble Mushtak, Daniel Lemire, [Fast Number Parsing Without
-  Fallback](https://arxiv.org/abs/2212.06644), Software: Practice and Experience
-  53 (7), 2023.
+- Daniel Lemire, [Number Parsing at a Gigabyte per Second](https://arxiv.org/abs/2101.11408), Software: Practice and Experience 51 (8), 2021.
+- Noble Mushtak, Daniel Lemire, [Fast Number Parsing Without Fallback](https://arxiv.org/abs/2212.06644), Software: Practice and Experience 53 (7), 2023.

 ## Other programming languages

-* [There is an R binding](https://github.com/eddelbuettel/rcppfastfloat) called
-  `rcppfastfloat`.
-* [There is a Rust port of the fast_float
-  library](https://github.com/aldanor/fast-float-rust/) called
-  `fast-float-rust`.
-* [There is a Java port of the fast_float
-  library](https://github.com/wrandelshofer/FastDoubleParser) called
-  `FastDoubleParser`. It used for important systems such as
-  [Jackson](https://github.com/FasterXML/jackson-core).
-* [There is a C# port of the fast_float
-  library](https://github.com/CarlVerret/csFastFloat) called `csFastFloat`.
+- [There is an R binding](https://github.com/eddelbuettel/rcppfastfloat) called `rcppfastfloat`.
+- [There is a Rust port of the fast_float library](https://github.com/aldanor/fast-float-rust/) called `fast-float-rust`.
+- [There is a Java port of the fast_float library](https://github.com/wrandelshofer/FastDoubleParser) called `FastDoubleParser`. It used for important systems such as [Jackson](https://github.com/FasterXML/jackson-core).
+- [There is a C# port of the fast_float library](https://github.com/CarlVerret/csFastFloat) called `csFastFloat`.
+
+
+## Users
+
+The fast_float library is used by [Apache Arrow](https://github.com/apache/arrow/pull/8494) where it multiplied the number parsing speed by two or three times. It is also used by [ClickHouse](https://github.com/ClickHouse/ClickHouse) and by [Google Jsonnet](https://github.com/google/jsonnet). It is part of GCC (as of GCC 12). It is part of WebKit (Safari).
+

 ## How fast is it?

-It can parse random floating-point numbers at a speed of 1 GB/s on some systems.
-We find that it is often twice as fast as the best available competitor, and
-many times faster than many standard-library implementations.
+It can parse random floating-point numbers at a speed of 1 GB/s on some systems. We find that it is often twice as fast as the best available competitor, and many times faster than many standard-library implementations.

-<img src="https://lemire.me/blog/wp-content/uploads/2020/11/fastfloat_speed.png"
-width="400" alt="fast_float is many times faster than many standard-library
-implementations">
+<img src="http://lemire.me/blog/wp-content/uploads/2020/11/fastfloat_speed.png" width="400">

-```bash
+```
 $ ./build/benchmarks/benchmark
 # parsing random integers in the range [0,1)
 volume = 2.09808 MB
@@ -490,123 +335,75 @@ abseil                                  :   430.45 MB/s (+/- 2.2 %)    20.52 Mfl
 fastfloat                               :  1042.38 MB/s (+/- 9.9 %)    49.68 Mfloat/s
 ```

-See the [Benchmarking](#benchmarking) section for instructions on how to run our benchmarks.
+See https://github.com/lemire/simple_fastfloat_benchmark for our benchmarking code.
+

 ## Video

-[![Go Systems 2020](https://img.youtube.com/vi/AVXgvlMeIm4/0.jpg)](https://www.youtube.com/watch?v=AVXgvlMeIm4)
+[![Go Systems 2020](http://img.youtube.com/vi/AVXgvlMeIm4/0.jpg)](http://www.youtube.com/watch?v=AVXgvlMeIm4)<br />

 ## Using as a CMake dependency

-This library is header-only by design. The CMake file provides the `fast_float`
-target which is merely a pointer to the `include` directory.
+This library is header-only by design. The CMake file provides the `fast_float` target
+which is merely a pointer to the `include` directory.

-If you drop the `fast_float` repository in your CMake project, you should be
-able to use it in this manner:
+If you drop the `fast_float` repository in your CMake project, you should be able to use
+it in this manner:

 ```cmake
 add_subdirectory(fast_float)
 target_link_libraries(myprogram PUBLIC fast_float)
 ```

-Or you may want to retrieve the dependency automatically if you have a
-sufficiently recent version of CMake (3.11 or better at least):
+Or you may want to retrieve the dependency automatically if you have a sufficiently recent version of CMake (3.11 or better at least):

 ```cmake
 FetchContent_Declare(
  fast_float
-  GIT_REPOSITORY https://github.com/fastfloat/fast_float.git
-  GIT_TAG tags/v8.1.0
+  GIT_REPOSITORY https://github.com/lemire/fast_float.git
+  GIT_TAG tags/v1.1.2
  GIT_SHALLOW TRUE)

 FetchContent_MakeAvailable(fast_float)
 target_link_libraries(myprogram PUBLIC fast_float)
+
 ```

-You should change the `GIT_TAG` line so that you recover the version you wish to
-use.
-
-You may also use [CPM](https://github.com/cpm-cmake/CPM.cmake), like so:
-
-```cmake
-CPMAddPackage(
-  NAME fast_float
-  GITHUB_REPOSITORY "fastfloat/fast_float"
-  GIT_TAG v8.1.0)
-```
+You should change the `GIT_TAG` line so that you recover the version you wish to use.

 ## Using as single header

 The script `script/amalgamate.py` may be used to generate a single header
-version of the library if so desired. Just run the script from the root
-directory of this repository. You can customize the license type and output file
-if desired as described in the command line help.
+version of the library if so desired.
+Just run the script from the root directory of this repository.
+You can customize the license type and output file if desired as described in
+the command line help.

 You may directly download automatically generated single-header files:

-<https://github.com/fastfloat/fast_float/releases/download/v8.1.0/fast_float.h>
+https://github.com/fastfloat/fast_float/releases/download/v6.1.1/fast_float.h

-## Benchmarking
+## RFC 7159

-The project has its own benchmarks with realistic data inputs. Under Linux or macOS,
-you can use it as follows if your system supports C++17:
-
-```
-cmake -B build -D FASTFLOAT_BENCHMARKS=ON
-cmake --build build
-./build/benchmarks/realbenchmark
-```
-
-Importantly, by default, the benchmark is built in Release mode.
-
-The instructions are similar under Windows.
-
-Under Linux and macOS, it is recommended to run the benchmarks in a privileged manner to get access
-to hardware performance counters. You may be able to do so with the `sudo` command
-in some cases:
-
-```
-sudo ./build/benchmarks/realbenchmark
-```
-
-If you have a text file containing one number per line (`myfile.txt`), you can run a benchmark over it like so:
-```
-cmake -B build -D FASTFLOAT_BENCHMARKS=ON
-cmake --build build
-./build/benchmarks/realbenchmark myfile.txt
-```
-
-
-## Packages
-
-* The fast_float library is part of the [Conan package
-  manager](https://conan.io/center/recipes/fast_float).
-* It is part of the [brew package
-  manager](https://formulae.brew.sh/formula/fast_float).
-* fast_float is available on [xmake](https://xmake.io) repository.
-* Some Linux distribution like Fedora include fast_float (e.g., as
-  `fast_float-devel`).
+If you need support for RFC 7159 (JSON standard), you may want to consider using the [fast_double_parser](https://github.com/lemire/fast_double_parser/) library instead.

 ## Credit

-Though this work is inspired by many different people, this work benefited
-especially from exchanges with Michael Eisel, who motivated the original
-research with his key insights, and with Nigel Tao who provided invaluable
-feedback. Rémy Oudompheng first implemented a fast path we use in the case of
-long digits.
+Though this work is inspired by many different people, this work benefited especially from exchanges with
+Michael Eisel, who motivated the original research with his key insights, and with Nigel Tao who provided
+invaluable feedback. Rémy Oudompheng first implemented a fast path we use in the case of long digits.

-The library includes code adapted from Google Wuffs (written by Nigel Tao) which
-was originally published under the Apache 2.0 license.
+The library includes code adapted from Google Wuffs (written by Nigel Tao) which was originally published
+under the Apache 2.0 license.

 ## License

 <sup>
 Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
-2.0</a> or <a href="LICENSE-MIT">MIT license</a> or <a
-href="LICENSE-BOOST">BOOST license</a>.
+2.0</a> or <a href="LICENSE-MIT">MIT license</a> or <a href="LICENSE-BOOST">BOOST license</a> .
 </sup>

-<br/>
+<br>

 <sub>
 Unless you explicitly state otherwise, any contribution intentionally submitted
--- a/3rdparty/fast_float/include/fast_float/ascii_number.h
+++ b/3rdparty/fast_float/include/fast_float/ascii_number.h
@@ -20,7 +20,8 @@

 namespace fast_float {

-template <typename UC> fastfloat_really_inline constexpr bool has_simd_opt() {
+template <typename UC>
+fastfloat_really_inline constexpr bool has_simd_opt() {
 #ifdef FASTFLOAT_HAS_SIMD
  return std::is_same<UC, char16_t>::value;
 #else
@@ -36,20 +37,24 @@ fastfloat_really_inline constexpr bool is_integer(UC c) noexcept {
 }

 fastfloat_really_inline constexpr uint64_t byteswap(uint64_t val) {
-  return (val & 0xFF00000000000000) >> 56 | (val & 0x00FF000000000000) >> 40 |
-         (val & 0x0000FF0000000000) >> 24 | (val & 0x000000FF00000000) >> 8 |
-         (val & 0x00000000FF000000) << 8 | (val & 0x0000000000FF0000) << 24 |
-         (val & 0x000000000000FF00) << 40 | (val & 0x00000000000000FF) << 56;
+  return (val & 0xFF00000000000000) >> 56
+    | (val & 0x00FF000000000000) >> 40
+    | (val & 0x0000FF0000000000) >> 24
+    | (val & 0x000000FF00000000) >> 8
+    | (val & 0x00000000FF000000) << 8
+    | (val & 0x0000000000FF0000) << 24
+    | (val & 0x000000000000FF00) << 40
+    | (val & 0x00000000000000FF) << 56;
 }

 // Read 8 UC into a u64. Truncates UC if not char.
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-read8_to_u64(UC const *chars) {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t read8_to_u64(const UC *chars) {
  if (cpp20_and_in_constexpr() || !std::is_same<UC, char>::value) {
    uint64_t val = 0;
-    for (int i = 0; i < 8; ++i) {
-      val |= uint64_t(uint8_t(*chars)) << (i * 8);
+    for(int i = 0; i < 8; ++i) {
+      val |= uint64_t(uint8_t(*chars)) << (i*8);
      ++chars;
    }
    return val;
@@ -65,41 +70,44 @@ read8_to_u64(UC const *chars) {

 #ifdef FASTFLOAT_SSE2

-fastfloat_really_inline uint64_t simd_read8_to_u64(__m128i const data) {
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
-  __m128i const packed = _mm_packus_epi16(data, data);
+fastfloat_really_inline
+uint64_t simd_read8_to_u64(const __m128i data) {
+FASTFLOAT_SIMD_DISABLE_WARNINGS
+  const __m128i packed = _mm_packus_epi16(data, data);
 #ifdef FASTFLOAT_64BIT
  return uint64_t(_mm_cvtsi128_si64(packed));
 #else
  uint64_t value;
  // Visual Studio + older versions of GCC don't support _mm_storeu_si64
-  _mm_storel_epi64(reinterpret_cast<__m128i *>(&value), packed);
+  _mm_storel_epi64(reinterpret_cast<__m128i*>(&value), packed);
  return value;
 #endif
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 }

-fastfloat_really_inline uint64_t simd_read8_to_u64(char16_t const *chars) {
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
-  return simd_read8_to_u64(
-      _mm_loadu_si128(reinterpret_cast<__m128i const *>(chars)));
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+fastfloat_really_inline
+uint64_t simd_read8_to_u64(const char16_t* chars) {
+FASTFLOAT_SIMD_DISABLE_WARNINGS
+  return simd_read8_to_u64(_mm_loadu_si128(reinterpret_cast<const __m128i*>(chars)));
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 }

 #elif defined(FASTFLOAT_NEON)

-fastfloat_really_inline uint64_t simd_read8_to_u64(uint16x8_t const data) {
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
+
+fastfloat_really_inline
+uint64_t simd_read8_to_u64(const uint16x8_t data) {
+FASTFLOAT_SIMD_DISABLE_WARNINGS
  uint8x8_t utf8_packed = vmovn_u16(data);
  return vget_lane_u64(vreinterpret_u64_u8(utf8_packed), 0);
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 }

-fastfloat_really_inline uint64_t simd_read8_to_u64(char16_t const *chars) {
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
-  return simd_read8_to_u64(
-      vld1q_u16(reinterpret_cast<uint16_t const *>(chars)));
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+fastfloat_really_inline
+uint64_t simd_read8_to_u64(const char16_t* chars) {
+FASTFLOAT_SIMD_DISABLE_WARNINGS
+  return simd_read8_to_u64(vld1q_u16(reinterpret_cast<const uint16_t*>(chars)));
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 }

 #endif // FASTFLOAT_SSE2
@@ -111,84 +119,101 @@ template <typename UC>
 template <typename UC, FASTFLOAT_ENABLE_IF(!has_simd_opt<UC>()) = 0>
 #endif
 // dummy for compile
-uint64_t simd_read8_to_u64(UC const *) {
+uint64_t simd_read8_to_u64(UC const*) {
  return 0;
 }

+
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void write_u64(uint8_t *chars, uint64_t val) {
+  if (cpp20_and_in_constexpr()) {
+    for(int i = 0; i < 8; ++i) {
+      *chars = uint8_t(val);
+      val >>= 8;
+      ++chars;
+    }
+    return;
+  }
+#if FASTFLOAT_IS_BIG_ENDIAN == 1
+  // Need to read as-if the number was in little-endian order.
+  val = byteswap(val);
+#endif
+  ::memcpy(chars, &val, sizeof(uint64_t));
+}
+
 // credit  @aqrit
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 uint32_t
-parse_eight_digits_unrolled(uint64_t val) {
-  uint64_t const mask = 0x000000FF000000FF;
-  uint64_t const mul1 = 0x000F424000000064; // 100 + (1000000ULL << 32)
-  uint64_t const mul2 = 0x0000271000000001; // 1 + (10000ULL << 32)
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+uint32_t parse_eight_digits_unrolled(uint64_t val) {
+  const uint64_t mask = 0x000000FF000000FF;
+  const uint64_t mul1 = 0x000F424000000064; // 100 + (1000000ULL << 32)
+  const uint64_t mul2 = 0x0000271000000001; // 1 + (10000ULL << 32)
  val -= 0x3030303030303030;
  val = (val * 10) + (val >> 8); // val = (val * 2561) >> 8;
  val = (((val & mask) * mul1) + (((val >> 16) & mask) * mul2)) >> 32;
  return uint32_t(val);
 }

+
 // Call this if chars are definitely 8 digits.
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint32_t
-parse_eight_digits_unrolled(UC const *chars) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint32_t parse_eight_digits_unrolled(UC const * chars)  noexcept {
  if (cpp20_and_in_constexpr() || !has_simd_opt<UC>()) {
    return parse_eight_digits_unrolled(read8_to_u64(chars)); // truncation okay
  }
  return parse_eight_digits_unrolled(simd_read8_to_u64(chars));
 }

+
 // credit @aqrit
-fastfloat_really_inline constexpr bool
-is_made_of_eight_digits_fast(uint64_t val) noexcept {
+fastfloat_really_inline constexpr bool is_made_of_eight_digits_fast(uint64_t val)  noexcept {
  return !((((val + 0x4646464646464646) | (val - 0x3030303030303030)) &
-            0x8080808080808080));
+     0x8080808080808080));
 }

+
 #ifdef FASTFLOAT_HAS_SIMD

 // Call this if chars might not be 8 digits.
-// Using this style (instead of is_made_of_eight_digits_fast() then
-// parse_eight_digits_unrolled()) ensures we don't load SIMD registers twice.
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-simd_parse_if_eight_digits_unrolled(char16_t const *chars,
-                                    uint64_t &i) noexcept {
+// Using this style (instead of is_made_of_eight_digits_fast() then parse_eight_digits_unrolled())
+// ensures we don't load SIMD registers twice.
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+bool simd_parse_if_eight_digits_unrolled(const char16_t* chars, uint64_t& i) noexcept {
  if (cpp20_and_in_constexpr()) {
    return false;
-  }
+  }   
 #ifdef FASTFLOAT_SSE2
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
-  __m128i const data =
-      _mm_loadu_si128(reinterpret_cast<__m128i const *>(chars));
+FASTFLOAT_SIMD_DISABLE_WARNINGS
+  const __m128i data = _mm_loadu_si128(reinterpret_cast<const __m128i*>(chars));

  // (x - '0') <= 9
  // http://0x80.pl/articles/simd-parsing-int-sequences.html
-  __m128i const t0 = _mm_add_epi16(data, _mm_set1_epi16(32720));
-  __m128i const t1 = _mm_cmpgt_epi16(t0, _mm_set1_epi16(-32759));
+  const __m128i t0 = _mm_add_epi16(data, _mm_set1_epi16(32720));
+  const __m128i t1 = _mm_cmpgt_epi16(t0, _mm_set1_epi16(-32759));

  if (_mm_movemask_epi8(t1) == 0) {
    i = i * 100000000 + parse_eight_digits_unrolled(simd_read8_to_u64(data));
    return true;
-  } else
-    return false;
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+  }
+  else return false;
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 #elif defined(FASTFLOAT_NEON)
-  FASTFLOAT_SIMD_DISABLE_WARNINGS
-  uint16x8_t const data = vld1q_u16(reinterpret_cast<uint16_t const *>(chars));
-
+FASTFLOAT_SIMD_DISABLE_WARNINGS
+  const uint16x8_t data = vld1q_u16(reinterpret_cast<const uint16_t*>(chars));
+  
  // (x - '0') <= 9
  // http://0x80.pl/articles/simd-parsing-int-sequences.html
-  uint16x8_t const t0 = vsubq_u16(data, vmovq_n_u16('0'));
-  uint16x8_t const mask = vcltq_u16(t0, vmovq_n_u16('9' - '0' + 1));
+  const uint16x8_t t0 = vsubq_u16(data, vmovq_n_u16('0'));
+  const uint16x8_t mask = vcltq_u16(t0, vmovq_n_u16('9' - '0' + 1));

  if (vminvq_u16(mask) == 0xFFFF) {
    i = i * 100000000 + parse_eight_digits_unrolled(simd_read8_to_u64(data));
    return true;
-  } else
-    return false;
-  FASTFLOAT_SIMD_RESTORE_WARNINGS
+  }
+  else return false;
+FASTFLOAT_SIMD_RESTORE_WARNINGS
 #else
-  (void)chars;
-  (void)i;
+  (void)chars; (void)i;
  return false;
 #endif // FASTFLOAT_SSE2
 }
@@ -202,119 +227,79 @@ template <typename UC>
 template <typename UC, FASTFLOAT_ENABLE_IF(!has_simd_opt<UC>()) = 0>
 #endif
 // dummy for compile
-bool simd_parse_if_eight_digits_unrolled(UC const *, uint64_t &) {
+bool simd_parse_if_eight_digits_unrolled(UC const*, uint64_t&) {
  return 0;
 }

+
 template <typename UC, FASTFLOAT_ENABLE_IF(!std::is_same<UC, char>::value) = 0>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-loop_parse_if_eight_digits(UC const *&p, UC const *const pend, uint64_t &i) {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void loop_parse_if_eight_digits(const UC*& p, const UC* const pend, uint64_t& i) {
  if (!has_simd_opt<UC>()) {
    return;
  }
-  while ((std::distance(p, pend) >= 8) &&
-         simd_parse_if_eight_digits_unrolled(
-             p, i)) { // in rare cases, this will overflow, but that's ok
+  while ((std::distance(p, pend) >= 8) && simd_parse_if_eight_digits_unrolled(p, i)) { // in rare cases, this will overflow, but that's ok
    p += 8;
  }
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-loop_parse_if_eight_digits(char const *&p, char const *const pend,
-                           uint64_t &i) {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void loop_parse_if_eight_digits(const char*& p, const char* const pend, uint64_t& i) {
  // optimizes better than parse_if_eight_digits_unrolled() for UC = char.
-  while ((std::distance(p, pend) >= 8) &&
-         is_made_of_eight_digits_fast(read8_to_u64(p))) {
-    i = i * 100000000 +
-        parse_eight_digits_unrolled(read8_to_u64(
-            p)); // in rare cases, this will overflow, but that's ok
+  while ((std::distance(p, pend) >= 8) && is_made_of_eight_digits_fast(read8_to_u64(p))) {
+    i = i * 100000000 + parse_eight_digits_unrolled(read8_to_u64(p)); // in rare cases, this will overflow, but that's ok
    p += 8;
  }
 }

-enum class parse_error {
-  no_error,
-  // [JSON-only] The minus sign must be followed by an integer.
-  missing_integer_after_sign,
-  // A sign must be followed by an integer or dot.
-  missing_integer_or_dot_after_sign,
-  // [JSON-only] The integer part must not have leading zeros.
-  leading_zeros_in_integer_part,
-  // [JSON-only] The integer part must have at least one digit.
-  no_digits_in_integer_part,
-  // [JSON-only] If there is a decimal point, there must be digits in the
-  // fractional part.
-  no_digits_in_fractional_part,
-  // The mantissa must have at least one digit.
-  no_digits_in_mantissa,
-  // Scientific notation requires an exponential part.
-  missing_exponential_part,
-};
-
-template <typename UC> struct parsed_number_string_t {
+template <typename UC>
+struct parsed_number_string_t {
  int64_t exponent{0};
  uint64_t mantissa{0};
-  UC const *lastmatch{nullptr};
+  UC const * lastmatch{nullptr};
  bool negative{false};
  bool valid{false};
  bool too_many_digits{false};
  // contains the range of the significant digits
-  span<UC const> integer{};  // non-nullable
-  span<UC const> fraction{}; // nullable
-  parse_error error{parse_error::no_error};
+  span<const UC> integer{};  // non-nullable
+  span<const UC> fraction{}; // nullable
 };

-using byte_span = span<char const>;
+using byte_span = span<const char>;
 using parsed_number_string = parsed_number_string_t<char>;

-template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 parsed_number_string_t<UC>
-report_parse_error(UC const *p, parse_error error) {
-  parsed_number_string_t<UC> answer;
-  answer.valid = false;
-  answer.lastmatch = p;
-  answer.error = error;
-  return answer;
-}
-
 // Assuming that you use no more than 19 digits, this will
 // parse an ASCII string.
-template <bool basic_json_fmt, typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 parsed_number_string_t<UC>
-parse_number_string(UC const *p, UC const *pend,
-                    parse_options_t<UC> options) noexcept {
-  chars_format const fmt = detail::adjust_for_feature_macros(options.format);
+template <typename UC>
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+parsed_number_string_t<UC> parse_number_string(UC const *p, UC const * pend, parse_options_t<UC> options) noexcept {
+  chars_format const fmt = options.format;
  UC const decimal_point = options.decimal_point;

  parsed_number_string_t<UC> answer;
  answer.valid = false;
  answer.too_many_digits = false;
-  // assume p < pend, so dereference without checks;
  answer.negative = (*p == UC('-'));
-  // C++17 20.19.3.(7.1) explicitly forbids '+' sign here
-  if ((*p == UC('-')) || (uint64_t(fmt & chars_format::allow_leading_plus) &&
-                          !basic_json_fmt && *p == UC('+'))) {
+#ifdef FASTFLOAT_ALLOWS_LEADING_PLUS // disabled by default
+  if ((*p == UC('-')) || (!(fmt & FASTFLOAT_JSONFMT) && *p == UC('+'))) {
+#else
+  if (*p == UC('-')) { // C++17 20.19.3.(7.1) explicitly forbids '+' sign here
+#endif
    ++p;
    if (p == pend) {
-      return report_parse_error<UC>(
-          p, parse_error::missing_integer_or_dot_after_sign);
+      return answer;
    }
-    FASTFLOAT_IF_CONSTEXPR17(basic_json_fmt) {
+    if (fmt & FASTFLOAT_JSONFMT) {
      if (!is_integer(*p)) { // a sign must be followed by an integer
-        return report_parse_error<UC>(p,
-                                      parse_error::missing_integer_after_sign);
-      }
-    }
-    else {
-      if (!is_integer(*p) &&
-          (*p !=
-           decimal_point)) { // a sign must be followed by an integer or the dot
-        return report_parse_error<UC>(
-            p, parse_error::missing_integer_or_dot_after_sign);
+        return answer;
+      }    
+    } else {
+      if (!is_integer(*p) && (*p != decimal_point)) { // a sign must be followed by an integer or the dot
+        return answer;
      }
    }
  }
-  UC const *const start_digits = p;
+  UC const * const start_digits = p;

  uint64_t i = 0; // an unsigned int avoids signed overflows (which are bad)

@@ -322,29 +307,24 @@ parse_number_string(UC const *p, UC const *pend,
    // a multiplication by 10 is cheaper than an arbitrary integer
    // multiplication
    i = 10 * i +
-        uint64_t(*p -
-                 UC('0')); // might overflow, we will handle the overflow later
+        uint64_t(*p - UC('0')); // might overflow, we will handle the overflow later
    ++p;
  }
-  UC const *const end_of_integer_part = p;
+  UC const * const end_of_integer_part = p;
  int64_t digit_count = int64_t(end_of_integer_part - start_digits);
-  answer.integer = span<UC const>(start_digits, size_t(digit_count));
-  FASTFLOAT_IF_CONSTEXPR17(basic_json_fmt) {
+  answer.integer = span<const UC>(start_digits, size_t(digit_count));
+  if (fmt & FASTFLOAT_JSONFMT) {
    // at least 1 digit in integer part, without leading zeros
-    if (digit_count == 0) {
-      return report_parse_error<UC>(p, parse_error::no_digits_in_integer_part);
-    }
-    if ((start_digits[0] == UC('0') && digit_count > 1)) {
-      return report_parse_error<UC>(start_digits,
-                                    parse_error::leading_zeros_in_integer_part);
+    if (digit_count == 0 || (start_digits[0] == UC('0') && digit_count > 1)) {
+      return answer;
    }
  }

  int64_t exponent = 0;
-  bool const has_decimal_point = (p != pend) && (*p == decimal_point);
+  const bool has_decimal_point = (p != pend) && (*p == decimal_point);
  if (has_decimal_point) {
    ++p;
-    UC const *before = p;
+    UC const * before = p;
    // can occur at most twice without overflowing, but let it occur more, since
    // for integers with many digits, digit parsing is the primary bottleneck.
    loop_parse_if_eight_digits(p, pend, i);
@@ -355,45 +335,41 @@ parse_number_string(UC const *p, UC const *pend,
      i = i * 10 + digit; // in rare cases, this will overflow, but that's ok
    }
    exponent = before - p;
-    answer.fraction = span<UC const>(before, size_t(p - before));
+    answer.fraction = span<const UC>(before, size_t(p - before));
    digit_count -= exponent;
  }
-  FASTFLOAT_IF_CONSTEXPR17(basic_json_fmt) {
+  if (fmt & FASTFLOAT_JSONFMT) {
    // at least 1 digit in fractional part
    if (has_decimal_point && exponent == 0) {
-      return report_parse_error<UC>(p,
-                                    parse_error::no_digits_in_fractional_part);
+      return answer;
    }
-  }
+  } 
  else if (digit_count == 0) { // we must have encountered at least one integer!
-    return report_parse_error<UC>(p, parse_error::no_digits_in_mantissa);
+    return answer;
  }
-  int64_t exp_number = 0; // explicit exponential part
-  if ((uint64_t(fmt & chars_format::scientific) && (p != pend) &&
-       ((UC('e') == *p) || (UC('E') == *p))) ||
-      (uint64_t(fmt & detail::basic_fortran_fmt) && (p != pend) &&
-       ((UC('+') == *p) || (UC('-') == *p) || (UC('d') == *p) ||
-        (UC('D') == *p)))) {
-    UC const *location_of_e = p;
-    if ((UC('e') == *p) || (UC('E') == *p) || (UC('d') == *p) ||
-        (UC('D') == *p)) {
+  int64_t exp_number = 0;            // explicit exponential part
+  if ( ((fmt & chars_format::scientific) &&
+        (p != pend) &&
+        ((UC('e') == *p) || (UC('E') == *p)))
+       ||
+       ((fmt & FASTFLOAT_FORTRANFMT) &&
+        (p != pend) &&
+        ((UC('+') == *p) || (UC('-') == *p) || (UC('d') == *p) || (UC('D') == *p)))) {
+    UC const * location_of_e = p;
+    if ((UC('e') == *p) || (UC('E') == *p) || (UC('d') == *p) || (UC('D') == *p)) {
      ++p;
    }
    bool neg_exp = false;
    if ((p != pend) && (UC('-') == *p)) {
      neg_exp = true;
      ++p;
-    } else if ((p != pend) &&
-               (UC('+') ==
-                *p)) { // '+' on exponent is allowed by C++17 20.19.3.(7.1)
+    } else if ((p != pend) && (UC('+') == *p)) { // '+' on exponent is allowed by C++17 20.19.3.(7.1)
      ++p;
    }
    if ((p == pend) || !is_integer(*p)) {
-      if (!uint64_t(fmt & chars_format::fixed)) {
-        // The exponential part is invalid for scientific notation, so it must
-        // be a trailing token for fixed notation. However, fixed notation is
-        // disabled, so report a scientific notation error.
-        return report_parse_error<UC>(p, parse_error::missing_exponential_part);
+      if(!(fmt & chars_format::fixed)) {
+        // We are in error.
+        return answer;
      }
      // Otherwise, we will be ignoring the 'e'.
      p = location_of_e;
@@ -405,17 +381,12 @@ parse_number_string(UC const *p, UC const *pend,
        }
        ++p;
      }
-      if (neg_exp) {
-        exp_number = -exp_number;
-      }
+      if(neg_exp) { exp_number = - exp_number; }
      exponent += exp_number;
    }
  } else {
    // If it scientific and not fixed, we have to bail out.
-    if (uint64_t(fmt & chars_format::scientific) &&
-        !uint64_t(fmt & chars_format::fixed)) {
-      return report_parse_error<UC>(p, parse_error::missing_exponential_part);
-    }
+    if((fmt & chars_format::scientific) && !(fmt & chars_format::fixed)) { return answer; }
  }
  answer.lastmatch = p;
  answer.valid = true;
@@ -430,32 +401,31 @@ parse_number_string(UC const *p, UC const *pend,
    // We have to handle the case where we have 0.0000somenumber.
    // We need to be mindful of the case where we only have zeroes...
    // E.g., 0.000000000...000.
-    UC const *start = start_digits;
+    UC const * start = start_digits;
    while ((start != pend) && (*start == UC('0') || *start == decimal_point)) {
-      if (*start == UC('0')) {
-        digit_count--;
-      }
+      if(*start == UC('0')) { digit_count --; }
      start++;
    }

    if (digit_count > 19) {
      answer.too_many_digits = true;
      // Let us start again, this time, avoiding overflows.
-      // We don't need to call if is_integer, since we use the
+      // We don't need to check if is_integer, since we use the
      // pre-tokenized spans from above.
      i = 0;
      p = answer.integer.ptr;
-      UC const *int_end = p + answer.integer.len();
-      uint64_t const minimal_nineteen_digit_integer{1000000000000000000};
+      UC const* int_end = p + answer.integer.len();
+      const uint64_t minimal_nineteen_digit_integer{ 1000000000000000000 };
      while ((i < minimal_nineteen_digit_integer) && (p != int_end)) {
        i = i * 10 + uint64_t(*p - UC('0'));
        ++p;
      }
-      if (i >= minimal_nineteen_digit_integer) { // We have a big integer
+      if (i >= minimal_nineteen_digit_integer) { // We have a big integers
        exponent = end_of_integer_part - p + exp_number;
-      } else { // We have a value with a fractional component.
+      }
+      else { // We have a value with a fractional component.
        p = answer.fraction.ptr;
-        UC const *frac_end = p + answer.fraction.len();
+        UC const* frac_end = p + answer.fraction.len();
        while ((i < minimal_nineteen_digit_integer) && (p != frac_end)) {
          i = i * 10 + uint64_t(*p - UC('0'));
          ++p;
@@ -471,43 +441,35 @@ parse_number_string(UC const *p, UC const *pend,
 }

 template <typename T, typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-parse_int_string(UC const *p, UC const *pend, T &value,
-                 parse_options_t<UC> options) {
-  chars_format const fmt = detail::adjust_for_feature_macros(options.format);
-  int const base = options.base;
-
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> parse_int_string(UC const* p, UC const* pend, T& value, int base) {
  from_chars_result_t<UC> answer;
+  
+  UC const* const first = p;

-  UC const *const first = p;
-
-  bool const negative = (*p == UC('-'));
-#ifdef FASTFLOAT_VISUAL_STUDIO
-#pragma warning(push)
-#pragma warning(disable : 4127)
-#endif
+  bool negative = (*p == UC('-'));
  if (!std::is_signed<T>::value && negative) {
-#ifdef FASTFLOAT_VISUAL_STUDIO
-#pragma warning(pop)
-#endif
    answer.ec = std::errc::invalid_argument;
    answer.ptr = first;
    return answer;
  }
-  if ((*p == UC('-')) ||
-      (uint64_t(fmt & chars_format::allow_leading_plus) && (*p == UC('+')))) {
+#ifdef FASTFLOAT_ALLOWS_LEADING_PLUS // disabled by default
+  if ((*p == UC('-')) || (*p == UC('+'))) {
+#else
+  if (*p == UC('-')) {
+#endif
    ++p;
  }

-  UC const *const start_num = p;
+  UC const* const start_num = p;

-  while (p != pend && *p == UC('0')) {
-    ++p;
+  while (p!= pend && *p == UC('0')) {
+    ++p; 
  }

-  bool const has_leading_zeros = p > start_num;
+  const bool has_leading_zeros = p > start_num;

-  UC const *const start_digits = p;
+  UC const* const start_digits = p;

  uint64_t i = 0;
  if (base == 10) {
@@ -519,9 +481,9 @@ parse_int_string(UC const *p, UC const *pend, T &value,
      break;
    }
    i = uint64_t(base) * i + digit; // might overflow, check this later
-    p++;
+    p++; 
  }
-
+  
  size_t digit_count = size_t(p - start_digits);

  if (digit_count == 0) {
@@ -529,11 +491,12 @@ parse_int_string(UC const *p, UC const *pend, T &value,
      value = 0;
      answer.ec = std::errc();
      answer.ptr = p;
-    } else {
+    }
+    else {
      answer.ec = std::errc::invalid_argument;
      answer.ptr = first;
    }
-    return answer;
+    return answer; 
  }

  answer.ptr = p;
@@ -544,8 +507,7 @@ parse_int_string(UC const *p, UC const *pend, T &value,
    answer.ec = std::errc::result_out_of_range;
    return answer;
  }
-  // this check can be eliminated for all other types, but they will all require
-  // a max_digits(base) equivalent
+  // this check can be eliminated for all other types, but they will all require a max_digits(base) equivalent
  if (digit_count == max_digits && i < min_safe_u64(base)) {
    answer.ec = std::errc::result_out_of_range;
    return answer;
@@ -562,22 +524,18 @@ parse_int_string(UC const *p, UC const *pend, T &value,
  if (negative) {
 #ifdef FASTFLOAT_VISUAL_STUDIO
 #pragma warning(push)
-#pragma warning(disable : 4146)
+#pragma warning(disable: 4146) 
 #endif
    // this weird workaround is required because:
-    // - converting unsigned to signed when its value is greater than signed max
-    // is UB pre-C++23.
+    // - converting unsigned to signed when its value is greater than signed max is UB pre-C++23.
    // - reinterpret_casting (~i + 1) would work, but it is not constexpr
-    // this is always optimized into a neg instruction (note: T is an integer
-    // type)
-    value = T(-std::numeric_limits<T>::max() -
-              T(i - uint64_t(std::numeric_limits<T>::max())));
+    // this is always optimized into a neg instruction (note: T is an integer type)
+    value = T(-std::numeric_limits<T>::max() - T(i - uint64_t(std::numeric_limits<T>::max())));
 #ifdef FASTFLOAT_VISUAL_STUDIO
 #pragma warning(pop)
 #endif
-  } else {
-    value = T(i);
  }
+  else { value = T(i); }

  answer.ec = std::errc();
  return answer;
--- a/3rdparty/fast_float/include/fast_float/bigint.h
+++ b/3rdparty/fast_float/include/fast_float/bigint.h
@@ -37,14 +37,15 @@ constexpr size_t bigint_limbs = bigint_bits / limb_bits;

 // vector-like type that is allocated on the stack. the entire
 // buffer is pre-allocated, and only the length changes.
-template <uint16_t size> struct stackvec {
+template <uint16_t size>
+struct stackvec {
  limb data[size];
  // we never need more than 150 limbs
  uint16_t length{0};

  stackvec() = default;
-  stackvec(stackvec const &) = delete;
-  stackvec &operator=(stackvec const &) = delete;
+  stackvec(const stackvec &) = delete;
+  stackvec &operator=(const stackvec &) = delete;
  stackvec(stackvec &&) = delete;
  stackvec &operator=(stackvec &&other) = delete;

@@ -53,18 +54,16 @@ template <uint16_t size> struct stackvec {
    FASTFLOAT_ASSERT(try_extend(s));
  }

-  FASTFLOAT_CONSTEXPR14 limb &operator[](size_t index) noexcept {
+  FASTFLOAT_CONSTEXPR14 limb& operator[](size_t index) noexcept {
    FASTFLOAT_DEBUG_ASSERT(index < length);
    return data[index];
  }
-
-  FASTFLOAT_CONSTEXPR14 const limb &operator[](size_t index) const noexcept {
+  FASTFLOAT_CONSTEXPR14 const limb& operator[](size_t index) const noexcept {
    FASTFLOAT_DEBUG_ASSERT(index < length);
    return data[index];
  }
-
  // index from the end of the container
-  FASTFLOAT_CONSTEXPR14 const limb &rindex(size_t index) const noexcept {
+  FASTFLOAT_CONSTEXPR14 const limb& rindex(size_t index) const noexcept {
    FASTFLOAT_DEBUG_ASSERT(index < length);
    size_t rindex = length - index - 1;
    return data[rindex];
@@ -74,19 +73,20 @@ template <uint16_t size> struct stackvec {
  FASTFLOAT_CONSTEXPR14 void set_len(size_t len) noexcept {
    length = uint16_t(len);
  }
-
-  constexpr size_t len() const noexcept { return length; }
-
-  constexpr bool is_empty() const noexcept { return length == 0; }
-
-  constexpr size_t capacity() const noexcept { return size; }
-
+  constexpr size_t len() const noexcept {
+    return length;
+  }
+  constexpr bool is_empty() const noexcept {
+    return length == 0;
+  }
+  constexpr size_t capacity() const noexcept {
+    return size;
+  }
  // append item to vector, without bounds checking
  FASTFLOAT_CONSTEXPR14 void push_unchecked(limb value) noexcept {
    data[length] = value;
    length++;
  }
-
  // append item to vector, returning if item was added
  FASTFLOAT_CONSTEXPR14 bool try_push(limb value) noexcept {
    if (len() < capacity()) {
@@ -96,14 +96,12 @@ template <uint16_t size> struct stackvec {
      return false;
    }
  }
-
  // add items to the vector, from a span, without bounds checking
  FASTFLOAT_CONSTEXPR20 void extend_unchecked(limb_span s) noexcept {
-    limb *ptr = data + length;
+    limb* ptr = data + length;
    std::copy_n(s.ptr, s.len(), ptr);
    set_len(len() + s.len());
  }
-
  // try to add items to the vector, returning if items were added
  FASTFLOAT_CONSTEXPR20 bool try_extend(limb_span s) noexcept {
    if (len() + s.len() <= capacity()) {
@@ -113,7 +111,6 @@ template <uint16_t size> struct stackvec {
      return false;
    }
  }
-
  // resize the vector, without bounds checking
  // if the new size is longer than the vector, assign value to each
  // appended item.
@@ -121,15 +118,14 @@ template <uint16_t size> struct stackvec {
  void resize_unchecked(size_t new_len, limb value) noexcept {
    if (new_len > len()) {
      size_t count = new_len - len();
-      limb *first = data + len();
-      limb *last = first + count;
+      limb* first = data + len();
+      limb* last = first + count;
      ::std::fill(first, last, value);
      set_len(new_len);
    } else {
      set_len(new_len);
    }
  }
-
  // try to resize the vector, returning if the vector was resized.
  FASTFLOAT_CONSTEXPR20 bool try_resize(size_t new_len, limb value) noexcept {
    if (new_len > capacity()) {
@@ -139,7 +135,6 @@ template <uint16_t size> struct stackvec {
      return true;
    }
  }
-
  // check if any limbs are non-zero after the given index.
  // this needs to be done in reverse order, since the index
  // is relative to the most significant limbs.
@@ -152,7 +147,6 @@ template <uint16_t size> struct stackvec {
    }
    return false;
  }
-
  // normalize the big integer, so most-significant zero limbs are removed.
  FASTFLOAT_CONSTEXPR14 void normalize() noexcept {
    while (len() > 0 && rindex(0) == 0) {
@@ -161,21 +155,21 @@ template <uint16_t size> struct stackvec {
  }
 };

-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 uint64_t
-empty_hi64(bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+uint64_t empty_hi64(bool& truncated) noexcept {
  truncated = false;
  return 0;
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-uint64_hi64(uint64_t r0, bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t uint64_hi64(uint64_t r0, bool& truncated) noexcept {
  truncated = false;
  int shl = leading_zeroes(r0);
  return r0 << shl;
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-uint64_hi64(uint64_t r0, uint64_t r1, bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t uint64_hi64(uint64_t r0, uint64_t r1, bool& truncated) noexcept {
  int shl = leading_zeroes(r0);
  if (shl == 0) {
    truncated = r1 != 0;
@@ -187,20 +181,20 @@ uint64_hi64(uint64_t r0, uint64_t r1, bool &truncated) noexcept {
  }
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-uint32_hi64(uint32_t r0, bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t uint32_hi64(uint32_t r0, bool& truncated) noexcept {
  return uint64_hi64(r0, truncated);
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-uint32_hi64(uint32_t r0, uint32_t r1, bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t uint32_hi64(uint32_t r0, uint32_t r1, bool& truncated) noexcept {
  uint64_t x0 = r0;
  uint64_t x1 = r1;
  return uint64_hi64((x0 << 32) | x1, truncated);
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
-uint32_hi64(uint32_t r0, uint32_t r1, uint32_t r2, bool &truncated) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+uint64_t uint32_hi64(uint32_t r0, uint32_t r1, uint32_t r2, bool& truncated) noexcept {
  uint64_t x0 = r0;
  uint64_t x1 = r1;
  uint64_t x2 = r2;
@@ -211,17 +205,17 @@ uint32_hi64(uint32_t r0, uint32_t r1, uint32_t r2, bool &truncated) noexcept {
 // we want an efficient operation. for msvc, where
 // we don't have built-in intrinsics, this is still
 // pretty fast.
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 limb
-scalar_add(limb x, limb y, bool &overflow) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+limb scalar_add(limb x, limb y, bool& overflow) noexcept {
  limb z;
 // gcc and clang
 #if defined(__has_builtin)
-#if __has_builtin(__builtin_add_overflow)
-  if (!cpp20_and_in_constexpr()) {
-    overflow = __builtin_add_overflow(x, y, &z);
-    return z;
-  }
-#endif
+  #if __has_builtin(__builtin_add_overflow)
+    if (!cpp20_and_in_constexpr()) {
+      overflow = __builtin_add_overflow(x, y, &z);
+      return z;
+    }
+  #endif
 #endif

  // generic, this still optimizes correctly on MSVC.
@@ -231,24 +225,24 @@ scalar_add(limb x, limb y, bool &overflow) noexcept {
 }

 // multiply two small integers, getting both the high and low bits.
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 limb
-scalar_mul(limb x, limb y, limb &carry) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+limb scalar_mul(limb x, limb y, limb& carry) noexcept {
 #ifdef FASTFLOAT_64BIT_LIMB
-#if defined(__SIZEOF_INT128__)
+  #if defined(__SIZEOF_INT128__)
  // GCC and clang both define it as an extension.
  __uint128_t z = __uint128_t(x) * __uint128_t(y) + __uint128_t(carry);
  carry = limb(z >> limb_bits);
  return limb(z);
-#else
+  #else
  // fallback, no native 128-bit integer multiplication with carry.
  // on msvc, this optimizes identically, somehow.
  value128 z = full_multiplication(x, y);
  bool overflow;
  z.low = scalar_add(z.low, carry, overflow);
-  z.high += uint64_t(overflow); // cannot overflow
+  z.high += uint64_t(overflow);  // cannot overflow
  carry = z.high;
  return z.low;
-#endif
+  #endif
 #else
  uint64_t z = uint64_t(x) * uint64_t(y) + uint64_t(carry);
  carry = limb(z >> limb_bits);
@@ -259,8 +253,8 @@ scalar_mul(limb x, limb y, limb &carry) noexcept {
 // add scalar value to bigint starting from offset.
 // used in grade school multiplication
 template <uint16_t size>
-inline FASTFLOAT_CONSTEXPR20 bool small_add_from(stackvec<size> &vec, limb y,
-                                                 size_t start) noexcept {
+inline FASTFLOAT_CONSTEXPR20
+bool small_add_from(stackvec<size>& vec, limb y, size_t start) noexcept {
  size_t index = start;
  limb carry = y;
  bool overflow;
@@ -277,15 +271,15 @@ inline FASTFLOAT_CONSTEXPR20 bool small_add_from(stackvec<size> &vec, limb y,

 // add scalar value to bigint.
 template <uint16_t size>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-small_add(stackvec<size> &vec, limb y) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+bool small_add(stackvec<size>& vec, limb y) noexcept {
  return small_add_from(vec, y, 0);
 }

 // multiply bigint by scalar value.
 template <uint16_t size>
-inline FASTFLOAT_CONSTEXPR20 bool small_mul(stackvec<size> &vec,
-                                            limb y) noexcept {
+inline FASTFLOAT_CONSTEXPR20
+bool small_mul(stackvec<size>& vec, limb y) noexcept {
  limb carry = 0;
  for (size_t index = 0; index < vec.len(); index++) {
    vec[index] = scalar_mul(vec[index], y, carry);
@@ -299,12 +293,12 @@ inline FASTFLOAT_CONSTEXPR20 bool small_mul(stackvec<size> &vec,
 // add bigint to bigint starting from index.
 // used in grade school multiplication
 template <uint16_t size>
-FASTFLOAT_CONSTEXPR20 bool large_add_from(stackvec<size> &x, limb_span y,
-                                          size_t start) noexcept {
+FASTFLOAT_CONSTEXPR20
+bool large_add_from(stackvec<size>& x, limb_span y, size_t start) noexcept {
  // the effective x buffer is from `xstart..x.len()`, so exit early
  // if we can't get that current range.
  if (x.len() < start || y.len() > x.len() - start) {
-    FASTFLOAT_TRY(x.try_resize(y.len() + start, 0));
+      FASTFLOAT_TRY(x.try_resize(y.len() + start, 0));
  }

  bool carry = false;
@@ -330,14 +324,15 @@ FASTFLOAT_CONSTEXPR20 bool large_add_from(stackvec<size> &x, limb_span y,

 // add bigint to bigint.
 template <uint16_t size>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-large_add_from(stackvec<size> &x, limb_span y) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+bool large_add_from(stackvec<size>& x, limb_span y) noexcept {
  return large_add_from(x, y, 0);
 }

 // grade-school multiplication algorithm
 template <uint16_t size>
-FASTFLOAT_CONSTEXPR20 bool long_mul(stackvec<size> &x, limb_span y) noexcept {
+FASTFLOAT_CONSTEXPR20
+bool long_mul(stackvec<size>& x, limb_span y) noexcept {
  limb_span xs = limb_span(x.data, x.len());
  stackvec<size> z(xs);
  limb_span zs = limb_span(z.data, z.len());
@@ -365,7 +360,8 @@ FASTFLOAT_CONSTEXPR20 bool long_mul(stackvec<size> &x, limb_span y) noexcept {

 // grade-school multiplication algorithm
 template <uint16_t size>
-FASTFLOAT_CONSTEXPR20 bool large_mul(stackvec<size> &x, limb_span y) noexcept {
+FASTFLOAT_CONSTEXPR20
+bool large_mul(stackvec<size>& x, limb_span y) noexcept {
  if (y.len() == 1) {
    FASTFLOAT_TRY(small_mul(x, y[0]));
  } else {
@@ -374,58 +370,36 @@ FASTFLOAT_CONSTEXPR20 bool large_mul(stackvec<size> &x, limb_span y) noexcept {
  return true;
 }

-template <typename = void> struct pow5_tables {
+template <typename = void>
+struct pow5_tables {
  static constexpr uint32_t large_step = 135;
  static constexpr uint64_t small_power_of_5[] = {
-      1UL,
-      5UL,
-      25UL,
-      125UL,
-      625UL,
-      3125UL,
-      15625UL,
-      78125UL,
-      390625UL,
-      1953125UL,
-      9765625UL,
-      48828125UL,
-      244140625UL,
-      1220703125UL,
-      6103515625UL,
-      30517578125UL,
-      152587890625UL,
-      762939453125UL,
-      3814697265625UL,
-      19073486328125UL,
-      95367431640625UL,
-      476837158203125UL,
-      2384185791015625UL,
-      11920928955078125UL,
-      59604644775390625UL,
-      298023223876953125UL,
-      1490116119384765625UL,
-      7450580596923828125UL,
+    1UL, 5UL, 25UL, 125UL, 625UL, 3125UL, 15625UL, 78125UL, 390625UL,
+    1953125UL, 9765625UL, 48828125UL, 244140625UL, 1220703125UL,
+    6103515625UL, 30517578125UL, 152587890625UL, 762939453125UL,
+    3814697265625UL, 19073486328125UL, 95367431640625UL, 476837158203125UL,
+    2384185791015625UL, 11920928955078125UL, 59604644775390625UL,
+    298023223876953125UL, 1490116119384765625UL, 7450580596923828125UL,
  };
 #ifdef FASTFLOAT_64BIT_LIMB
  constexpr static limb large_power_of_5[] = {
-      1414648277510068013UL, 9180637584431281687UL, 4539964771860779200UL,
-      10482974169319127550UL, 198276706040285095UL};
+    1414648277510068013UL, 9180637584431281687UL, 4539964771860779200UL,
+    10482974169319127550UL, 198276706040285095UL};
 #else
  constexpr static limb large_power_of_5[] = {
-      4279965485U, 329373468U,  4020270615U, 2137533757U, 4287402176U,
-      1057042919U, 1071430142U, 2440757623U, 381945767U,  46164893U};
+    4279965485U, 329373468U, 4020270615U, 2137533757U, 4287402176U,
+    1057042919U, 1071430142U, 2440757623U, 381945767U, 46164893U};
 #endif
 };

-#if FASTFLOAT_DETAIL_MUST_DEFINE_CONSTEXPR_VARIABLE
+template <typename T>
+constexpr uint32_t pow5_tables<T>::large_step;

-template <typename T> constexpr uint32_t pow5_tables<T>::large_step;
+template <typename T>
+constexpr uint64_t pow5_tables<T>::small_power_of_5[];

-template <typename T> constexpr uint64_t pow5_tables<T>::small_power_of_5[];
-
-template <typename T> constexpr limb pow5_tables<T>::large_power_of_5[];
-
-#endif
+template <typename T>
+constexpr limb pow5_tables<T>::large_power_of_5[];

 // big integer type. implements a small subset of big integer
 // arithmetic, using simple algorithms since asymptotically
@@ -435,14 +409,13 @@ struct bigint : pow5_tables<> {
  // storage of the limbs, in little-endian order.
  stackvec<bigint_limbs> vec;

-  FASTFLOAT_CONSTEXPR20 bigint() : vec() {}
-
-  bigint(bigint const &) = delete;
-  bigint &operator=(bigint const &) = delete;
+  FASTFLOAT_CONSTEXPR20 bigint(): vec() {}
+  bigint(const bigint &) = delete;
+  bigint &operator=(const bigint &) = delete;
  bigint(bigint &&) = delete;
  bigint &operator=(bigint &&other) = delete;

-  FASTFLOAT_CONSTEXPR20 bigint(uint64_t value) : vec() {
+  FASTFLOAT_CONSTEXPR20 bigint(uint64_t value): vec() {
 #ifdef FASTFLOAT_64BIT_LIMB
    vec.push_unchecked(value);
 #else
@@ -454,7 +427,7 @@ struct bigint : pow5_tables<> {

  // get the high 64 bits from the vector, and if bits were truncated.
  // this is to get the significant digits for the float.
-  FASTFLOAT_CONSTEXPR20 uint64_t hi64(bool &truncated) const noexcept {
+  FASTFLOAT_CONSTEXPR20 uint64_t hi64(bool& truncated) const noexcept {
 #ifdef FASTFLOAT_64BIT_LIMB
    if (vec.len() == 0) {
      return empty_hi64(truncated);
@@ -473,8 +446,7 @@ struct bigint : pow5_tables<> {
    } else if (vec.len() == 2) {
      return uint32_hi64(vec.rindex(0), vec.rindex(1), truncated);
    } else {
-      uint64_t result =
-          uint32_hi64(vec.rindex(0), vec.rindex(1), vec.rindex(2), truncated);
+      uint64_t result = uint32_hi64(vec.rindex(0), vec.rindex(1), vec.rindex(2), truncated);
      truncated |= vec.nonzero(3);
      return result;
    }
@@ -487,7 +459,7 @@ struct bigint : pow5_tables<> {
  // positive, this is larger, otherwise they are equal.
  // the limbs are stored in little-endian order, so we
  // must compare the limbs in ever order.
-  FASTFLOAT_CONSTEXPR20 int compare(bigint const &other) const noexcept {
+  FASTFLOAT_CONSTEXPR20 int compare(const bigint& other) const noexcept {
    if (vec.len() > other.vec.len()) {
      return 1;
    } else if (vec.len() < other.vec.len()) {
@@ -540,12 +512,12 @@ struct bigint : pow5_tables<> {
      return false;
    } else if (!vec.is_empty()) {
      // move limbs
-      limb *dst = vec.data + n;
-      limb const *src = vec.data;
+      limb* dst = vec.data + n;
+      const limb* src = vec.data;
      std::copy_backward(src, src + vec.len(), dst + vec.len());
      // fill in empty limbs
-      limb *first = vec.data;
-      limb *last = first + n;
+      limb* first = vec.data;
+      limb* last = first + n;
      ::std::fill(first, last, 0);
      vec.set_len(n + vec.len());
      return true;
@@ -588,12 +560,18 @@ struct bigint : pow5_tables<> {
    return int(limb_bits * vec.len()) - lz;
  }

-  FASTFLOAT_CONSTEXPR20 bool mul(limb y) noexcept { return small_mul(vec, y); }
+  FASTFLOAT_CONSTEXPR20 bool mul(limb y) noexcept {
+    return small_mul(vec, y);
+  }

-  FASTFLOAT_CONSTEXPR20 bool add(limb y) noexcept { return small_add(vec, y); }
+  FASTFLOAT_CONSTEXPR20 bool add(limb y) noexcept {
+    return small_add(vec, y);
+  }

  // multiply as if by 2 raised to a power.
-  FASTFLOAT_CONSTEXPR20 bool pow2(uint32_t exp) noexcept { return shl(exp); }
+  FASTFLOAT_CONSTEXPR20 bool pow2(uint32_t exp) noexcept {
+    return shl(exp);
+  }

  // multiply as if by 5 raised to a power.
  FASTFLOAT_CONSTEXPR20 bool pow5(uint32_t exp) noexcept {
@@ -619,8 +597,9 @@ struct bigint : pow5_tables<> {
      // Work around clang bug https://godbolt.org/z/zedh7rrhc
      // This is similar to https://github.com/llvm/llvm-project/issues/47746,
      // except the workaround described there don't work here
-      FASTFLOAT_TRY(small_mul(
-          vec, limb(((void)small_power_of_5[0], small_power_of_5[exp]))));
+      FASTFLOAT_TRY(
+        small_mul(vec, limb(((void)small_power_of_5[0], small_power_of_5[exp])))
+      );
    }

    return true;
--- a/3rdparty/fast_float/include/fast_float/constexpr_feature_detect.h
+++ b/3rdparty/fast_float/include/fast_float/constexpr_feature_detect.h
@@ -8,7 +8,7 @@
 #endif

 // Testing for https://wg21.link/N3652, adopted in C++14
-#if defined(__cpp_constexpr) && __cpp_constexpr >= 201304
+#if __cpp_constexpr >= 201304
 #define FASTFLOAT_CONSTEXPR14 constexpr
 #else
 #define FASTFLOAT_CONSTEXPR14
@@ -20,23 +20,16 @@
 #define FASTFLOAT_HAS_BIT_CAST 0
 #endif

-#if defined(__cpp_lib_is_constant_evaluated) &&                                \
-    __cpp_lib_is_constant_evaluated >= 201811L
+#if defined(__cpp_lib_is_constant_evaluated) && __cpp_lib_is_constant_evaluated >= 201811L
 #define FASTFLOAT_HAS_IS_CONSTANT_EVALUATED 1
 #else
 #define FASTFLOAT_HAS_IS_CONSTANT_EVALUATED 0
 #endif

-#if defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606L
-#define FASTFLOAT_IF_CONSTEXPR17(x) if constexpr (x)
-#else
-#define FASTFLOAT_IF_CONSTEXPR17(x) if (x)
-#endif
-
 // Testing for relevant C++20 constexpr library features
-#if FASTFLOAT_HAS_IS_CONSTANT_EVALUATED && FASTFLOAT_HAS_BIT_CAST &&           \
-    defined(__cpp_lib_constexpr_algorithms) &&                                 \
-    __cpp_lib_constexpr_algorithms >= 201806L /*For std::copy and std::fill*/
+#if FASTFLOAT_HAS_IS_CONSTANT_EVALUATED \
+    && FASTFLOAT_HAS_BIT_CAST \
+    && __cpp_lib_constexpr_algorithms >= 201806L /*For std::copy and std::fill*/
 #define FASTFLOAT_CONSTEXPR20 constexpr
 #define FASTFLOAT_IS_CONSTEXPR 1
 #else
@@ -44,10 +37,4 @@
 #define FASTFLOAT_IS_CONSTEXPR 0
 #endif

-#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#define FASTFLOAT_DETAIL_MUST_DEFINE_CONSTEXPR_VARIABLE 0
-#else
-#define FASTFLOAT_DETAIL_MUST_DEFINE_CONSTEXPR_VARIABLE 1
-#endif
-
 #endif // FASTFLOAT_CONSTEXPR_FEATURE_DETECT_H
--- a/3rdparty/fast_float/include/fast_float/decimal_to_binary.h
+++ b/3rdparty/fast_float/include/fast_float/decimal_to_binary.h
@@ -12,34 +12,27 @@

 namespace fast_float {

-// This will compute or rather approximate w * 5**q and return a pair of 64-bit
-// words approximating the result, with the "high" part corresponding to the
-// most significant bits and the low part corresponding to the least significant
-// bits.
+// This will compute or rather approximate w * 5**q and return a pair of 64-bit words approximating
+// the result, with the "high" part corresponding to the most significant bits and the
+// low part corresponding to the least significant bits.
 //
 template <int bit_precision>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 value128
-compute_product_approximation(int64_t q, uint64_t w) {
-  int const index = 2 * int(q - powers::smallest_power_of_five);
-  // For small values of q, e.g., q in [0,27], the answer is always exact
-  // because The line value128 firstproduct = full_multiplication(w,
-  // power_of_five_128[index]); gives the exact answer.
-  value128 firstproduct =
-      full_multiplication(w, powers::power_of_five_128[index]);
-  static_assert((bit_precision >= 0) && (bit_precision <= 64),
-                " precision should  be in (0,64]");
-  constexpr uint64_t precision_mask =
-      (bit_precision < 64) ? (uint64_t(0xFFFFFFFFFFFFFFFF) >> bit_precision)
-                           : uint64_t(0xFFFFFFFFFFFFFFFF);
-  if ((firstproduct.high & precision_mask) ==
-      precision_mask) { // could further guard with  (lower + w < lower)
-    // regarding the second product, we only need secondproduct.high, but our
-    // expectation is that the compiler will optimize this extra work away if
-    // needed.
-    value128 secondproduct =
-        full_multiplication(w, powers::power_of_five_128[index + 1]);
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+value128 compute_product_approximation(int64_t q, uint64_t w) {
+  const int index = 2 * int(q - powers::smallest_power_of_five);
+  // For small values of q, e.g., q in [0,27], the answer is always exact because
+  // The line value128 firstproduct = full_multiplication(w, power_of_five_128[index]);
+  // gives the exact answer.
+  value128 firstproduct = full_multiplication(w, powers::power_of_five_128[index]);
+  static_assert((bit_precision >= 0) && (bit_precision <= 64), " precision should  be in (0,64]");
+  constexpr uint64_t precision_mask = (bit_precision < 64) ?
+               (uint64_t(0xFFFFFFFFFFFFFFFF) >> bit_precision)
+               : uint64_t(0xFFFFFFFFFFFFFFFF);
+  if((firstproduct.high & precision_mask) == precision_mask) { // could further guard with  (lower + w < lower)
+    // regarding the second product, we only need secondproduct.high, but our expectation is that the compiler will optimize this extra work away if needed.
+    value128 secondproduct = full_multiplication(w, powers::power_of_five_128[index + 1]);
    firstproduct.low += secondproduct.high;
-    if (secondproduct.high > firstproduct.low) {
+    if(secondproduct.high > firstproduct.low) {
      firstproduct.high++;
    }
  }
@@ -62,45 +55,43 @@ namespace detail {
 * where
 *   p = log(5**-q)/log(2) = -q * log(5)/log(2)
 */
-constexpr fastfloat_really_inline int32_t power(int32_t q) noexcept {
-  return (((152170 + 65536) * q) >> 16) + 63;
-}
+  constexpr fastfloat_really_inline int32_t power(int32_t q)  noexcept  {
+    return (((152170 + 65536) * q) >> 16) + 63;
+  }
 } // namespace detail

 // create an adjusted mantissa, biased by the invalid power2
 // for significant digits already multiplied by 10 ** q.
 template <typename binary>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 adjusted_mantissa
-compute_error_scaled(int64_t q, uint64_t w, int lz) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+adjusted_mantissa compute_error_scaled(int64_t q, uint64_t w, int lz) noexcept  {
  int hilz = int(w >> 63) ^ 1;
  adjusted_mantissa answer;
  answer.mantissa = w << hilz;
  int bias = binary::mantissa_explicit_bits() - binary::minimum_exponent();
-  answer.power2 = int32_t(detail::power(int32_t(q)) + bias - hilz - lz - 62 +
-                          invalid_am_bias);
+  answer.power2 = int32_t(detail::power(int32_t(q)) + bias - hilz - lz - 62 + invalid_am_bias);
  return answer;
 }

 // w * 10 ** q, without rounding the representation up.
 // the power2 in the exponent will be adjusted by invalid_am_bias.
 template <typename binary>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-compute_error(int64_t q, uint64_t w) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa compute_error(int64_t q, uint64_t w)  noexcept  {
  int lz = leading_zeroes(w);
  w <<= lz;
-  value128 product =
-      compute_product_approximation<binary::mantissa_explicit_bits() + 3>(q, w);
+  value128 product = compute_product_approximation<binary::mantissa_explicit_bits() + 3>(q, w);
  return compute_error_scaled<binary>(q, product.high, lz);
 }

-// Computers w * 10 ** q.
-// The returned value should be a valid number that simply needs to be
-// packed. However, in some very rare cases, the computation will fail. In such
-// cases, we return an adjusted_mantissa with a negative power of 2: the caller
-// should recompute in such cases.
+// w * 10 ** q
+// The returned value should be a valid ieee64 number that simply need to be packed.
+// However, in some very rare cases, the computation will fail. In such cases, we
+// return an adjusted_mantissa with a negative power of 2: the caller should recompute
+// in such cases.
 template <typename binary>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-compute_float(int64_t q, uint64_t w) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa compute_float(int64_t q, uint64_t w)  noexcept  {
  adjusted_mantissa answer;
  if ((w == 0) || (q < binary::smallest_power_of_ten())) {
    answer.power2 = 0;
@@ -114,8 +105,7 @@ compute_float(int64_t q, uint64_t w) noexcept {
    answer.mantissa = 0;
    return answer;
  }
-  // At this point in time q is in [powers::smallest_power_of_five,
-  // powers::largest_power_of_five].
+  // At this point in time q is in [powers::smallest_power_of_five, powers::largest_power_of_five].

  // We want the most significant bit of i to be 1. Shift if needed.
  int lz = leading_zeroes(w);
@@ -124,32 +114,26 @@ compute_float(int64_t q, uint64_t w) noexcept {
  // The required precision is binary::mantissa_explicit_bits() + 3 because
  // 1. We need the implicit bit
  // 2. We need an extra bit for rounding purposes
-  // 3. We might lose a bit due to the "upperbit" routine (result too small,
-  // requiring a shift)
+  // 3. We might lose a bit due to the "upperbit" routine (result too small, requiring a shift)

-  value128 product =
-      compute_product_approximation<binary::mantissa_explicit_bits() + 3>(q, w);
+  value128 product = compute_product_approximation<binary::mantissa_explicit_bits() + 3>(q, w);
  // The computed 'product' is always sufficient.
  // Mathematical proof:
-  // Noble Mushtak and Daniel Lemire, Fast Number Parsing Without Fallback (to
-  // appear) See script/mushtak_lemire.py
+  // Noble Mushtak and Daniel Lemire, Fast Number Parsing Without Fallback (to appear)
+  // See script/mushtak_lemire.py

-  // The "compute_product_approximation" function can be slightly slower than a
-  // branchless approach: value128 product = compute_product(q, w); but in
-  // practice, we can win big with the compute_product_approximation if its
-  // additional branch is easily predicted. Which is best is data specific.
+  // The "compute_product_approximation" function can be slightly slower than a branchless approach:
+  // value128 product = compute_product(q, w);
+  // but in practice, we can win big with the compute_product_approximation if its additional branch
+  // is easily predicted. Which is best is data specific.
  int upperbit = int(product.high >> 63);
-  int shift = upperbit + 64 - binary::mantissa_explicit_bits() - 3;

-  answer.mantissa = product.high >> shift;
+  answer.mantissa = product.high >> (upperbit + 64 - binary::mantissa_explicit_bits() - 3);

-  answer.power2 = int32_t(detail::power(int32_t(q)) + upperbit - lz -
-                          binary::minimum_exponent());
+  answer.power2 = int32_t(detail::power(int32_t(q)) + upperbit - lz - binary::minimum_exponent());
  if (answer.power2 <= 0) { // we have a subnormal?
    // Here have that answer.power2 <= 0 so -answer.power2 >= 0
-    if (-answer.power2 + 1 >=
-        64) { // if we have more than 64 bits below the minimum exponent, you
-              // have a zero for sure.
+    if(-answer.power2 + 1 >= 64) { // if we have more than 64 bits below the minimum exponent, you have a zero for sure.
      answer.power2 = 0;
      answer.mantissa = 0;
      // result should be zero
@@ -158,8 +142,7 @@ compute_float(int64_t q, uint64_t w) noexcept {
    // next line is safe because -answer.power2 + 1 < 64
    answer.mantissa >>= -answer.power2 + 1;
    // Thankfully, we can't have both "round-to-even" and subnormals because
-    // "round-to-even" only occurs for powers close to 0 in the 32-bit and
-    // and 64-bit case (with no more than 19 digits).
+    // "round-to-even" only occurs for powers close to 0.
    answer.mantissa += (answer.mantissa & 1); // round up
    answer.mantissa >>= 1;
    // There is a weird scenario where we don't have a subnormal but just.
@@ -169,26 +152,20 @@ compute_float(int64_t q, uint64_t w) noexcept {
    // up 0x3fffffffffffff x 2^-1023-53  and once we do, we are no longer
    // subnormal, but we can only know this after rounding.
    // So we only declare a subnormal if we are smaller than the threshold.
-    answer.power2 =
-        (answer.mantissa < (uint64_t(1) << binary::mantissa_explicit_bits()))
-            ? 0
-            : 1;
+    answer.power2 = (answer.mantissa < (uint64_t(1) << binary::mantissa_explicit_bits())) ? 0 : 1;
    return answer;
  }

  // usually, we round *up*, but if we fall right in between and and we have an
  // even basis, we need to round down
  // We are only concerned with the cases where 5**q fits in single 64-bit word.
-  if ((product.low <= 1) && (q >= binary::min_exponent_round_to_even()) &&
-      (q <= binary::max_exponent_round_to_even()) &&
-      ((answer.mantissa & 3) == 1)) { // we may fall between two floats!
+  if ((product.low <= 1) &&  (q >= binary::min_exponent_round_to_even()) && (q <= binary::max_exponent_round_to_even()) &&
+      ((answer.mantissa & 3) == 1) ) { // we may fall between two floats!
    // To be in-between two floats we need that in doing
-    //   answer.mantissa = product.high >> (upperbit + 64 -
-    //   binary::mantissa_explicit_bits() - 3);
-    // ... we dropped out only zeroes. But if this happened, then we can go
-    // back!!!
-    if ((answer.mantissa << shift) == product.high) {
-      answer.mantissa &= ~uint64_t(1); // flip it so that we do not round up
+    //   answer.mantissa = product.high >> (upperbit + 64 - binary::mantissa_explicit_bits() - 3);
+    // ... we dropped out only zeroes. But if this happened, then we can go back!!!
+    if((answer.mantissa  << (upperbit + 64 - binary::mantissa_explicit_bits() - 3)) ==  product.high) {
+      answer.mantissa &= ~uint64_t(1);          // flip it so that we do not round up
    }
  }

--- a/3rdparty/fast_float/include/fast_float/digit_comparison.h
+++ b/3rdparty/fast_float/include/fast_float/digit_comparison.h
@@ -13,34 +13,19 @@
 namespace fast_float {

 // 1e0 to 1e19
-constexpr static uint64_t powers_of_ten_uint64[] = {1UL,
-                                                    10UL,
-                                                    100UL,
-                                                    1000UL,
-                                                    10000UL,
-                                                    100000UL,
-                                                    1000000UL,
-                                                    10000000UL,
-                                                    100000000UL,
-                                                    1000000000UL,
-                                                    10000000000UL,
-                                                    100000000000UL,
-                                                    1000000000000UL,
-                                                    10000000000000UL,
-                                                    100000000000000UL,
-                                                    1000000000000000UL,
-                                                    10000000000000000UL,
-                                                    100000000000000000UL,
-                                                    1000000000000000000UL,
-                                                    10000000000000000000UL};
+constexpr static uint64_t powers_of_ten_uint64[] = {
+    1UL, 10UL, 100UL, 1000UL, 10000UL, 100000UL, 1000000UL, 10000000UL, 100000000UL,
+    1000000000UL, 10000000000UL, 100000000000UL, 1000000000000UL, 10000000000000UL,
+    100000000000000UL, 1000000000000000UL, 10000000000000000UL, 100000000000000000UL,
+    1000000000000000000UL, 10000000000000000000UL};

 // calculate the exponent, in scientific notation, of the number.
 // this algorithm is not even close to optimized, but it has no practical
 // effect on performance: in order to have a faster algorithm, we'd need
 // to slow down performance for faster algorithms, and this is still fast.
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 int32_t
-scientific_exponent(parsed_number_string_t<UC> &num) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+int32_t scientific_exponent(parsed_number_string_t<UC> & num) noexcept {
  uint64_t mantissa = num.mantissa;
  int32_t exponent = int32_t(num.exponent);
  while (mantissa >= 10000) {
@@ -60,16 +45,15 @@ scientific_exponent(parsed_number_string_t<UC> &num) noexcept {

 // this converts a native floating-point number to an extended-precision float.
 template <typename T>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-to_extended(T value) noexcept {
-  using equiv_uint = equiv_uint_t<T>;
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa to_extended(T value) noexcept {
+  using equiv_uint = typename binary_format<T>::equiv_uint;
  constexpr equiv_uint exponent_mask = binary_format<T>::exponent_mask();
  constexpr equiv_uint mantissa_mask = binary_format<T>::mantissa_mask();
  constexpr equiv_uint hidden_bit_mask = binary_format<T>::hidden_bit_mask();

  adjusted_mantissa am;
-  int32_t bias = binary_format<T>::mantissa_explicit_bits() -
-                 binary_format<T>::minimum_exponent();
+  int32_t bias = binary_format<T>::mantissa_explicit_bits() - binary_format<T>::minimum_exponent();
  equiv_uint bits;
 #if FASTFLOAT_HAS_BIT_CAST
  bits = std::bit_cast<equiv_uint>(value);
@@ -82,8 +66,7 @@ to_extended(T value) noexcept {
    am.mantissa = bits & mantissa_mask;
  } else {
    // normal
-    am.power2 = int32_t((bits & exponent_mask) >>
-                        binary_format<T>::mantissa_explicit_bits());
+    am.power2 = int32_t((bits & exponent_mask) >> binary_format<T>::mantissa_explicit_bits());
    am.power2 -= bias;
    am.mantissa = (bits & mantissa_mask) | hidden_bit_mask;
  }
@@ -95,8 +78,8 @@ to_extended(T value) noexcept {
 // we are given a native float that represents b, so we need to adjust it
 // halfway between b and b+u.
 template <typename T>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-to_extended_halfway(T value) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa to_extended_halfway(T value) noexcept {
  adjusted_mantissa am = to_extended(value);
  am.mantissa <<= 1;
  am.mantissa += 1;
@@ -106,18 +89,15 @@ to_extended_halfway(T value) noexcept {

 // round an extended-precision float to the nearest machine float.
 template <typename T, typename callback>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void round(adjusted_mantissa &am,
-                                                         callback cb) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+void round(adjusted_mantissa& am, callback cb) noexcept {
  int32_t mantissa_shift = 64 - binary_format<T>::mantissa_explicit_bits() - 1;
  if (-am.power2 >= mantissa_shift) {
    // have a denormal float
    int32_t shift = -am.power2 + 1;
    cb(am, std::min<int32_t>(shift, 64));
    // check for round-up: if rounding-nearest carried us to the hidden bit.
-    am.power2 = (am.mantissa <
-                 (uint64_t(1) << binary_format<T>::mantissa_explicit_bits()))
-                    ? 0
-                    : 1;
+    am.power2 = (am.mantissa < (uint64_t(1) << binary_format<T>::mantissa_explicit_bits())) ? 0 : 1;
    return;
  }

@@ -125,8 +105,7 @@ fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void round(adjusted_mantissa &am,
  cb(am, mantissa_shift);

  // check for carry
-  if (am.mantissa >=
-      (uint64_t(2) << binary_format<T>::mantissa_explicit_bits())) {
+  if (am.mantissa >= (uint64_t(2) << binary_format<T>::mantissa_explicit_bits())) {
    am.mantissa = (uint64_t(1) << binary_format<T>::mantissa_explicit_bits());
    am.power2++;
  }
@@ -140,11 +119,16 @@ fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void round(adjusted_mantissa &am,
 }

 template <typename callback>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void
-round_nearest_tie_even(adjusted_mantissa &am, int32_t shift,
-                       callback cb) noexcept {
-  uint64_t const mask = (shift == 64) ? UINT64_MAX : (uint64_t(1) << shift) - 1;
-  uint64_t const halfway = (shift == 0) ? 0 : uint64_t(1) << (shift - 1);
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+void round_nearest_tie_even(adjusted_mantissa& am, int32_t shift, callback cb) noexcept {
+  const uint64_t mask
+  = (shift == 64)
+    ? UINT64_MAX
+    : (uint64_t(1) << shift) - 1;
+  const uint64_t halfway
+  = (shift == 0)
+    ? 0
+    : uint64_t(1) << (shift - 1);
  uint64_t truncated_bits = am.mantissa & mask;
  bool is_above = truncated_bits > halfway;
  bool is_halfway = truncated_bits == halfway;
@@ -161,8 +145,8 @@ round_nearest_tie_even(adjusted_mantissa &am, int32_t shift,
  am.mantissa += uint64_t(cb(is_odd, is_halfway, is_above));
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void
-round_down(adjusted_mantissa &am, int32_t shift) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+void round_down(adjusted_mantissa& am, int32_t shift) noexcept {
  if (shift == 64) {
    am.mantissa = 0;
  } else {
@@ -170,13 +154,11 @@ round_down(adjusted_mantissa &am, int32_t shift) noexcept {
  }
  am.power2 += shift;
 }
-
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-skip_zeros(UC const *&first, UC const *last) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void skip_zeros(UC const * & first, UC const * last) noexcept {
  uint64_t val;
-  while (!cpp20_and_in_constexpr() &&
-         std::distance(first, last) >= int_cmp_len<UC>()) {
+  while (!cpp20_and_in_constexpr() && std::distance(first, last) >= int_cmp_len<UC>()) {
    ::memcpy(&val, first, sizeof(uint64_t));
    if (val != int_cmp_zeros<UC>()) {
      break;
@@ -194,12 +176,11 @@ skip_zeros(UC const *&first, UC const *last) noexcept {
 // determine if any non-zero digits were truncated.
 // all characters must be valid digits.
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-is_truncated(UC const *first, UC const *last) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+bool is_truncated(UC const * first, UC const * last) noexcept {
  // do 8-bit optimizations, can just compare to 8 literal 0s.
  uint64_t val;
-  while (!cpp20_and_in_constexpr() &&
-         std::distance(first, last) >= int_cmp_len<UC>()) {
+  while (!cpp20_and_in_constexpr() && std::distance(first, last) >= int_cmp_len<UC>()) {
    ::memcpy(&val, first, sizeof(uint64_t));
    if (val != int_cmp_zeros<UC>()) {
      return true;
@@ -214,17 +195,16 @@ is_truncated(UC const *first, UC const *last) noexcept {
  }
  return false;
 }
-
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-is_truncated(span<UC const> s) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+bool is_truncated(span<const UC> s) noexcept {
  return is_truncated(s.ptr, s.ptr + s.len());
 }

+
 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-parse_eight_digits(UC const *&p, limb &value, size_t &counter,
-                   size_t &count) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void parse_eight_digits(const UC*& p, limb& value, size_t& counter, size_t& count) noexcept {
  value = value * 100000000 + parse_eight_digits_unrolled(p);
  p += 8;
  counter += 8;
@@ -232,23 +212,22 @@ parse_eight_digits(UC const *&p, limb &value, size_t &counter,
 }

 template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void
-parse_one_digit(UC const *&p, limb &value, size_t &counter,
-                size_t &count) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR14
+void parse_one_digit(UC const *& p, limb& value, size_t& counter, size_t& count) noexcept {
  value = value * 10 + limb(*p - UC('0'));
  p++;
  counter++;
  count++;
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-add_native(bigint &big, limb power, limb value) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void add_native(bigint& big, limb power, limb value) noexcept {
  big.mul(power);
  big.add(value);
 }

-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 void
-round_up_bigint(bigint &big, size_t &count) noexcept {
+fastfloat_really_inline FASTFLOAT_CONSTEXPR20
+void round_up_bigint(bigint& big, size_t& count) noexcept {
  // need to round-up the digits, but need to avoid rounding
  // ....9999 to ...10000, which could cause a false halfway point.
  add_native(big, 10, 1);
@@ -257,9 +236,8 @@ round_up_bigint(bigint &big, size_t &count) noexcept {

 // parse the significant digits into a big integer
 template <typename UC>
-inline FASTFLOAT_CONSTEXPR20 void
-parse_mantissa(bigint &result, parsed_number_string_t<UC> &num,
-               size_t max_digits, size_t &digits) noexcept {
+inline FASTFLOAT_CONSTEXPR20
+void parse_mantissa(bigint& result, parsed_number_string_t<UC>& num, size_t max_digits, size_t& digits) noexcept {
  // try to minimize the number of big integer and scalar multiplication.
  // therefore, try to parse 8 digits at a time, and multiply by the largest
  // scalar value (9 or 19 digits) for each step.
@@ -273,13 +251,12 @@ parse_mantissa(bigint &result, parsed_number_string_t<UC> &num,
 #endif

  // process all integer digits.
-  UC const *p = num.integer.ptr;
-  UC const *pend = p + num.integer.len();
+  UC const * p = num.integer.ptr;
+  UC const * pend = p + num.integer.len();
  skip_zeros(p, pend);
  // process all digits, in increments of step per loop
  while (p != pend) {
-    while ((std::distance(p, pend) >= 8) && (step - counter >= 8) &&
-           (max_digits - digits >= 8)) {
+    while ((std::distance(p, pend) >= 8) && (step - counter >= 8) && (max_digits - digits >= 8)) {
      parse_eight_digits(p, value, counter, digits);
    }
    while (counter < step && p != pend && digits < max_digits) {
@@ -312,8 +289,7 @@ parse_mantissa(bigint &result, parsed_number_string_t<UC> &num,
    }
    // process all digits, in increments of step per loop
    while (p != pend) {
-      while ((std::distance(p, pend) >= 8) && (step - counter >= 8) &&
-             (max_digits - digits >= 8)) {
+      while ((std::distance(p, pend) >= 8) && (step - counter >= 8) && (max_digits - digits >= 8)) {
        parse_eight_digits(p, value, counter, digits);
      }
      while (counter < step && p != pend && digits < max_digits) {
@@ -341,23 +317,19 @@ parse_mantissa(bigint &result, parsed_number_string_t<UC> &num,
 }

 template <typename T>
-inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-positive_digit_comp(bigint &bigmant, int32_t exponent) noexcept {
+inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa positive_digit_comp(bigint& bigmant, int32_t exponent) noexcept {
  FASTFLOAT_ASSERT(bigmant.pow10(uint32_t(exponent)));
  adjusted_mantissa answer;
  bool truncated;
  answer.mantissa = bigmant.hi64(truncated);
-  int bias = binary_format<T>::mantissa_explicit_bits() -
-             binary_format<T>::minimum_exponent();
+  int bias = binary_format<T>::mantissa_explicit_bits() - binary_format<T>::minimum_exponent();
  answer.power2 = bigmant.bit_length() - 64 + bias;

-  round<T>(answer, [truncated](adjusted_mantissa &a, int32_t shift) {
-    round_nearest_tie_even(
-        a, shift,
-        [truncated](bool is_odd, bool is_halfway, bool is_above) -> bool {
-          return is_above || (is_halfway && truncated) ||
-                 (is_odd && is_halfway);
-        });
+  round<T>(answer, [truncated](adjusted_mantissa& a, int32_t shift) {
+    round_nearest_tie_even(a, shift, [truncated](bool is_odd, bool is_halfway, bool is_above) -> bool {
+      return is_above || (is_halfway && truncated) || (is_odd && is_halfway);
+    });
  });

  return answer;
@@ -369,17 +341,15 @@ positive_digit_comp(bigint &bigmant, int32_t exponent) noexcept {
 // we then need to scale by `2^(f- e)`, and then the two significant digits
 // are of the same magnitude.
 template <typename T>
-inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa negative_digit_comp(
-    bigint &bigmant, adjusted_mantissa am, int32_t exponent) noexcept {
-  bigint &real_digits = bigmant;
+inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa negative_digit_comp(bigint& bigmant, adjusted_mantissa am, int32_t exponent) noexcept {
+  bigint& real_digits = bigmant;
  int32_t real_exp = exponent;

  // get the value of `b`, rounded down, and get a bigint representation of b+h
  adjusted_mantissa am_b = am;
-  // gcc7 buf: use a lambda to remove the noexcept qualifier bug with
-  // -Wnoexcept-type.
-  round<T>(am_b,
-           [](adjusted_mantissa &a, int32_t shift) { round_down(a, shift); });
+  // gcc7 buf: use a lambda to remove the noexcept qualifier bug with -Wnoexcept-type.
+  round<T>(am_b, [](adjusted_mantissa&a, int32_t shift) { round_down(a, shift); });
  T b;
  to_float(false, am_b, b);
  adjusted_mantissa theor = to_extended_halfway(b);
@@ -401,19 +371,18 @@ inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa negative_digit_comp(
  // compare digits, and use it to director rounding
  int ord = real_digits.compare(theor_digits);
  adjusted_mantissa answer = am;
-  round<T>(answer, [ord](adjusted_mantissa &a, int32_t shift) {
-    round_nearest_tie_even(
-        a, shift, [ord](bool is_odd, bool _, bool __) -> bool {
-          (void)_;  // not needed, since we've done our comparison
-          (void)__; // not needed, since we've done our comparison
-          if (ord > 0) {
-            return true;
-          } else if (ord < 0) {
-            return false;
-          } else {
-            return is_odd;
-          }
-        });
+  round<T>(answer, [ord](adjusted_mantissa& a, int32_t shift) {
+    round_nearest_tie_even(a, shift, [ord](bool is_odd, bool _, bool __) -> bool {
+      (void)_;  // not needed, since we've done our comparison
+      (void)__; // not needed, since we've done our comparison
+      if (ord > 0) {
+        return true;
+      } else if (ord < 0) {
+        return false;
+      } else {
+        return is_odd;
+      }
+    });
  });

  return answer;
@@ -433,8 +402,8 @@ inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa negative_digit_comp(
 // the actual digits. we then compare the big integer representations
 // of both, and use that to direct rounding.
 template <typename T, typename UC>
-inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa
-digit_comp(parsed_number_string_t<UC> &num, adjusted_mantissa am) noexcept {
+inline FASTFLOAT_CONSTEXPR20
+adjusted_mantissa digit_comp(parsed_number_string_t<UC>& num, adjusted_mantissa am) noexcept {
  // remove the invalid exponent bias
  am.power2 -= invalid_am_bias;

--- a/3rdparty/fast_float/include/fast_float/fast_float.h
+++ b/3rdparty/fast_float/include/fast_float/fast_float.h
@@ -6,72 +6,43 @@

 namespace fast_float {
 /**
- * This function parses the character sequence [first,last) for a number. It
- * parses floating-point numbers expecting a locale-indepent format equivalent
- * to what is used by std::strtod in the default ("C") locale. The resulting
- * floating-point value is the closest floating-point values (using either float
- * or double), using the "round to even" convention for values that would
- * otherwise fall right in-between two values. That is, we provide exact parsing
- * according to the IEEE standard.
+ * This function parses the character sequence [first,last) for a number. It parses floating-point numbers expecting
+ * a locale-indepent format equivalent to what is used by std::strtod in the default ("C") locale.
+ * The resulting floating-point value is the closest floating-point values (using either float or double),
+ * using the "round to even" convention for values that would otherwise fall right in-between two values.
+ * That is, we provide exact parsing according to the IEEE standard.
 *
- * Given a successful parse, the pointer (`ptr`) in the returned value is set to
- * point right after the parsed number, and the `value` referenced is set to the
- * parsed value. In case of error, the returned `ec` contains a representative
- * error, otherwise the default (`std::errc()`) value is stored.
+ * Given a successful parse, the pointer (`ptr`) in the returned value is set to point right after the
+ * parsed number, and the `value` referenced is set to the parsed value. In case of error, the returned
+ * `ec` contains a representative error, otherwise the default (`std::errc()`) value is stored.
 *
- * The implementation does not throw and does not allocate memory (e.g., with
- * `new` or `malloc`).
+ * The implementation does not throw and does not allocate memory (e.g., with `new` or `malloc`).
 *
- * Like the C++17 standard, the `fast_float::from_chars` functions take an
- * optional last argument of the type `fast_float::chars_format`. It is a bitset
- * value: we check whether `fmt & fast_float::chars_format::fixed` and `fmt &
- * fast_float::chars_format::scientific` are set to determine whether we allow
- * the fixed point and scientific notation respectively. The default is
- * `fast_float::chars_format::general` which allows both `fixed` and
- * `scientific`.
+ * Like the C++17 standard, the `fast_float::from_chars` functions take an optional last argument of
+ * the type `fast_float::chars_format`. It is a bitset value: we check whether
+ * `fmt & fast_float::chars_format::fixed` and `fmt & fast_float::chars_format::scientific` are set
+ * to determine whether we allow the fixed point and scientific notation respectively.
+ * The default is  `fast_float::chars_format::general` which allows both `fixed` and `scientific`.
 */
-template <typename T, typename UC = char,
-          typename = FASTFLOAT_ENABLE_IF(is_supported_float_type<T>::value)>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars(UC const *first, UC const *last, T &value,
-           chars_format fmt = chars_format::general) noexcept;
+template<typename T, typename UC = char, typename = FASTFLOAT_ENABLE_IF(is_supported_float_type<T>())>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars(UC const * first, UC const * last,
+                             T &value, chars_format fmt = chars_format::general)  noexcept;

 /**
 * Like from_chars, but accepts an `options` argument to govern number parsing.
- * Both for floating-point types and integer types.
 */
-template <typename T, typename UC = char>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars_advanced(UC const *first, UC const *last, T &value,
-                    parse_options_t<UC> options) noexcept;
-
+template<typename T, typename UC = char>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars_advanced(UC const * first, UC const * last,
+                                      T &value, parse_options_t<UC> options)  noexcept;
 /**
- * This function multiplies an integer number by a power of 10 and returns
- * the result as a double precision floating-point value that is correctly
- * rounded. The resulting floating-point value is the closest floating-point
- * value, using the "round to nearest, tie to even" convention for values that
- * would otherwise fall right in-between two values. That is, we provide exact
- * conversion according to the IEEE standard.
- *
- * On overflow infinity is returned, on underflow 0 is returned.
- *
- * The implementation does not throw and does not allocate memory (e.g., with
- * `new` or `malloc`).
- */
-FASTFLOAT_CONSTEXPR20 inline double
-integer_times_pow10(uint64_t mantissa, int decimal_exponent) noexcept;
-FASTFLOAT_CONSTEXPR20 inline double
-integer_times_pow10(int64_t mantissa, int decimal_exponent) noexcept;
-
-/**
- * from_chars for integer types.
- */
-template <typename T, typename UC = char,
-          typename = FASTFLOAT_ENABLE_IF(is_supported_integer_type<T>::value)>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars(UC const *first, UC const *last, T &value, int base = 10) noexcept;
+* from_chars for integer types.
+*/
+template <typename T, typename UC = char, typename = FASTFLOAT_ENABLE_IF(!is_supported_float_type<T>())>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars(UC const * first, UC const * last, T& value, int base = 10) noexcept;

 } // namespace fast_float
-
 #include "parse_number.h"
 #endif // FASTFLOAT_FAST_FLOAT_H
--- a/3rdparty/fast_float/include/fast_float/fast_table.h
+++ b/3rdparty/fast_float/include/fast_float/fast_table.h
--- a/3rdparty/fast_float/include/fast_float/float_common.h
+++ b/3rdparty/fast_float/include/fast_float/float_common.h
--- a/3rdparty/fast_float/include/fast_float/parse_number.h
+++ b/3rdparty/fast_float/include/fast_float/parse_number.h
@@ -10,9 +10,9 @@
 #include <cstring>
 #include <limits>
 #include <system_error>
-
 namespace fast_float {

+
 namespace detail {
 /**
 * Special case +inf, -inf, nan, infinity, -infinity.
@@ -20,49 +20,45 @@ namespace detail {
 * strings a null-free and fixed.
 **/
 template <typename T, typename UC>
-from_chars_result_t<UC>
-    FASTFLOAT_CONSTEXPR14 parse_infnan(UC const *first, UC const *last,
-                                       T &value, chars_format fmt) noexcept {
+from_chars_result_t<UC> FASTFLOAT_CONSTEXPR14
+parse_infnan(UC const * first, UC const * last, T &value)  noexcept  {
  from_chars_result_t<UC> answer{};
  answer.ptr = first;
  answer.ec = std::errc(); // be optimistic
-  // assume first < last, so dereference without checks;
-  bool const minusSign = (*first == UC('-'));
-  // C++17 20.19.3.(7.1) explicitly forbids '+' sign here
-  if ((*first == UC('-')) ||
-      (uint64_t(fmt & chars_format::allow_leading_plus) &&
-       (*first == UC('+')))) {
-    ++first;
+  bool minusSign = false;
+  if (*first == UC('-')) { // assume first < last, so dereference without checks; C++17 20.19.3.(7.1) explicitly forbids '+' here
+      minusSign = true;
+      ++first;
  }
+#ifdef FASTFLOAT_ALLOWS_LEADING_PLUS // disabled by default
+  if (*first == UC('+')) {
+      ++first;
+  }
+#endif
  if (last - first >= 3) {
    if (fastfloat_strncasecmp(first, str_const_nan<UC>(), 3)) {
      answer.ptr = (first += 3);
-      value = minusSign ? -std::numeric_limits<T>::quiet_NaN()
-                        : std::numeric_limits<T>::quiet_NaN();
-      // Check for possible nan(n-char-seq-opt), C++17 20.19.3.7,
-      // C11 7.20.1.3.3. At least MSVC produces nan(ind) and nan(snan).
-      if (first != last && *first == UC('(')) {
-        for (UC const *ptr = first + 1; ptr != last; ++ptr) {
+      value = minusSign ? -std::numeric_limits<T>::quiet_NaN() : std::numeric_limits<T>::quiet_NaN();
+      // Check for possible nan(n-char-seq-opt), C++17 20.19.3.7, C11 7.20.1.3.3. At least MSVC produces nan(ind) and nan(snan).
+      if(first != last && *first == UC('(')) {
+        for(UC const * ptr = first + 1; ptr != last; ++ptr) {
          if (*ptr == UC(')')) {
            answer.ptr = ptr + 1; // valid nan(n-char-seq-opt)
            break;
-          } else if (!((UC('a') <= *ptr && *ptr <= UC('z')) ||
-                       (UC('A') <= *ptr && *ptr <= UC('Z')) ||
-                       (UC('0') <= *ptr && *ptr <= UC('9')) || *ptr == UC('_')))
+          }
+          else if(!((UC('a') <= *ptr && *ptr <= UC('z')) || (UC('A') <= *ptr && *ptr <= UC('Z')) || (UC('0') <= *ptr && *ptr <= UC('9')) || *ptr == UC('_')))
            break; // forbidden char, not nan(n-char-seq-opt)
        }
      }
      return answer;
    }
    if (fastfloat_strncasecmp(first, str_const_inf<UC>(), 3)) {
-      if ((last - first >= 8) &&
-          fastfloat_strncasecmp(first + 3, str_const_inf<UC>() + 3, 5)) {
+      if ((last - first >= 8) && fastfloat_strncasecmp(first + 3, str_const_inf<UC>() + 3, 5)) {
        answer.ptr = first + 8;
      } else {
        answer.ptr = first + 3;
      }
-      value = minusSign ? -std::numeric_limits<T>::infinity()
-                        : std::numeric_limits<T>::infinity();
+      value = minusSign ? -std::numeric_limits<T>::infinity() : std::numeric_limits<T>::infinity();
      return answer;
    }
  }
@@ -90,71 +86,73 @@ fastfloat_really_inline bool rounds_to_nearest() noexcept {
  // However, it is expected to be much faster than the fegetround()
  // function call.
  //
-  // The volatile keyword prevents the compiler from computing the function
+  // The volatile keywoard prevents the compiler from computing the function
  // at compile-time.
-  // There might be other ways to prevent compile-time optimizations (e.g.,
-  // asm). The value does not need to be std::numeric_limits<float>::min(), any
-  // small value so that 1 + x should round to 1 would do (after accounting for
-  // excess precision, as in 387 instructions).
-  static float volatile fmin = std::numeric_limits<float>::min();
+  // There might be other ways to prevent compile-time optimizations (e.g., asm).
+  // The value does not need to be std::numeric_limits<float>::min(), any small
+  // value so that 1 + x should round to 1 would do (after accounting for excess
+  // precision, as in 387 instructions).
+  static volatile float fmin = std::numeric_limits<float>::min();
  float fmini = fmin; // we copy it so that it gets loaded at most once.
-//
-// Explanation:
-// Only when fegetround() == FE_TONEAREST do we have that
-// fmin + 1.0f == 1.0f - fmin.
-//
-// FE_UPWARD:
-//  fmin + 1.0f > 1
-//  1.0f - fmin == 1
-//
-// FE_DOWNWARD or  FE_TOWARDZERO:
-//  fmin + 1.0f == 1
-//  1.0f - fmin < 1
-//
-// Note: This may fail to be accurate if fast-math has been
-// enabled, as rounding conventions may not apply.
-#ifdef FASTFLOAT_VISUAL_STUDIO
-#pragma warning(push)
-//  todo: is there a VS warning?
-//  see
-//  https://stackoverflow.com/questions/46079446/is-there-a-warning-for-floating-point-equality-checking-in-visual-studio-2013
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wfloat-equal"
-#elif defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
+  //
+  // Explanation:
+  // Only when fegetround() == FE_TONEAREST do we have that
+  // fmin + 1.0f == 1.0f - fmin.
+  //
+  // FE_UPWARD:
+  //  fmin + 1.0f > 1
+  //  1.0f - fmin == 1
+  //
+  // FE_DOWNWARD or  FE_TOWARDZERO:
+  //  fmin + 1.0f == 1
+  //  1.0f - fmin < 1
+  //
+  // Note: This may fail to be accurate if fast-math has been
+  // enabled, as rounding conventions may not apply.
+  #ifdef FASTFLOAT_VISUAL_STUDIO
+  #   pragma warning(push)
+  //  todo: is there a VS warning?
+  //  see https://stackoverflow.com/questions/46079446/is-there-a-warning-for-floating-point-equality-checking-in-visual-studio-2013
+  #elif defined(__clang__)
+  #   pragma clang diagnostic push
+  #   pragma clang diagnostic ignored "-Wfloat-equal"
+  #elif defined(__GNUC__)
+  #   pragma GCC diagnostic push
+  #   pragma GCC diagnostic ignored "-Wfloat-equal"
+  #endif
  return (fmini + 1.0f == 1.0f - fmini);
-#ifdef FASTFLOAT_VISUAL_STUDIO
-#pragma warning(pop)
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
+  #ifdef FASTFLOAT_VISUAL_STUDIO
+  #   pragma warning(pop)
+  #elif defined(__clang__)
+  #   pragma clang diagnostic pop
+  #elif defined(__GNUC__)
+  #   pragma GCC diagnostic pop
+  #endif
 }

 } // namespace detail

-template <typename T> struct from_chars_caller {
+template <typename T>
+struct from_chars_caller
+{
  template <typename UC>
-  FASTFLOAT_CONSTEXPR20 static from_chars_result_t<UC>
-  call(UC const *first, UC const *last, T &value,
-       parse_options_t<UC> options) noexcept {
+  FASTFLOAT_CONSTEXPR20
+  static from_chars_result_t<UC> call(UC const * first, UC const * last,
+                                      T &value, parse_options_t<UC> options)  noexcept {
    return from_chars_advanced(first, last, value, options);
  }
 };

-#ifdef __STDCPP_FLOAT32_T__
-template <> struct from_chars_caller<std::float32_t> {
+#if __STDCPP_FLOAT32_T__ == 1
+template <>
+struct from_chars_caller<std::float32_t>
+{
  template <typename UC>
-  FASTFLOAT_CONSTEXPR20 static from_chars_result_t<UC>
-  call(UC const *first, UC const *last, std::float32_t &value,
-       parse_options_t<UC> options) noexcept {
-    // if std::float32_t is defined, and we are in C++23 mode; macro set for
-    // float32; set value to float due to equivalence between float and
-    // float32_t
+  FASTFLOAT_CONSTEXPR20
+  static from_chars_result_t<UC> call(UC const * first, UC const * last,
+                                      std::float32_t &value, parse_options_t<UC> options) noexcept{
+    // if std::float32_t is defined, and we are in C++23 mode; macro set for float32; 
+    // set value to float due to equivalence between float and float32_t
    float val;
    auto ret = from_chars_advanced(first, last, val, options);
    value = val;
@@ -163,15 +161,16 @@ template <> struct from_chars_caller<std::float32_t> {
 };
 #endif

-#ifdef __STDCPP_FLOAT64_T__
-template <> struct from_chars_caller<std::float64_t> {
+#if __STDCPP_FLOAT64_T__ == 1
+template <>
+struct from_chars_caller<std::float64_t>
+{
  template <typename UC>
-  FASTFLOAT_CONSTEXPR20 static from_chars_result_t<UC>
-  call(UC const *first, UC const *last, std::float64_t &value,
-       parse_options_t<UC> options) noexcept {
-    // if std::float64_t is defined, and we are in C++23 mode; macro set for
-    // float64; set value as double due to equivalence between double and
-    // float64_t
+  FASTFLOAT_CONSTEXPR20
+  static from_chars_result_t<UC> call(UC const * first, UC const * last,
+                                      std::float64_t &value, parse_options_t<UC> options) noexcept{
+    // if std::float64_t is defined, and we are in C++23 mode; macro set for float64;
+    // set value as double due to equivalence between double and float64_t
    double val;
    auto ret = from_chars_advanced(first, last, val, options);
    value = val;
@@ -180,25 +179,52 @@ template <> struct from_chars_caller<std::float64_t> {
 };
 #endif

-template <typename T, typename UC, typename>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars(UC const *first, UC const *last, T &value,
-           chars_format fmt /*= chars_format::general*/) noexcept {
-  return from_chars_caller<T>::call(first, last, value,
-                                    parse_options_t<UC>(fmt));
+
+template<typename T, typename UC, typename>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars(UC const * first, UC const * last,
+                             T &value, chars_format fmt /*= chars_format::general*/)  noexcept  {
+  return from_chars_caller<T>::call(first, last, value, parse_options_t<UC>(fmt));
 }

-template <typename T>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 bool
-clinger_fast_path_impl(uint64_t mantissa, int64_t exponent, bool is_negative,
-                       T &value) noexcept {
+template<typename T, typename UC>
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars_advanced(UC const * first, UC const * last,
+                                      T &value, parse_options_t<UC> options)  noexcept  {
+
+  static_assert (is_supported_float_type<T>(), "only some floating-point types are supported");
+  static_assert (is_supported_char_type<UC>(), "only char, wchar_t, char16_t and char32_t are supported");
+
+  from_chars_result_t<UC> answer;
+#ifdef FASTFLOAT_SKIP_WHITE_SPACE  // disabled by default
+  while ((first != last) && fast_float::is_space(uint8_t(*first))) {
+    first++;
+  }
+#endif
+  if (first == last) {
+    answer.ec = std::errc::invalid_argument;
+    answer.ptr = first;
+    return answer;
+  }
+  parsed_number_string_t<UC> pns = parse_number_string<UC>(first, last, options);
+  if (!pns.valid) {
+    if (options.format & chars_format::no_infnan) {
+      answer.ec = std::errc::invalid_argument;
+      answer.ptr = first;
+      return answer;
+    } else {
+      return detail::parse_infnan(first, last, value);
+    }
+  }
+
+  answer.ec = std::errc(); // be optimistic
+  answer.ptr = pns.lastmatch;
  // The implementation of the Clinger's fast path is convoluted because
  // we want round-to-nearest in all cases, irrespective of the rounding mode
  // selected on the thread.
-  // We proceed optimistically, assuming that detail::rounds_to_nearest()
-  // returns true.
-  if (binary_format<T>::min_exponent_fast_path() <= exponent &&
-      exponent <= binary_format<T>::max_exponent_fast_path()) {
+  // We proceed optimistically, assuming that detail::rounds_to_nearest() returns
+  // true.
+  if (binary_format<T>::min_exponent_fast_path() <= pns.exponent && pns.exponent <= binary_format<T>::max_exponent_fast_path() && !pns.too_many_digits) {
    // Unfortunately, the conventional Clinger's fast path is only possible
    // when the system rounds to the nearest float.
    //
@@ -206,245 +232,68 @@ clinger_fast_path_impl(uint64_t mantissa, int64_t exponent, bool is_negative,
    // We could check it first (before the previous branch), but
    // there might be performance advantages at having the check
    // be last.
-    if (!cpp20_and_in_constexpr() && detail::rounds_to_nearest()) {
+    if(!cpp20_and_in_constexpr() && detail::rounds_to_nearest())  {
      // We have that fegetround() == FE_TONEAREST.
      // Next is Clinger's fast path.
-      if (mantissa <= binary_format<T>::max_mantissa_fast_path()) {
-        value = T(mantissa);
-        if (exponent < 0) {
-          value = value / binary_format<T>::exact_power_of_ten(-exponent);
-        } else {
-          value = value * binary_format<T>::exact_power_of_ten(exponent);
-        }
-        if (is_negative) {
-          value = -value;
-        }
-        return true;
+      if (pns.mantissa <=binary_format<T>::max_mantissa_fast_path()) {
+        value = T(pns.mantissa);
+        if (pns.exponent < 0) { value = value / binary_format<T>::exact_power_of_ten(-pns.exponent); }
+        else { value = value * binary_format<T>::exact_power_of_ten(pns.exponent); }
+        if (pns.negative) { value = -value; }
+        return answer;
      }
    } else {
      // We do not have that fegetround() == FE_TONEAREST.
-      // Next is a modified Clinger's fast path, inspired by Jakub Jelínek's
-      // proposal
-      if (exponent >= 0 &&
-          mantissa <= binary_format<T>::max_mantissa_fast_path(exponent)) {
+      // Next is a modified Clinger's fast path, inspired by Jakub Jelínek's proposal
+      if (pns.exponent >= 0 && pns.mantissa <=binary_format<T>::max_mantissa_fast_path(pns.exponent)) {
 #if defined(__clang__) || defined(FASTFLOAT_32BIT)
        // Clang may map 0 to -0.0 when fegetround() == FE_DOWNWARD
-        if (mantissa == 0) {
-          value = is_negative ? T(-0.) : T(0.);
-          return true;
+        if(pns.mantissa == 0) {
+          value = pns.negative ? T(-0.) : T(0.);
+          return answer;
        }
 #endif
-        value = T(mantissa) * binary_format<T>::exact_power_of_ten(exponent);
-        if (is_negative) {
-          value = -value;
-        }
-        return true;
+        value = T(pns.mantissa) * binary_format<T>::exact_power_of_ten(pns.exponent);
+        if (pns.negative) { value = -value; }
+        return answer;
      }
    }
  }
-  return false;
-}
-
-/**
- * This function overload takes parsed_number_string_t structure that is created
- * and populated either by from_chars_advanced function taking chars range and
- * parsing options or other parsing custom function implemented by user.
- */
-template <typename T, typename UC>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars_advanced(parsed_number_string_t<UC> &pns, T &value) noexcept {
-  static_assert(is_supported_float_type<T>::value,
-                "only some floating-point types are supported");
-  static_assert(is_supported_char_type<UC>::value,
-                "only char, wchar_t, char16_t and char32_t are supported");
-
-  from_chars_result_t<UC> answer;
-
-  answer.ec = std::errc(); // be optimistic
-  answer.ptr = pns.lastmatch;
-
-  if (!pns.too_many_digits &&
-      clinger_fast_path_impl(pns.mantissa, pns.exponent, pns.negative, value))
-    return answer;
-
-  adjusted_mantissa am =
-      compute_float<binary_format<T>>(pns.exponent, pns.mantissa);
-  if (pns.too_many_digits && am.power2 >= 0) {
-    if (am != compute_float<binary_format<T>>(pns.exponent, pns.mantissa + 1)) {
+  adjusted_mantissa am = compute_float<binary_format<T>>(pns.exponent, pns.mantissa);
+  if(pns.too_many_digits && am.power2 >= 0) {
+    if(am != compute_float<binary_format<T>>(pns.exponent, pns.mantissa + 1)) {
      am = compute_error<binary_format<T>>(pns.exponent, pns.mantissa);
    }
  }
-  // If we called compute_float<binary_format<T>>(pns.exponent, pns.mantissa)
-  // and we have an invalid power (am.power2 < 0), then we need to go the long
-  // way around again. This is very uncommon.
-  if (am.power2 < 0) {
-    am = digit_comp<T>(pns, am);
-  }
+  // If we called compute_float<binary_format<T>>(pns.exponent, pns.mantissa) and we have an invalid power (am.power2 < 0),
+  // then we need to go the long way around again. This is very uncommon.
+  if(am.power2 < 0) { am = digit_comp<T>(pns, am); }
  to_float(pns.negative, am, value);
  // Test for over/underflow.
-  if ((pns.mantissa != 0 && am.mantissa == 0 && am.power2 == 0) ||
-      am.power2 == binary_format<T>::infinite_power()) {
+  if ((pns.mantissa != 0 && am.mantissa == 0 && am.power2 == 0) || am.power2 == binary_format<T>::infinite_power()) {
    answer.ec = std::errc::result_out_of_range;
  }
  return answer;
 }

-template <typename T, typename UC>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars_float_advanced(UC const *first, UC const *last, T &value,
-                          parse_options_t<UC> options) noexcept {
-
-  static_assert(is_supported_float_type<T>::value,
-                "only some floating-point types are supported");
-  static_assert(is_supported_char_type<UC>::value,
-                "only char, wchar_t, char16_t and char32_t are supported");
-
-  chars_format const fmt = detail::adjust_for_feature_macros(options.format);
-
-  from_chars_result_t<UC> answer;
-  if (uint64_t(fmt & chars_format::skip_white_space)) {
-    while ((first != last) && fast_float::is_space(*first)) {
-      first++;
-    }
-  }
-  if (first == last) {
-    answer.ec = std::errc::invalid_argument;
-    answer.ptr = first;
-    return answer;
-  }
-  parsed_number_string_t<UC> pns =
-      uint64_t(fmt & detail::basic_json_fmt)
-          ? parse_number_string<true, UC>(first, last, options)
-          : parse_number_string<false, UC>(first, last, options);
-  if (!pns.valid) {
-    if (uint64_t(fmt & chars_format::no_infnan)) {
-      answer.ec = std::errc::invalid_argument;
-      answer.ptr = first;
-      return answer;
-    } else {
-      return detail::parse_infnan(first, last, value, fmt);
-    }
-  }
-
-  // call overload that takes parsed_number_string_t directly.
-  return from_chars_advanced(pns, value);
-}

 template <typename T, typename UC, typename>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars(UC const *first, UC const *last, T &value, int base) noexcept {
-
-  static_assert(is_supported_integer_type<T>::value,
-                "only integer types are supported");
-  static_assert(is_supported_char_type<UC>::value,
-                "only char, wchar_t, char16_t and char32_t are supported");
-
-  parse_options_t<UC> options;
-  options.base = base;
-  return from_chars_advanced(first, last, value, options);
-}
-
-FASTFLOAT_CONSTEXPR20 inline double
-integer_times_pow10(uint64_t mantissa, int decimal_exponent) noexcept {
-  double value;
-  if (clinger_fast_path_impl(mantissa, decimal_exponent, false, value))
-    return value;
-
-  adjusted_mantissa am =
-      compute_float<binary_format<double>>(decimal_exponent, mantissa);
-  to_float(false, am, value);
-  return value;
-}
-
-FASTFLOAT_CONSTEXPR20 inline double
-integer_times_pow10(int64_t mantissa, int decimal_exponent) noexcept {
-  const bool is_negative = mantissa < 0;
-  const uint64_t m = static_cast<uint64_t>(is_negative ? -mantissa : mantissa);
-
-  double value;
-  if (clinger_fast_path_impl(m, decimal_exponent, is_negative, value))
-    return value;
-
-  adjusted_mantissa am =
-      compute_float<binary_format<double>>(decimal_exponent, m);
-  to_float(is_negative, am, value);
-  return value;
-}
-
-// the following overloads are here to avoid surprising ambiguity for int,
-// unsigned, etc.
-template <typename Int>
-FASTFLOAT_CONSTEXPR20 inline typename std::enable_if<
-    std::is_integral<Int>::value && !std::is_signed<Int>::value, double>::type
-integer_times_pow10(Int mantissa, int decimal_exponent) noexcept {
-  return integer_times_pow10(static_cast<uint64_t>(mantissa), decimal_exponent);
-}
-
-template <typename Int>
-FASTFLOAT_CONSTEXPR20 inline typename std::enable_if<
-    std::is_integral<Int>::value && std::is_signed<Int>::value, double>::type
-integer_times_pow10(Int mantissa, int decimal_exponent) noexcept {
-  return integer_times_pow10(static_cast<int64_t>(mantissa), decimal_exponent);
-}
-
-template <typename T, typename UC>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars_int_advanced(UC const *first, UC const *last, T &value,
-                        parse_options_t<UC> options) noexcept {
-
-  static_assert(is_supported_integer_type<T>::value,
-                "only integer types are supported");
-  static_assert(is_supported_char_type<UC>::value,
-                "only char, wchar_t, char16_t and char32_t are supported");
-
-  chars_format const fmt = detail::adjust_for_feature_macros(options.format);
-  int const base = options.base;
+FASTFLOAT_CONSTEXPR20
+from_chars_result_t<UC> from_chars(UC const* first, UC const* last, T& value, int base) noexcept {
+  static_assert (is_supported_char_type<UC>(), "only char, wchar_t, char16_t and char32_t are supported");

  from_chars_result_t<UC> answer;
-  if (uint64_t(fmt & chars_format::skip_white_space)) {
-    while ((first != last) && fast_float::is_space(*first)) {
-      first++;
-    }
+#ifdef FASTFLOAT_SKIP_WHITE_SPACE  // disabled by default
+  while ((first != last) && fast_float::is_space(uint8_t(*first))) {
+    first++;
  }
+#endif
  if (first == last || base < 2 || base > 36) {
    answer.ec = std::errc::invalid_argument;
    answer.ptr = first;
    return answer;
  }
-
-  return parse_int_string(first, last, value, options);
-}
-
-template <size_t TypeIx> struct from_chars_advanced_caller {
-  static_assert(TypeIx > 0, "unsupported type");
-};
-
-template <> struct from_chars_advanced_caller<1> {
-  template <typename T, typename UC>
-  FASTFLOAT_CONSTEXPR20 static from_chars_result_t<UC>
-  call(UC const *first, UC const *last, T &value,
-       parse_options_t<UC> options) noexcept {
-    return from_chars_float_advanced(first, last, value, options);
-  }
-};
-
-template <> struct from_chars_advanced_caller<2> {
-  template <typename T, typename UC>
-  FASTFLOAT_CONSTEXPR20 static from_chars_result_t<UC>
-  call(UC const *first, UC const *last, T &value,
-       parse_options_t<UC> options) noexcept {
-    return from_chars_int_advanced(first, last, value, options);
-  }
-};
-
-template <typename T, typename UC>
-FASTFLOAT_CONSTEXPR20 from_chars_result_t<UC>
-from_chars_advanced(UC const *first, UC const *last, T &value,
-                    parse_options_t<UC> options) noexcept {
-  return from_chars_advanced_caller<
-      size_t(is_supported_float_type<T>::value) +
-      2 * size_t(is_supported_integer_type<T>::value)>::call(first, last, value,
-                                                             options);
+  return parse_int_string(first, last, value, base);
 }

 } // namespace fast_float
--- a/3rdparty/ffmpeg/COPYING.LGPLv2.1
+++ b/3rdparty/ffmpeg/COPYING.LGPLv2.1
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
  Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

@@ -158,7 +158,7 @@ Library.
  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

                     END OF TERMS AND CONDITIONS
-
+
           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
--- a/3rdparty/ffmpeg/Changelog
+++ b/3rdparty/ffmpeg/Changelog
--- a/3rdparty/ffmpeg/LICENSE.md
+++ b/3rdparty/ffmpeg/LICENSE.md
@@ -12,6 +12,7 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.

 Specifically, the GPL parts of FFmpeg are:

+- libpostproc
 - optional x86 optimization in the files
    - `libavcodec/x86/flac_dsp_gpl.asm`
    - `libavcodec/x86/idct_mmx.c`
@@ -44,6 +45,7 @@ Specifically, the GPL parts of FFmpeg are:
    - `vf_owdenoise.c`
    - `vf_perspective.c`
    - `vf_phase.c`
+    - `vf_pp.c`
    - `vf_pp7.c`
    - `vf_pullup.c`
    - `vf_repeatfields.c`
--- a/3rdparty/ffmpeg/headers-version.txt
+++ b/3rdparty/ffmpeg/headers-version.txt
@@ -1 +1 @@
-ffmpeg-8.0 from https://ffmpeg.org/releases/ffmpeg-8.0.tar.xz
+ffmpeg-7.0.2 from https://ffmpeg.org/releases/ffmpeg-7.0.2.tar.xz
--- a/3rdparty/ffmpeg/include/libavcodec/avcodec.h
+++ b/3rdparty/ffmpeg/include/libavcodec/avcodec.h
@@ -187,6 +187,17 @@ struct AVCodecParameters;
 * @{
 */

+#if FF_API_BUFFER_MIN_SIZE
+/**
+ * @ingroup lavc_encoding
+ * minimum encoding buffer size
+ * Used to avoid some checks during header writing.
+ * @deprecated Unused: avcodec_receive_packet() does not work
+ *             with preallocated packet buffers.
+ */
+#define AV_INPUT_BUFFER_MIN_SIZE 16384
+#endif
+
 /**
 * @ingroup lavc_encoding
 */
@@ -223,9 +234,18 @@ typedef struct RcOverride{
 * Use qpel MC.
 */
 #define AV_CODEC_FLAG_QPEL            (1 <<  4)
+#if FF_API_DROPCHANGED
+/**
+ * Don't output frames whose parameters differ from first
+ * decoded frame in stream.
+ *
+ * @deprecated callers should implement this functionality in their own code
+ */
+#define AV_CODEC_FLAG_DROPCHANGED     (1 <<  5)
+#endif
 /**
 * Request the encoder to output reconstructed frames, i.e.\ frames that would
- * be produced by decoding the encoded bitstream. These frames may be retrieved
+ * be produced by decoding the encoded bistream. These frames may be retrieved
 * by calling avcodec_receive_frame() immediately after a successful call to
 * avcodec_receive_packet().
 *
@@ -399,12 +419,6 @@ typedef struct RcOverride{
 */
 #define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)

-/**
- * Decoding only.
- * Do not apply picture enhancement layers, export them instead.
- */
-#define AV_CODEC_EXPORT_DATA_ENHANCEMENTS (1 << 4)
-
 /**
 * The decoder will keep a reference to the frame and may reuse it later.
 */
@@ -495,21 +509,16 @@ typedef struct AVCodecContext {
    int flags2;

    /**
-     * Out-of-band global headers that may be used by some codecs.
-     *
-     * - decoding: Should be set by the caller when available (typically from a
-     *   demuxer) before opening the decoder; some decoders require this to be
-     *   set and will fail to initialize otherwise.
-     *
-     *   The array must be allocated with the av_malloc() family of functions;
-     *   allocated size must be at least AV_INPUT_BUFFER_PADDING_SIZE bytes
-     *   larger than extradata_size.
-     *
-     * - encoding: May be set by the encoder in avcodec_open2() (possibly
-     *   depending on whether the AV_CODEC_FLAG_GLOBAL_HEADER flag is set).
-     *
-     * After being set, the array is owned by the codec and freed in
-     * avcodec_free_context().
+     * some codecs need / can use extradata like Huffman tables.
+     * MJPEG: Huffman tables
+     * rv10: additional flags
+     * MPEG-4: global headers (they can be in the bitstream or here)
+     * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
+     * than extradata_size to avoid problems if it is read with the bitstream reader.
+     * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * Must be allocated with the av_malloc() family of functions.
+     * - encoding: Set/allocated/freed by libavcodec.
+     * - decoding: Set/allocated/freed by user.
     */
    uint8_t *extradata;
    int extradata_size;
@@ -550,6 +559,23 @@ typedef struct AVCodecContext {
     */
    AVRational framerate;

+#if FF_API_TICKS_PER_FRAME
+    /**
+     * For some codecs, the time base is closer to the field rate than the frame rate.
+     * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
+     * if no telecine is used ...
+     *
+     * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
+     *
+     * @deprecated
+     * - decoding: Use AVCodecDescriptor.props & AV_CODEC_PROP_FIELDS
+     * - encoding: Set AVCodecContext.framerate instead
+     *
+     */
+    attribute_deprecated
+    int ticks_per_frame;
+#endif
+
    /**
     * Codec delay.
     *
@@ -1149,10 +1175,6 @@ typedef struct AVCodecContext {
     *   this callback and filled with the extra buffers if there are more
     *   buffers than buf[] can hold. extended_buf will be freed in
     *   av_frame_unref().
-     *   Decoders will generally initialize the whole buffer before it is output
-     *   but it can in rare error conditions happen that uninitialized data is passed
-     *   through. \important The buffers returned by get_buffer* should thus not contain sensitive
-     *   data.
     *
     * If AV_CODEC_CAP_DR1 is not set then get_buffer2() must call
     * avcodec_default_get_buffer2() instead of providing buffers allocated by
@@ -1516,7 +1538,6 @@ typedef struct AVCodecContext {
 #define FF_DCT_MMX     3
 #define FF_DCT_ALTIVEC 5
 #define FF_DCT_FAAN    6
-#define FF_DCT_NEON    7

    /**
     * IDCT algorithm, see FF_IDCT_* below.
@@ -1616,29 +1637,165 @@ typedef struct AVCodecContext {
     * See the AV_PROFILE_* defines in defs.h.
     */
     int profile;
+#if FF_API_FF_PROFILE_LEVEL
+    /** @deprecated The following defines are deprecated; use AV_PROFILE_*
+     * in defs.h instead. */
+#define FF_PROFILE_UNKNOWN -99
+#define FF_PROFILE_RESERVED -100
+
+#define FF_PROFILE_AAC_MAIN 0
+#define FF_PROFILE_AAC_LOW  1
+#define FF_PROFILE_AAC_SSR  2
+#define FF_PROFILE_AAC_LTP  3
+#define FF_PROFILE_AAC_HE   4
+#define FF_PROFILE_AAC_HE_V2 28
+#define FF_PROFILE_AAC_LD   22
+#define FF_PROFILE_AAC_ELD  38
+#define FF_PROFILE_MPEG2_AAC_LOW 128
+#define FF_PROFILE_MPEG2_AAC_HE  131
+
+#define FF_PROFILE_DNXHD         0
+#define FF_PROFILE_DNXHR_LB      1
+#define FF_PROFILE_DNXHR_SQ      2
+#define FF_PROFILE_DNXHR_HQ      3
+#define FF_PROFILE_DNXHR_HQX     4
+#define FF_PROFILE_DNXHR_444     5
+
+#define FF_PROFILE_DTS                20
+#define FF_PROFILE_DTS_ES             30
+#define FF_PROFILE_DTS_96_24          40
+#define FF_PROFILE_DTS_HD_HRA         50
+#define FF_PROFILE_DTS_HD_MA          60
+#define FF_PROFILE_DTS_EXPRESS        70
+#define FF_PROFILE_DTS_HD_MA_X        61
+#define FF_PROFILE_DTS_HD_MA_X_IMAX   62
+
+
+#define FF_PROFILE_EAC3_DDP_ATMOS         30
+
+#define FF_PROFILE_TRUEHD_ATMOS           30
+
+#define FF_PROFILE_MPEG2_422    0
+#define FF_PROFILE_MPEG2_HIGH   1
+#define FF_PROFILE_MPEG2_SS     2
+#define FF_PROFILE_MPEG2_SNR_SCALABLE  3
+#define FF_PROFILE_MPEG2_MAIN   4
+#define FF_PROFILE_MPEG2_SIMPLE 5
+
+#define FF_PROFILE_H264_CONSTRAINED  (1<<9)  // 8+1; constraint_set1_flag
+#define FF_PROFILE_H264_INTRA        (1<<11) // 8+3; constraint_set3_flag
+
+#define FF_PROFILE_H264_BASELINE             66
+#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
+#define FF_PROFILE_H264_MAIN                 77
+#define FF_PROFILE_H264_EXTENDED             88
+#define FF_PROFILE_H264_HIGH                 100
+#define FF_PROFILE_H264_HIGH_10              110
+#define FF_PROFILE_H264_HIGH_10_INTRA        (110|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_MULTIVIEW_HIGH       118
+#define FF_PROFILE_H264_HIGH_422             122
+#define FF_PROFILE_H264_HIGH_422_INTRA       (122|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_STEREO_HIGH          128
+#define FF_PROFILE_H264_HIGH_444             144
+#define FF_PROFILE_H264_HIGH_444_PREDICTIVE  244
+#define FF_PROFILE_H264_HIGH_444_INTRA       (244|FF_PROFILE_H264_INTRA)
+#define FF_PROFILE_H264_CAVLC_444            44
+
+#define FF_PROFILE_VC1_SIMPLE   0
+#define FF_PROFILE_VC1_MAIN     1
+#define FF_PROFILE_VC1_COMPLEX  2
+#define FF_PROFILE_VC1_ADVANCED 3
+
+#define FF_PROFILE_MPEG4_SIMPLE                     0
+#define FF_PROFILE_MPEG4_SIMPLE_SCALABLE            1
+#define FF_PROFILE_MPEG4_CORE                       2
+#define FF_PROFILE_MPEG4_MAIN                       3
+#define FF_PROFILE_MPEG4_N_BIT                      4
+#define FF_PROFILE_MPEG4_SCALABLE_TEXTURE           5
+#define FF_PROFILE_MPEG4_SIMPLE_FACE_ANIMATION      6
+#define FF_PROFILE_MPEG4_BASIC_ANIMATED_TEXTURE     7
+#define FF_PROFILE_MPEG4_HYBRID                     8
+#define FF_PROFILE_MPEG4_ADVANCED_REAL_TIME         9
+#define FF_PROFILE_MPEG4_CORE_SCALABLE             10
+#define FF_PROFILE_MPEG4_ADVANCED_CODING           11
+#define FF_PROFILE_MPEG4_ADVANCED_CORE             12
+#define FF_PROFILE_MPEG4_ADVANCED_SCALABLE_TEXTURE 13
+#define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
+#define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
+
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   1
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   2
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  32768
+#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
+#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
+
+#define FF_PROFILE_VP9_0                            0
+#define FF_PROFILE_VP9_1                            1
+#define FF_PROFILE_VP9_2                            2
+#define FF_PROFILE_VP9_3                            3
+
+#define FF_PROFILE_HEVC_MAIN                        1
+#define FF_PROFILE_HEVC_MAIN_10                     2
+#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE          3
+#define FF_PROFILE_HEVC_REXT                        4
+#define FF_PROFILE_HEVC_SCC                         9
+
+#define FF_PROFILE_VVC_MAIN_10                      1
+#define FF_PROFILE_VVC_MAIN_10_444                 33
+
+#define FF_PROFILE_AV1_MAIN                         0
+#define FF_PROFILE_AV1_HIGH                         1
+#define FF_PROFILE_AV1_PROFESSIONAL                 2
+
+#define FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT            0xc0
+#define FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT 0xc1
+#define FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT         0xc2
+#define FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS                0xc3
+#define FF_PROFILE_MJPEG_JPEG_LS                         0xf7
+
+#define FF_PROFILE_SBC_MSBC                         1
+
+#define FF_PROFILE_PRORES_PROXY     0
+#define FF_PROFILE_PRORES_LT        1
+#define FF_PROFILE_PRORES_STANDARD  2
+#define FF_PROFILE_PRORES_HQ        3
+#define FF_PROFILE_PRORES_4444      4
+#define FF_PROFILE_PRORES_XQ        5
+
+#define FF_PROFILE_ARIB_PROFILE_A 0
+#define FF_PROFILE_ARIB_PROFILE_C 1
+
+#define FF_PROFILE_KLVA_SYNC 0
+#define FF_PROFILE_KLVA_ASYNC 1
+
+#define FF_PROFILE_EVC_BASELINE             0
+#define FF_PROFILE_EVC_MAIN                 1
+#endif

    /**
     * Encoding level descriptor.
     * - encoding: Set by user, corresponds to a specific level defined by the
     *   codec, usually corresponding to the profile level, if not specified it
-     *   is set to AV_LEVEL_UNKNOWN.
+     *   is set to FF_LEVEL_UNKNOWN.
     * - decoding: Set by libavcodec.
     * See AV_LEVEL_* in defs.h.
     */
     int level;
+#if FF_API_FF_PROFILE_LEVEL
+    /** @deprecated The following define is deprecated; use AV_LEVEL_UNKOWN
+     * in defs.h instead. */
+#define FF_LEVEL_UNKNOWN -99
+#endif

-#if FF_API_CODEC_PROPS
    /**
     * Properties of the stream that gets decoded
     * - encoding: unused
     * - decoding: set by libavcodec
     */
-    attribute_deprecated
    unsigned properties;
 #define FF_CODEC_PROPERTY_LOSSLESS        0x00000001
 #define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
 #define FF_CODEC_PROPERTY_FILM_GRAIN      0x00000004
-#endif

    /**
     * Skip loop filtering for selected frames.
@@ -1727,13 +1884,8 @@ typedef struct AVCodecContext {
     * For SUBTITLE_ASS subtitle type, it should contain the whole ASS
     * [Script Info] and [V4+ Styles] section, plus the [Events] line and
     * the Format line following. It shouldn't include any Dialogue line.
-     *
-     * - encoding: May be set by the caller before avcodec_open2() to an array
-     *   allocated with the av_malloc() family of functions.
-     * - decoding: May be set by libavcodec in avcodec_open2().
-     *
-     * After being set, the array is owned by the codec and freed in
-     * avcodec_free_context().
+     * - encoding: Set/allocated/freed by user (before avcodec_open2())
+     * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2())
     */
    int subtitle_header_size;
    uint8_t *subtitle_header;
@@ -1919,7 +2071,7 @@ typedef struct AVCodecContext {
     * - encoding: may be set by user before calling avcodec_open2() for
     *             encoder configuration. Afterwards owned and freed by the
     *             encoder.
-     * - decoding: may be set by libavcodec in avcodec_open2().
+     * - decoding: unused
     */
    AVFrameSideData  **decoded_side_data;
    int             nb_decoded_side_data;
@@ -2217,6 +2369,24 @@ int avcodec_parameters_to_context(AVCodecContext *codec,
 */
 int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);

+#if FF_API_AVCODEC_CLOSE
+/**
+ * Close a given AVCodecContext and free all the data associated with it
+ * (but not the AVCodecContext itself).
+ *
+ * Calling this function on an AVCodecContext that hasn't been opened will free
+ * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL
+ * codec. Subsequent calls will do nothing.
+ *
+ * @deprecated Do not use this function. Use avcodec_free_context() to destroy a
+ * codec context (either open or closed). Opening and closing a codec context
+ * multiple times is not supported anymore -- use multiple codec contexts
+ * instead.
+ */
+attribute_deprecated
+int avcodec_close(AVCodecContext *avctx);
+#endif
+
 /**
 * Free all allocated data in the given subtitle struct.
 *
@@ -2520,36 +2690,6 @@ int avcodec_get_hw_frames_parameters(AVCodecContext *avctx,
                                     enum AVPixelFormat hw_pix_fmt,
                                     AVBufferRef **out_frames_ref);

-enum AVCodecConfig {
-    AV_CODEC_CONFIG_PIX_FORMAT,     ///< AVPixelFormat, terminated by AV_PIX_FMT_NONE
-    AV_CODEC_CONFIG_FRAME_RATE,     ///< AVRational, terminated by {0, 0}
-    AV_CODEC_CONFIG_SAMPLE_RATE,    ///< int, terminated by 0
-    AV_CODEC_CONFIG_SAMPLE_FORMAT,  ///< AVSampleFormat, terminated by AV_SAMPLE_FMT_NONE
-    AV_CODEC_CONFIG_CHANNEL_LAYOUT, ///< AVChannelLayout, terminated by {0}
-    AV_CODEC_CONFIG_COLOR_RANGE,    ///< AVColorRange, terminated by AVCOL_RANGE_UNSPECIFIED
-    AV_CODEC_CONFIG_COLOR_SPACE,    ///< AVColorSpace, terminated by AVCOL_SPC_UNSPECIFIED
-};
-
-/**
- * Retrieve a list of all supported values for a given configuration type.
- *
- * @param avctx An optional context to use. Values such as
- *              `strict_std_compliance` may affect the result. If NULL,
- *              default values are used.
- * @param codec The codec to query, or NULL to use avctx->codec.
- * @param config The configuration to query.
- * @param flags Currently unused; should be set to zero.
- * @param out_configs On success, set to a list of configurations, terminated
- *                    by a config-specific terminator, or NULL if all
- *                    possible values are supported.
- * @param out_num_configs On success, set to the number of elements in
-                          *out_configs, excluding the terminator. Optional.
- */
-int avcodec_get_supported_config(const AVCodecContext *avctx,
-                                 const AVCodec *codec, enum AVCodecConfig config,
-                                 unsigned flags, const void **out_configs,
-                                 int *out_num_configs);
-


 /**
@@ -2900,7 +3040,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
 *
 * @note for encoders, this function will only do something if the encoder
 * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
- * will drain any remaining packets, and can then be reused for a different
+ * will drain any remaining packets, and can then be re-used for a different
 * stream (as opposed to sending a null frame which will leave the encoder
 * in a permanent EOF state after draining). This can be desirable if the
 * cost of tearing down and replacing the encoder instance is high.
@@ -2935,8 +3075,8 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size);
 void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);

 /**
- * @return a positive value if s is open (i.e. avcodec_open2() was called on it),
- * 0 otherwise.
+ * @return a positive value if s is open (i.e. avcodec_open2() was called on it
+ * with no corresponding avcodec_close()), 0 otherwise.
 */
 int avcodec_is_open(AVCodecContext *s);

--- a/3rdparty/ffmpeg/include/libavcodec/codec.h
+++ b/3rdparty/ffmpeg/include/libavcodec/codec.h
@@ -80,6 +80,21 @@
 */
 #define AV_CODEC_CAP_SMALL_LAST_FRAME    (1 <<  6)

+#if FF_API_SUBFRAMES
+/**
+ * Codec can output multiple frames per AVPacket
+ * Normally demuxers return one frame at a time, demuxers which do not do
+ * are connected to a parser to split what they return into proper frames.
+ * This flag is reserved to the very rare category of codecs which have a
+ * bitstream that cannot be split into frames without timeconsuming
+ * operations like full decoding. Demuxers carrying such bitstreams thus
+ * may return multiple frames in a packet. This has many disadvantages like
+ * prohibiting stream copy in many cases thus it should only be considered
+ * as a last resort.
+ */
+#define AV_CODEC_CAP_SUBFRAMES           (1 <<  8)
+#endif
+
 /**
 * Codec is experimental and is thus avoided in favor of non experimental
 * encoders
@@ -190,19 +205,10 @@ typedef struct AVCodec {
     */
    int capabilities;
    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-
-    /**
-     * Deprecated codec capabilities.
-     */
-    attribute_deprecated
-    const AVRational *supported_framerates; ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const enum AVPixelFormat *pix_fmts;     ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const int *supported_samplerates;       ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const enum AVSampleFormat *sample_fmts; ///< @deprecated use avcodec_get_supported_config()
-
+    const AVRational *supported_framerates; ///< array of supported framerates, or NULL if any, array is terminated by {0,0}
+    const enum AVPixelFormat *pix_fmts;     ///< array of supported pixel formats, or NULL if unknown, array is terminated by -1
+    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
+    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
    const AVClass *priv_class;              ///< AVClass for the private context
    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {AV_PROFILE_UNKNOWN}

@@ -220,9 +226,7 @@ typedef struct AVCodec {

    /**
     * Array of supported channel layouts, terminated with a zeroed layout.
-     * @deprecated use avcodec_get_supported_config()
     */
-    attribute_deprecated
    const AVChannelLayout *ch_layouts;
 } AVCodec;

--- a/3rdparty/ffmpeg/include/libavcodec/codec_id.h
+++ b/3rdparty/ffmpeg/include/libavcodec/codec_id.h
@@ -206,9 +206,7 @@ enum AVCodecID {
    AV_CODEC_ID_BMV_VIDEO,
    AV_CODEC_ID_VBLE,
    AV_CODEC_ID_DXTORY,
-#if FF_API_V408_CODECID
    AV_CODEC_ID_V410,
-#endif
    AV_CODEC_ID_XWD,
    AV_CODEC_ID_CDXL,
    AV_CODEC_ID_XBM,
@@ -256,10 +254,8 @@ enum AVCodecID {
    AV_CODEC_ID_012V,
    AV_CODEC_ID_AVUI,
    AV_CODEC_ID_TARGA_Y216,
-#if FF_API_V408_CODECID
    AV_CODEC_ID_V308,
    AV_CODEC_ID_V408,
-#endif
    AV_CODEC_ID_YUV4,
    AV_CODEC_ID_AVRN,
    AV_CODEC_ID_CPIA,
@@ -326,11 +322,6 @@ enum AVCodecID {
    AV_CODEC_ID_RTV1,
    AV_CODEC_ID_VMIX,
    AV_CODEC_ID_LEAD,
-    AV_CODEC_ID_DNXUC,
-    AV_CODEC_ID_RV60,
-    AV_CODEC_ID_JPEGXL_ANIM,
-    AV_CODEC_ID_APV,
-    AV_CODEC_ID_PRORES_RAW,

    /* various PCM "codecs" */
    AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -425,8 +416,6 @@ enum AVCodecID {
    AV_CODEC_ID_ADPCM_IMA_MOFLEX,
    AV_CODEC_ID_ADPCM_IMA_ACORN,
    AV_CODEC_ID_ADPCM_XMD,
-    AV_CODEC_ID_ADPCM_IMA_XBOX,
-    AV_CODEC_ID_ADPCM_SANYO,

    /* AMR */
    AV_CODEC_ID_AMR_NB = 0x12000,
@@ -554,8 +543,6 @@ enum AVCodecID {
    AV_CODEC_ID_AC4,
    AV_CODEC_ID_OSQ,
    AV_CODEC_ID_QOA,
-    AV_CODEC_ID_LC3,
-    AV_CODEC_ID_G728,

    /* subtitle codecs */
    AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
@@ -585,7 +572,6 @@ enum AVCodecID {
    AV_CODEC_ID_HDMV_TEXT_SUBTITLE,
    AV_CODEC_ID_TTML,
    AV_CODEC_ID_ARIB_CAPTION,
-    AV_CODEC_ID_IVTV_VBI,

    /* other specific kind of codecs (generally used for attachments) */
    AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
@@ -602,8 +588,6 @@ enum AVCodecID {
    AV_CODEC_ID_TIMED_ID3,
    AV_CODEC_ID_BIN_DATA,
    AV_CODEC_ID_SMPTE_2038,
-    AV_CODEC_ID_LCEVC,
-    AV_CODEC_ID_SMPTE_436M_ANC,


    AV_CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
--- a/3rdparty/ffmpeg/include/libavcodec/codec_par.h
+++ b/3rdparty/ffmpeg/include/libavcodec/codec_par.h
@@ -148,7 +148,7 @@ typedef struct AVCodecParameters {
     * durations. Should be set to { 0, 1 } when some frames have differing
     * durations or if the value is not known.
     *
-     * @note This field corresponds to values that are stored in codec-level
+     * @note This field correponds to values that are stored in codec-level
     * headers and is typically overridden by container/transport-layer
     * timestamps, when available. It should thus be used only as a last resort,
     * when no higher-level timing information is available.
--- a/3rdparty/ffmpeg/include/libavcodec/defs.h
+++ b/3rdparty/ffmpeg/include/libavcodec/defs.h
@@ -73,7 +73,6 @@
 #define AV_PROFILE_AAC_HE_V2       28
 #define AV_PROFILE_AAC_LD          22
 #define AV_PROFILE_AAC_ELD         38
-#define AV_PROFILE_AAC_USAC        41
 #define AV_PROFILE_MPEG2_AAC_LOW  128
 #define AV_PROFILE_MPEG2_AAC_HE   131

@@ -160,7 +159,6 @@
 #define AV_PROFILE_HEVC_MAIN_10                     2
 #define AV_PROFILE_HEVC_MAIN_STILL_PICTURE          3
 #define AV_PROFILE_HEVC_REXT                        4
-#define AV_PROFILE_HEVC_MULTIVIEW_MAIN              6
 #define AV_PROFILE_HEVC_SCC                         9

 #define AV_PROFILE_VVC_MAIN_10                      1
@@ -185,9 +183,6 @@
 #define AV_PROFILE_PRORES_4444      4
 #define AV_PROFILE_PRORES_XQ        5

-#define AV_PROFILE_PRORES_RAW       0
-#define AV_PROFILE_PRORES_RAW_HQ    1
-
 #define AV_PROFILE_ARIB_PROFILE_A 0
 #define AV_PROFILE_ARIB_PROFILE_C 1

@@ -197,14 +192,6 @@
 #define AV_PROFILE_EVC_BASELINE             0
 #define AV_PROFILE_EVC_MAIN                 1

-#define AV_PROFILE_APV_422_10  33
-#define AV_PROFILE_APV_422_12  44
-#define AV_PROFILE_APV_444_10  55
-#define AV_PROFILE_APV_444_12  66
-#define AV_PROFILE_APV_4444_10 77
-#define AV_PROFILE_APV_4444_12 88
-#define AV_PROFILE_APV_400_10  99
-

 #define AV_LEVEL_UNKNOWN                  -99

@@ -336,20 +323,6 @@ typedef struct AVProducerReferenceTime {
    int flags;
 } AVProducerReferenceTime;

-/**
- * RTCP SR (Sender Report) information
- *
- * The received sender report information for an RTSP
- * stream, exposed as AV_PKT_DATA_RTCP_SR side data.
- */
-typedef struct AVRTCPSenderReport {
-    uint32_t ssrc; ///< Synchronization source identifier
-    uint64_t ntp_timestamp; ///< NTP time when the report was sent
-    uint32_t rtp_timestamp; ///< RTP time when the report was sent
-    uint32_t sender_nb_packets; ///< Total number of packets sent
-    uint32_t sender_nb_bytes; ///< Total number of bytes sent (excluding headers or padding)
-} AVRTCPSenderReport;
-
 /**
 * Encode extradata length to a buffer. Used by xiph codecs.
 *
--- a/3rdparty/ffmpeg/include/libavcodec/packet.h
+++ b/3rdparty/ffmpeg/include/libavcodec/packet.h
@@ -59,6 +59,10 @@ enum AVPacketSideDataType {
     * An AV_PKT_DATA_PARAM_CHANGE side data packet is laid out as follows:
     * @code
     * u32le param_flags
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT)
+     *     s32le channel_count
+     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)
+     *     u64le channel_layout
     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE)
     *     s32le sample_rate
     * if (param_flags & AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS)
@@ -142,7 +146,7 @@ enum AVPacketSideDataType {
    AV_PKT_DATA_CPB_PROPERTIES,

    /**
-     * Recommends skipping the specified number of samples
+     * Recommmends skipping the specified number of samples
     * @code
     * u32le number of samples to skip from start of this packet
     * u32le number of samples to skip from end of this packet
@@ -326,42 +330,6 @@ enum AVPacketSideDataType {
    */
    AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT,

-    /**
-     * The number of pixels to discard from the top/bottom/left/right border of the
-     * decoded frame to obtain the sub-rectangle intended for presentation.
-     *
-     * @code
-     * u32le crop_top
-     * u32le crop_bottom
-     * u32le crop_left
-     * u32le crop_right
-     * @endcode
-     */
-    AV_PKT_DATA_FRAME_CROPPING,
-
-    /**
-     * Raw LCEVC payload data, as a uint8_t array, with NAL emulation
-     * bytes intact.
-     */
-    AV_PKT_DATA_LCEVC,
-
-    /**
-     * This side data contains information about the reference display width(s)
-     * and reference viewing distance(s) as well as information about the
-     * corresponding reference stereo pair(s), i.e., the pair(s) of views to be
-     * displayed for the viewer's left and right eyes on the reference display
-     * at the reference viewing distance.
-     * The payload is the AV3DReferenceDisplaysInfo struct defined in
-     * libavutil/tdrdi.h.
-     */
-    AV_PKT_DATA_3D_REFERENCE_DISPLAYS,
-
-    /**
-     * Contains the last received RTCP SR (Sender Report) information
-     * in the form of the AVRTCPSenderReport struct.
-     */
-    AV_PKT_DATA_RTCP_SR,
-
    /**
     * The number of side data types.
     * This is not part of the public API/ABI in the sense that it may
@@ -373,6 +341,8 @@ enum AVPacketSideDataType {
    AV_PKT_DATA_NB
 };

+#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED
+
 /**
 * This structure stores auxiliary information for decoding, presenting, or
 * otherwise processing the coded stream. It is typically exported by demuxers
@@ -381,11 +351,11 @@ enum AVPacketSideDataType {
 *
 * Global side data is handled as follows:
 * - During demuxing, it may be exported through
- *   @ref AVCodecParameters.coded_side_data "AVStream's codec parameters", which can
+ *   @ref AVStream.codecpar.side_data "AVStream's codec parameters", which can
 *   then be passed as input to decoders through the
 *   @ref AVCodecContext.coded_side_data "decoder context's side data", for
 *   initialization.
- * - For muxing, it can be fed through @ref AVCodecParameters.coded_side_data
+ * - For muxing, it can be fed through @ref AVStream.codecpar.side_data
 *   "AVStream's codec parameters", typically  the output of encoders through
 *   the @ref AVCodecContext.coded_side_data "encoder context's side data", for
 *   initialization.
@@ -893,13 +863,6 @@ int av_packet_make_writable(AVPacket *pkt);
 */
 void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst);

-/**
- * Allocate an AVContainerFifo instance for AVPacket.
- *
- * @param flags currently unused
- */
-struct AVContainerFifo *av_container_fifo_alloc_avpacket(unsigned flags);
-
 /**
 * @}
 */
--- a/3rdparty/ffmpeg/include/libavcodec/vdpau.h
+++ b/3rdparty/ffmpeg/include/libavcodec/vdpau.h
@@ -93,6 +93,28 @@ typedef struct AVVDPAUContext {
    AVVDPAU_Render2 render2;
 } AVVDPAUContext;

+#if FF_API_VDPAU_ALLOC_GET_SET
+/**
+ * @brief allocation function for AVVDPAUContext
+ *
+ * Allows extending the struct without breaking API/ABI
+ * @deprecated use av_vdpau_bind_context() instead
+ */
+attribute_deprecated
+AVVDPAUContext *av_alloc_vdpaucontext(void);
+
+/**
+ * @deprecated render2 is public and can be accessed directly
+ */
+attribute_deprecated
+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
+/**
+ * @deprecated render2 is public and can be accessed directly
+ */
+attribute_deprecated
+void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
+#endif
+
 /**
 * Associate a VDPAU device with a codec context for hardware acceleration.
 * This function is meant to be called from the get_format() codec callback,
@@ -133,6 +155,17 @@ int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
 int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
                                    uint32_t *width, uint32_t *height);

+#if FF_API_VDPAU_ALLOC_GET_SET
+/**
+ * Allocate an AVVDPAUContext.
+ *
+ * @return Newly-allocated AVVDPAUContext or NULL on failure.
+ * @deprecated use av_vdpau_bind_context() instead
+ */
+attribute_deprecated
+AVVDPAUContext *av_vdpau_alloc_context(void);
+#endif
+
 /** @} */

 #endif /* AVCODEC_VDPAU_H */
--- a/Show More
+++ b/Show More