DMA: Add backpressure to GIF as it has a 64bit bus

2026-08-14 10:00:26 +02:00 · 2025-11-01 11:50:36 +00:00
1663 changed files with 243263 additions and 341693 deletions
@@ -1,4 +1,3 @@
 # These are supported funding model platforms

 github: [PCSX2]
-liberapay: PCSX2
@@ -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
@@ -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
@@ -8,4 +8,4 @@
 <!-- If applicable, including examples you've already tested with / recommendations for how to test further is very helpful! -->

 ### Did you use AI to help find, test, or implement this issue or feature?
-<!-- Answer yes or no. If you answer yes, please provide a brief explanation as to how you used it. Please see the Large Language Model (LLM) Usage Policy for more information: https://pcsx2.net/docs/contributing/#large-language-model-llm-usage-policy -->
+<!-- Answer yes or no. If you answer yes, please provide a brief explanation how. -->
@@ -6,9 +6,6 @@ updates:
    schedule:
      # Check for updates to GitHub Actions every week
      interval: "weekly"
-    commit-message:
-      # Prefix all commit messages with "Deps/gha: "
-      prefix: "Deps/gha"
    groups:
      ci-deps:
        patterns:
@@ -40,13 +40,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:
@@ -1,23 +0,0 @@
-name: 'Commit Message Check'
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
-
-jobs:
-  check-commit-message:
-    name: Check Commit Message
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for a commit prefix 
-        uses: gsactions/commit-message-checker@16fa2d5de096ae0d35626443bcd24f1e756cafee
-        with:
-          accessToken: ${{ secrets.GITHUB_TOKEN }}
-          pattern: '^[A-Z0-9][A-Za-z0-9 \["\/\\]+:.+'
-          excludeTitle: true
-          excludeDescription: true
-          checkAllCommitMessages: true
-          error: 'Commit messages should be capitalized, start with a prefix, delimited by a colon. Example: "Debugger: Add a paste bytes option to the memory view"'
@@ -1,21 +0,0 @@
-name: 🧹 Clean Up Old Caches
-
-on:
-  schedule:
-    - cron: "0 0 * * *" # Every day at 12am UTC.
-  workflow_dispatch: # As well as manually.
-
-jobs:
-  clean:
-    name: "Clean Up Caches"
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-    steps:
-      - name: Clean Caches
-        uses: PCSX2/cache-clean-action@v1.1.0
-        with:
-          items: '[{"key": " deps", "count": 4}, {"key": " ccache", "count": 1}, {"key": " flatpak", "count": 1}]'
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: all
-          on_failure: error
@@ -4,17 +4,6 @@ on:
  schedule:
    - cron: "0 0 * * *" # Every day at 12am UTC.
  workflow_dispatch: # As well as manually.
-    inputs:
-      stableBuild:
-        description: 'Build stable version'
-        required: false
-        type: boolean
-        default: false
-      publish:
-        description: 'Publish to Flathub'
-        required: false
-        type: boolean
-        default: true

 jobs:

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

@@ -11,13 +11,13 @@ jobs:
    name: "Update Base Translation"
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5

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

      - 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@5f6978faf089d4d20b00c7766989d076bb2fc7f1
+        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."
@@ -18,12 +18,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5

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

      - name: Validate YAML
        run: |
@@ -45,13 +45,13 @@ jobs:
    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@v7
+        uses: actions/checkout@v5
        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
@@ -93,7 +93,7 @@ jobs:

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

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

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

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

      - name: Upload artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
-  report-error:
-    runs-on: ubuntu-latest
-    needs: build_linux
-    if: always() && needs.build_linux.result == 'failure' && inputs.publish == true

-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Push Discord Webhook
-        env:
-          OWNER: PCSX2
-          REPO: pcsx2
-          DISCORD_BUILD_WEBHOOK: ${{ secrets.DISCORD_BUILD_WEBHOOK }}
-          GITHUB_TOKEN: ${{ github.token }}
-        run: |
-          cd ./.github/workflows/scripts/releases/announce-release
-          npm ci
-          FLATHUB_FAILURE=1 node index.js
@@ -20,18 +20,6 @@ jobs:
      cmakeflags: ""
      buildAppImage: true
    secrets: inherit
-  build_linux_debug:
-    name: "Debug"
-    if: github.repository != 'PCSX2/pcsx2' || github.event_name == 'pull_request'
-    uses: ./.github/workflows/linux_build_qt.yml
-    with:
-      jobName: "Debug Build"
-      artifactPrefixName: "PCSX2-linux-Qt-x64-debug"
-      compiler: clang
-      cmakeflags: ""
-      buildAppImage: true
-      cmakeBuildType: Debug
-    secrets: inherit
  build_linux_flatpak:
    name: "Flatpak"
    if: github.repository != 'PCSX2/pcsx2' || github.event_name == 'pull_request'
@@ -27,6 +27,10 @@ on:
        required: false
        type: boolean
        default: false
+      detail:
+        required: false
+        type: string
+        default: ""
      patchesUrl:
        required: false
        type: string
@@ -39,10 +43,6 @@ on:
        required: false
        type: boolean
        default: false
-      cmakeBuildType:
-        required: false
-        type: string
-        default: Release

 jobs:
  build_linux:
@@ -59,7 +59,7 @@ jobs:

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

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

      - name: ccache cache files
-        uses: actions/cache@v6
+        uses: actions/cache@v4
        with:
          path: .ccache
-          key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ccache
+          key: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
+          restore-keys: ${{ inputs.os }} ${{ inputs.platform }} ${{ inputs.compiler }} ${{ inputs.detail }} ccache

      - name: Install Packages
        run: |
@@ -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@v6
+        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: |
@@ -133,7 +133,7 @@ jobs:
          ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }}
        run: |
          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE="${{ inputs.cmakeBuildType }}" \
+            -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
            -DCMAKE_PREFIX_PATH="$HOME/deps" \
            -DCMAKE_C_COMPILER=clang-17 \
@@ -174,7 +174,7 @@ jobs:

      - name: Upload artifact
        if: inputs.buildAppImage == true
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
@@ -13,10 +13,6 @@ on:
        required: false
        type: string
        default: macos-26
-      arch:
-        required: false
-        type: string
-        default: x86-64
      patchesUrl:
        required: false
        type: string
@@ -52,7 +48,7 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5

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

-      - name: Use Xcode 26.2
-        run: sudo xcode-select -s /Applications/Xcode_26.2.app
+      - name: Use Xcode 26.0.1
+        run: sudo xcode-select -s /Applications/Xcode_26.0.1.app

      - name: Install Metal Toolchain
-        run: |
-          for i in {1..5}; do
-            if xcrun metal -v; then break; fi
-            xcodebuild -downloadComponent MetalToolchain
-          done
+        run: xcodebuild -downloadComponent MetalToolchain

      - name: Prepare Artifact Metadata
        id: artifact-metadata
@@ -99,15 +91,15 @@ jobs:

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

      - name: Build Dependencies
        if: steps.cache-deps.outputs.cache-hit != 'true'
        run: |
-          .github/workflows/scripts/macos/build-dependencies${{ case(inputs.arch == 'x86-64', '', '-universal') }}.sh "$HOME/deps"
+          .github/workflows/scripts/macos/build-dependencies.sh "$HOME/deps"

      - name: Download patches
        run: |
@@ -120,19 +112,19 @@ jobs:
        run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT

      - name: Cache ccache cache
-        uses: actions/cache@v6
+        uses: actions/cache@v4
        with:
          path: .ccache
-          key: ${{ inputs.os }} ${{ inputs.arch }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: ${{ inputs.os }} ${{ inputs.arch }} ccache
+          key: ${{ inputs.os }} ccache ${{ steps.ccache_cache_timestamp.outputs.timestamp }}
+          restore-keys: ${{ inputs.os }} ccache

      - name: Generate CMake Files
        run: |
          cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_OSX_ARCHITECTURES="${{ case(inputs.arch == 'x86-64', 'x86_64', inputs.arch) }}" \
+                -DCMAKE_OSX_ARCHITECTURES="x86_64" \
                -DDISABLE_ADVANCE_SIMD=ON \
-                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=${{ case(inputs.arch == 'x86-64', 'ON', 'OFF') }} \
+                -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
                -DUSE_LINKED_FFMPEG=ON \
                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -155,11 +147,6 @@ jobs:
            fi
          done

-      - name: Build GSRunner
-        if: inputs.arch != 'x86-64'
-        working-directory: build
-        run: make -j$(getconf _NPROCESSORS_ONLN) pcsx2-gsrunner
-
      - name: Run Tests
        working-directory: build
        run: make -j$(getconf _NPROCESSORS_ONLN) unittests
@@ -176,7 +163,7 @@ jobs:

      - name: Sign the Application
        if: ${{ inputs.sign_and_notarize == true && env.SIGN_KEY }}
-        uses: indygreg/apple-code-sign-action@5e7a4a01fe4dffe948ef3bcf1f4538d963cb0c72
+        uses: indygreg/apple-code-sign-action@44d0985b7f4363198e80b6fea63ac3e9dd3e9957
        with:
          input_path: 'PCSX2.app'
          p12_file: cert.p12
@@ -197,7 +184,6 @@ jobs:
          app_store_connect_api_key_json_file: 'key.json'

      - name: Zip Build Artifacts
-        if: inputs.arch == 'x86-64'
        run: |
          TAG="$(git tag --points-at HEAD)"
          if [ -z "$TAG" ]; then
@@ -211,8 +197,7 @@ jobs:
          cp "${{ steps.artifact-metadata.outputs.artifact-name }}.tar.xz" ci-artifacts/macOS.tar.xz

      - name: Upload Artifact
-        if: inputs.arch == 'x86-64'
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: "*.tar.xz"
@@ -18,12 +18,3 @@ jobs:
      artifactPrefixName: "PCSX2-macos-Qt"
      sign_and_notarize: true # If we find that notarization takes a long time we should disable that on PR builds
    secrets: inherit
-  build_macos_qt_arm:
-    name: "arm64"
-    if: github.repository != 'PCSX2/pcsx2' || github.event_name == 'pull_request'
-    uses: ./.github/workflows/macos_build.yml
-    with:
-      jobName: "MacOS arm64 Build"
-      artifactPrefixName: "PCSX2-macos-Qt-arm64"
-      arch: arm64
-    secrets: inherit
@@ -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@v7
+      - uses: actions/checkout@v5

      # 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@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090
        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@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090
        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,9 @@ 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: false
      fetchTags: true
-      stableBuild: ${{ inputs.is_prerelease == 'false' }}
+      stableBuild: ${{ github.event_name == 'workflow_dispatch' && inputs.is_prelease == 'false' }}
    secrets: inherit

  # Windows
@@ -133,7 +133,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,23 +147,10 @@ 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

-  # We don't use the artifacts, but we need this for the cache it generates
-  build_macos_qt_arm:
-    if: github.repository == 'PCSX2/pcsx2'
-    needs:
-      - cut-release
-    name: "MacOS"
-    uses: ./.github/workflows/macos_build.yml
-    with:
-      jobName: "Generate arm64 Caches"
-      artifactPrefixName: "PCSX2-macos-Qt-arm64"
-      arch: arm64
-    secrets: inherit
-
  # Upload the Artifacts
  upload_artifacts:
    if: github.repository == 'PCSX2/pcsx2'
@@ -176,12 +163,12 @@ jobs:
    name: "Upload Artifacts"
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v5

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

-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
        name: Download all Artifacts
        with:
          path: ./ci-artifacts/
@@ -209,7 +196,6 @@ jobs:
          gh release upload "${TAG_VAL}" ${{ github.WORKSPACE }}/ci-artifacts/out/*  --repo PCSX2/pcsx2 --clobber

      - name: Publish Release
-        if: github.event_name != 'workflow_dispatch' || inputs.is_prerelease == 'true'
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: |
@@ -217,7 +203,7 @@ jobs:
          echo "TAG_VAL=${TAG_VAL}"
          gh release edit ${TAG_VAL} --draft=false --repo PCSX2/pcsx2

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

@@ -1,3 +1,16 @@
+diff --git a/CHANGES b/CHANGES
+index 5d3dd16..587b612 100644
+--- a/CHANGES
+++ b/CHANGES
+@@ -4,7 +4,7 @@ v2024.1
+  - Update dependencies
+  - Propagate test/install options to Glslang
+ 
+-v2024.0
+v2024.0 2024-03-09
+  - Update dependencies
+  - Utilities:
+     - Use Python3 explicitly in utility scripts
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ffcb54b..7c1a6d8 100644
 --- a/CMakeLists.txt
@@ -41,8 +41,13 @@ BINARY=pcsx2-qt
 APPDIRNAME=PCSX2.AppDir
 STRIP=strip

+# Need both libharfbuzz.so and libharfbuzz.so.0 for bundled libs
+
 declare -a MANUAL_LIBS=(
 	"libshaderc_shared.so.1"
+	"libharfbuzz.so.0"
+	"libharfbuzz.so"
+	"libfreetype.so.6"
 )

 set -e
@@ -69,6 +74,18 @@ fi
 OUTDIR=$(realpath "./$APPDIRNAME")
 rm -fr "$OUTDIR"

+# Our deps build dosn't create libharfbuzz.so.0, so we have to symlink it here
+hbpath=$(find "$DEPSDIR" -name "libharfbuzz.so")
+if [ ! -f "$hbpath" ]; then
+	echo "Missing harfbuzz. Exiting."
+	exit 1
+fi
+
+if [ ! -f "$hbpath.0" ]; then
+	echo "Symlinking libharfbuzz.so.0"
+	ln -s "$hbpath" "$hbpath.0"
+fi
+
 echo "Locating extra libraries..."
 EXTRA_LIBS_ARGS=()
 for lib in "${MANUAL_LIBS[@]}"; do
@@ -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,133 +14,89 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.11.1
-QTAPNG=1.3.0
-
-FFMPEG=8.1
+FREETYPE=2.14.1
+HARFBUZZ=12.0.0
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBJPEGTURBO=3.2.0
-LIBPNG=1.6.58
+LIBJPEGTURBO=3.1.2
+LIBPNG=1.6.50
 LIBWEBP=1.6.0
-NVENC=13.0.19.0
-SDL=SDL3-3.4.12
+SDL=SDL3-3.2.24
+QT=6.10.0
+QTAPNG=1.3.0
 LZ4=1.10.0
-VULKAN=1.4.328.1
 ZSTD=1.5.7
-KDDOCKWIDGETS=2.4.1
-PLUTOVG=1.3.2
+KDDOCKWIDGETS=2.3.0
+PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
-RAPIDYAML=0.12.1

-SHADERC=2026.2
-SHADERC_GLSLANG=275822a6261ee689aadb1da5f09a0ec2f058685c
-SHADERC_SPIRVHEADERS=58006c901d1d5c37dece6b6610e9af87fa951375
-SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73
+SHADERC=2025.3
+SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

 mkdir -p deps-build
 cd deps-build

-export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-grep . > SHASUMS <<EOF
-d9594a31228aa23ad6b531719a29b45f0f3989fe6c136d45767ea179f233c1ac  qtbase-everywhere-src-$QT.tar.xz
-b2bf6c6845ac175ed7f819145483ba4676f617aaa6a5012c8efee63c8bbac413  qtimageformats-everywhere-src-$QT.tar.xz
-7f3cf02f4824bf03c2c5859ea6db173bf1482a1daf24e6cdf7bc78cfa26a8a94  qtsvg-everywhere-src-$QT.tar.xz
-8e61835a679c93fa9c6065b142353c2071ba68e297898937c32a03777fcaf50d  qttools-everywhere-src-$QT.tar.xz
-37c02c81206594c7bb4edca85ac93e8e55a9836b70c960fde6cb0f8623ec5677  qttranslations-everywhere-src-$QT.tar.xz
-95788aa502f75441d4edf65932b235f76523084e13dbbb7b9ee2d207b32bd9b3  qtwayland-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
-b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
-96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d  libbacktrace-$LIBBACKTRACE.tar.gz
-6f30092cef9fb839779646608f4ee14ae3cbac989c47fa05e841b0841f09878e  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775  libpng-$LIBPNG.tar.xz
+cat > SHASUMS <<EOF
+32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
+c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
+fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
+8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-f07b958a9ac5020fb7a44cadb957f658b2149c3c8abb4f63145fac9303249db7  $SDL.tar.gz
-eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0  libpng-$LIBPNG-apng.patch.gz
+81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
+687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee  nv-codec-headers-$NVENC.tar.gz
-c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c  vulkan-sdk-$VULKAN.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-5cd9495d9316cf6cc937bb328a7fd491c3248ef2469cfa42511f1039f6148aca  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d  qtbase-everywhere-src-$QT.tar.xz
+64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea  qtimageformats-everywhere-src-$QT.tar.xz
+5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533  qtsvg-everywhere-src-$QT.tar.xz
+d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a  qttools-everywhere-src-$QT.tar.xz
+326e8253cfd0cb5745238117f297da80e30ce8f4c1db81990497bd388b026cde  qttranslations-everywhere-src-$QT.tar.xz
+603f2b0a259b24bd0fb14f880d7761b1d248118a42a6870cdbe8fdda4173761f  qtwayland-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
+9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-e9efcdd17f86287748793cf21d106e461fcad8d103a3e5a23632afe93828660d  rapidyaml-$RAPIDYAML-src.tgz
-
-f924178e75e3293082481b25ed64d5e48a795b479dac3bd3c83d23070855df42  shaderc-$SHADERC.tar.gz
-971848a1cc639ce8dc244e778b17efe0f690e32ac398a75e31d1c67ad06d3e0a  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-a6cb1b300bb8171795e116457e858e555334749f9cacaed8068ae0ef8681110c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-e156be0bd81c8812f1bff8e520422bfa9df61b3045587b9eb483185f1074a7b2  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
-	curl -L \
-		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.tar.gz" \
-		-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 "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
-		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
-		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
-		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
-		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
-		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
-		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
-fi
+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://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" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
+	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.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 --strict 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
+shasum -a 256 --check SHASUMS

 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
-tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
+unzip "$LIBBACKTRACE.zip"
 cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$INSTALLDIR" --with-pic
+./configure --prefix="$INSTALLDIR"
 make
 make install
 cd ..
@@ -152,7 +104,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
+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
@@ -164,9 +116,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" -DCMAKE_POSITION_INDEPENDENT_CODE=1 -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 ..
@@ -200,11 +150,38 @@ 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 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_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -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 ..
@@ -220,7 +197,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 -- --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 -DFEATURE_gtk3=OFF
+../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 ../../
@@ -312,16 +289,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=OFF -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building RapidYAML..."
-rm -fr "rapidyaml-$RAPIDYAML-src"
-tar xf "rapidyaml-$RAPIDYAML-src.tgz"
-cd "rapidyaml-$RAPIDYAML-src"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -B build -G Ninja
+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 ..
@@ -15,69 +15,64 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 fi

 FREETYPE=2.14.1
-HARFBUZZ=12.2.0
+HARFBUZZ=12.0.0
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBPNG=1.6.51
+LIBPNG=1.6.50
 LIBWEBP=1.6.0
-SDL=SDL3-3.2.26
+SDL=SDL3-3.2.22
 LZ4=1.10.0
 ZSTD=1.5.7
-PLUTOVG=1.3.2
+PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
-RAPIDYAML=0.12.1

-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
+SHADERC=2025.3
+SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

 mkdir -p deps-build
 cd deps-build

-grep . > SHASUMS <<EOF
+cat > SHASUMS <<EOF
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d  libbacktrace-$LIBBACKTRACE.tar.gz
-a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2  libpng-$LIBPNG.tar.xz
+c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
+fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
-9c16ec5654be709f062a705d0c6f529193f1c2123fe7f102fda6733913689023  libpng-$LIBPNG-apng.patch.gz
+f29d00cbcee273c0a54f3f32f86bf5c595e8823a96b1d92a145aac40571ebfcc  $SDL.tar.gz
+687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  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
+a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
+9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-e9efcdd17f86287748793cf21d106e461fcad8d103a3e5a23632afe93828660d  rapidyaml-$RAPIDYAML-src.tgz
 EOF

-if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
-	curl -L \
-		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
-		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.tar.gz" \
-		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE/libbacktrace-$LIBBACKTRACE.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/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
-		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
-		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
-		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
-		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
-fi
+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 --strict SHASUMS
+shasum -a 256 --check SHASUMS

 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
-tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
+unzip "$LIBBACKTRACE.zip"
 cd "libbacktrace-$LIBBACKTRACE"
 ./configure --prefix="$INSTALLDIR"
 make
@@ -87,7 +82,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
+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
@@ -155,7 +150,7 @@ 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_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DSDL_UNIX_CONSOLE_BUILD=ON -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 ..
@@ -178,15 +173,6 @@ cmake --build build --parallel
 ninja -C build install
 cd ..

-echo "Building RapidYAML..."
-rm -fr "rapidyaml-$RAPIDYAML-src"
-tar xf "rapidyaml-$RAPIDYAML-src.tgz"
-cd "rapidyaml-$RAPIDYAML-src"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -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"
@@ -14,8 +14,8 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.4.12.tar.gz",
-      "sha256": "f07b958a9ac5020fb7a44cadb957f658b2149c3c8abb4f63145fac9303249db7"
+      "url": "https://libsdl.org/release/SDL3-3.2.24.tar.gz",
+      "sha256": "81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76"
    }
  ],
  "cleanup": [
@@ -15,24 +15,24 @@
    {
      "type": "git",
      "url": "https://github.com/google/shaderc.git",
-      "commit": "d5f08ae5c5a9a45165578445cbd0f9adf0223448"
+      "commit": "8c2e602ce440b7739c95ff3d69cecb1adf6becda"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/glslang/archive/275822a6261ee689aadb1da5f09a0ec2f058685c.tar.gz",
-      "sha256": "971848a1cc639ce8dc244e778b17efe0f690e32ac398a75e31d1c67ad06d3e0a",
+      "url": "https://github.com/KhronosGroup/glslang/archive/efd24d75bcbc55620e759f6bf42c45a32abac5f8.tar.gz",
+      "sha256": "9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47",
      "dest": "third_party/glslang"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/58006c901d1d5c37dece6b6610e9af87fa951375.tar.gz",
-      "sha256": "a6cb1b300bb8171795e116457e858e555334749f9cacaed8068ae0ef8681110c",
+      "url": "https://github.com/KhronosGroup/SPIRV-Headers/archive/2a611a970fdbc41ac2e3e328802aed9985352dca.tar.gz",
+      "sha256": "c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a",
      "dest": "third_party/spirv-headers"
    },
    {
      "type": "archive",
-      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/6337eb62cadd7d124ac6789bf39c0f71148f0a73.tar.gz",
-      "sha256": "e156be0bd81c8812f1bff8e520422bfa9df61b3045587b9eb483185f1074a7b2",
+      "url": "https://github.com/KhronosGroup/SPIRV-Tools/archive/33e02568181e3312f49a3cf33df470bf96ef293a.tar.gz",
+      "sha256": "44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff",
      "dest": "third_party/spirv-tools"
    },
    {
@@ -14,8 +14,8 @@
    {
      "type": "git",
      "url": "https://github.com/KDAB/KDDockWidgets.git",
-      "tag": "v2.4.1",
-      "commit": "c1d28d25ef5ba077915bcb2b6fa9e14df2a361f8",
+      "tag": "v2.3.0",
+      "commit": "c38711026e17e34916dd82c6fcbdcc0d2342f541",
      "disable-submodules": true
    }
  ],
@@ -13,8 +13,8 @@
    {
      "type": "git",
      "url": "https://github.com/sammycage/plutovg.git",
-      "tag": "v1.3.2",
-      "commit": "5695a711dd1cff1f01fa6542f3fe6a15de082c63"
+      "tag": "v1.3.1",
+      "commit": "57f82ac9ffc98fb47833f1661583b347b2a08dd3"
    }
  ],
  "cleanup": [
@@ -14,21 +14,21 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.58/libpng-1.6.58.tar.xz",
-      "sha256": "28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775"
+      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.50/libpng-1.6.50.tar.xz",
+      "sha256": "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307"
    },
    {
      "type": "file",
-      "url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.58-apng.patch.gz",
-      "dest-filename": "libpng-1.6.58-apng.patch.gz",
-      "sha256": "eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0"
+      "url": "https://download.sourceforge.net/libpng-apng/libpng-1.6.50-apng.patch.gz",
+      "dest-filename": "libpng-1.6.50-apng.patch.gz",
+      "sha256": "687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165"
    },
    {
      "type": "shell",
      "commands":
      [
-          "gunzip -f libpng-1.6.58-apng.patch.gz",
-          "patch -p1  < \"libpng-1.6.58-apng.patch\""
+          "gunzip -f libpng-1.6.50-apng.patch.gz",
+          "patch -p1  < \"libpng-1.6.50-apng.patch\""
      ]
    }
  ],
@@ -1,23 +0,0 @@
-{
-  "name": "rapidyaml",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-  	"-DBUILD_SHARED_LIBS=ON"
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "git",
-      "url": "https://github.com/biojppm/rapidyaml.git",
-      "tag": "v0.12.1",
-      "commit": "b56567b0bd24e9ce7beb08d6950a5732f62f6e74"
-    }
-  ],
-  "cleanup": [
-    "/include",
-    "/lib/cmake"
-  ]
-}
@@ -1,15 +1,15 @@
 {
  "app-id": "net.pcsx2.PCSX2",
  "runtime": "org.kde.Platform",
-  "runtime-version": "6.10",
+  "runtime-version": "6.9",
  "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",
@@ -35,7 +34,6 @@
    "modules/25-plutosvg.json",
    "modules/26-libpng.json",
    "modules/27-qtapng.json",
-    "modules/28-rapidyaml.json",
    {
      "name": "pcsx2",
      "buildsystem": "cmake-ninja",
@@ -52,8 +50,8 @@
          "-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",
@@ -80,3 +78,4 @@
    }
  ]
 }
+
@@ -3,7 +3,7 @@ Version=1.0
 Terminal=false
 Type=Application
 Name=PCSX2
-StartupWMClass=pcsx2-qt
+StartupWMClass=PCSX2
 GenericName=PlayStation 2 Emulator
 Comment=Sony PlayStation 2 emulator
 Exec=pcsx2-qt
@@ -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>
@@ -7,21 +7,16 @@ merge_binaries() {
 	ARMDIR=$2
 	echo "Merging ARM64 binaries from $ARMDIR into fat binaries at $X86DIR..."

-	IFS=$'\n'
-	FILES=()
-
+	IFS="
+"
 	pushd "$X86DIR"
 	for X86BIN in $(find . -type f \( -name '*.dylib' -o -name '*.a' -o -perm +111 \)); do
 		if file "$X86DIR/$X86BIN" | grep "Mach-O.*x86_64" >/dev/null; then
 			ARMBIN="${ARMDIR}/${X86BIN}"
 			echo "Merge $ARMBIN to $X86BIN..."
 			lipo -create "$X86BIN" "$ARMBIN" -o "$X86BIN"
-			FILES+=("$X86BIN")
 		fi
 	done
-	# If the timestamps of all the files we touched aren't equal, make may recreate them on make install if one depends on another
-	# Minimize the chance of that by touching them all at once
-	touch "${FILES[@]}"
 	popd
 }

@@ -43,28 +38,26 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.11.1
-QTAPNG=1.3.0
-
-FREETYPE=2.14.3
-SDL=SDL3-3.4.12
-HARFBUZZ=14.2.0
+FREETYPE=2.14.1
+HARFBUZZ=12.0.0
+SDL=SDL3-3.2.24
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.58
-LIBJPEGTURBO=3.2.0
+LIBPNG=1.6.50
+LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
-FFMPEG=8.1
-MOLTENVK=1.4.1
-KDDOCKWIDGETS=2.4.1
-PLUTOVG=1.3.2
+FFMPEG=8.0
+MOLTENVK=1.2.9
+QT=6.10.0
+QTAPNG=1.3.0
+KDDOCKWIDGETS=2.3.0
+PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
-RAPIDYAML=0.12.1

-SHADERC=2026.2
-SHADERC_GLSLANG=275822a6261ee689aadb1da5f09a0ec2f058685c
-SHADERC_SPIRVHEADERS=58006c901d1d5c37dece6b6610e9af87fa951375
-SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73
+SHADERC=2025.3
+SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

 mkdir -p deps-build
 cd deps-build
@@ -84,72 +77,66 @@ CMAKE_ARCH_X64=-DCMAKE_OSX_ARCHITECTURES="x86_64"
 CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
 CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"

-grep . > SHASUMS <<EOF
-d9594a31228aa23ad6b531719a29b45f0f3989fe6c136d45767ea179f233c1ac  qtbase-everywhere-src-$QT.tar.xz
-b2bf6c6845ac175ed7f819145483ba4676f617aaa6a5012c8efee63c8bbac413  qtimageformats-everywhere-src-$QT.tar.xz
-7f3cf02f4824bf03c2c5859ea6db173bf1482a1daf24e6cdf7bc78cfa26a8a94  qtsvg-everywhere-src-$QT.tar.xz
-8e61835a679c93fa9c6065b142353c2071ba68e297898937c32a03777fcaf50d  qttools-everywhere-src-$QT.tar.xz
-37c02c81206594c7bb4edca85ac93e8e55a9836b70c960fde6cb0f8623ec5677  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
-36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f  freetype-$FREETYPE.tar.xz
-f07b958a9ac5020fb7a44cadb957f658b2149c3c8abb4f63145fac9303249db7  $SDL.tar.gz
-c652d5d94971031654ab3989891a490a895d3e3f2b71171c62692b28e94b1b93  harfbuzz-$HARFBUZZ.tar.gz
+cat > SHASUMS <<EOF
+32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
+c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
+81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775  libpng-$LIBPNG.tar.xz
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0  libpng-$LIBPNG-apng.patch.gz
-6f30092cef9fb839779646608f4ee14ae3cbac989c47fa05e841b0841f09878e  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  MoltenVK-$MOLTENVK.tar.gz
-5cd9495d9316cf6cc937bb328a7fd491c3248ef2469cfa42511f1039f6148aca  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
+8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d  qtbase-everywhere-src-$QT.tar.xz
+64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea  qtimageformats-everywhere-src-$QT.tar.xz
+5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533  qtsvg-everywhere-src-$QT.tar.xz
+d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a  qttools-everywhere-src-$QT.tar.xz
+326e8253cfd0cb5745238117f297da80e30ce8f4c1db81990497bd388b026cde  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
+9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-e9efcdd17f86287748793cf21d106e461fcad8d103a3e5a23632afe93828660d  rapidyaml-$RAPIDYAML-src.tgz
-
-f924178e75e3293082481b25ed64d5e48a795b479dac3bd3c83d23070855df42  shaderc-$SHADERC.tar.gz
-971848a1cc639ce8dc244e778b17efe0f690e32ac398a75e31d1c67ad06d3e0a  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-a6cb1b300bb8171795e116457e858e555334749f9cacaed8068ae0ef8681110c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-e156be0bd81c8812f1bff8e520422bfa9df61b3045587b9eb483185f1074a7b2  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
-	curl -L \
-		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
-		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.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/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" \
-		-O "https://github.com/KhronosGroup/MoltenVK/archive/v$MOLTENVK/MoltenVK-$MOLTENVK.tar.gz" \
-		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-		-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 "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
-		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
-		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
-		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
-		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
-		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
-		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
-fi
+curl -C - -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://libsdl.org/release/$SDL.tar.gz" \
+	-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" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
+	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+	-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" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
+	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.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 --strict SHASUMS
+shasum -a 256 --check SHASUMS

 echo "Installing SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
+cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -163,7 +150,7 @@ if [ "$BUILD_FFMPEG" -ne 0 ]; then
 	cd build
 	LDFLAGS="-dead_strip $LDFLAGS" CFLAGS="-Os $CFLAGS" CXXFLAGS="-Os $CXXFLAGS" \
 		../configure --prefix="$INSTALLDIR" \
-		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' \
+		--enable-cross-compile --arch=x86_64 --cc='clang -arch x86_64' --cxx='clang++ -arch x86_64' --disable-x86asm \
 		--disable-all --disable-autodetect --disable-static --enable-shared \
 		--enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale \
 		--enable-audiotoolbox --enable-videotoolbox \
@@ -218,7 +205,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
+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
@@ -270,7 +257,7 @@ echo "Building HarfBuzz..."
 rm -fr "harfbuzz-$HARFBUZZ"
 tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
-cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
+cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
 cmake --build build --parallel
 cmake --install build
 cd ..
@@ -287,10 +274,10 @@ cd ..
 # MoltenVK already builds universal binaries, nothing special to do here.
 echo "Installing MoltenVK..."
 rm -fr "MoltenVK-${MOLTENVK}"
-tar xf "MoltenVK-$MOLTENVK.tar.gz"
+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 ..

@@ -301,8 +288,6 @@ cd "qtbase-everywhere-src-$QT"

 # Patch Qt to support macOS 11
 patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
-# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
-patch -p1 < "$SCRIPTDIR/qt110-xcode264.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.
@@ -432,15 +417,6 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..

-echo "Building RapidYAML..."
-rm -fr "rapidyaml-$RAPIDYAML-src"
-tar xf "rapidyaml-$RAPIDYAML-src.tgz"
-cd "rapidyaml-$RAPIDYAML-src"
-cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-
 echo "Cleaning up..."
 cd ..
 rm -rf deps-build
@@ -20,28 +20,26 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.11.1
-QTAPNG=1.3.0
-
-FREETYPE=2.14.3
-SDL=SDL3-3.4.12
-HARFBUZZ=14.2.0
+FREETYPE=2.14.1
+HARFBUZZ=12.0.0
+SDL=SDL3-3.2.24
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.58
-LIBJPEGTURBO=3.2.0
+LIBPNG=1.6.50
+LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
-FFMPEG=8.1
-MOLTENVK=1.4.1
-KDDOCKWIDGETS=2.4.1
-PLUTOVG=1.3.2
+FFMPEG=8.0
+MOLTENVK=1.2.9
+QT=6.10.0
+QTAPNG=1.3.0
+KDDOCKWIDGETS=2.3.0
+PLUTOVG=1.3.1
 PLUTOSVG=0.0.7
-RAPIDYAML=0.12.1

-SHADERC=2026.2
-SHADERC_GLSLANG=275822a6261ee689aadb1da5f09a0ec2f058685c
-SHADERC_SPIRVHEADERS=58006c901d1d5c37dece6b6610e9af87fa951375
-SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73
+SHADERC=2025.3
+SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

 mkdir -p deps-build
 cd deps-build
@@ -60,72 +58,66 @@ CMAKE_COMMON=(
 	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
 )

-grep . > SHASUMS <<EOF
-d9594a31228aa23ad6b531719a29b45f0f3989fe6c136d45767ea179f233c1ac  qtbase-everywhere-src-$QT.tar.xz
-b2bf6c6845ac175ed7f819145483ba4676f617aaa6a5012c8efee63c8bbac413  qtimageformats-everywhere-src-$QT.tar.xz
-7f3cf02f4824bf03c2c5859ea6db173bf1482a1daf24e6cdf7bc78cfa26a8a94  qtsvg-everywhere-src-$QT.tar.xz
-8e61835a679c93fa9c6065b142353c2071ba68e297898937c32a03777fcaf50d  qttools-everywhere-src-$QT.tar.xz
-37c02c81206594c7bb4edca85ac93e8e55a9836b70c960fde6cb0f8623ec5677  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
-36bc4f1cc413335368ee656c42afca65c5a3987e8768cc28cf11ba775e785a5f  freetype-$FREETYPE.tar.xz
-f07b958a9ac5020fb7a44cadb957f658b2149c3c8abb4f63145fac9303249db7  $SDL.tar.gz
-c652d5d94971031654ab3989891a490a895d3e3f2b71171c62692b28e94b1b93  harfbuzz-$HARFBUZZ.tar.gz
+cat > SHASUMS <<EOF
+32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
+c4a398539c3e0fdc9a82dfe7824d0438cae78c1e2124e7c6ada3dfa600cdb6c8  harfbuzz-$HARFBUZZ.tar.gz
+81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76  $SDL.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775  libpng-$LIBPNG.tar.xz
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0  libpng-$LIBPNG-apng.patch.gz
-6f30092cef9fb839779646608f4ee14ae3cbac989c47fa05e841b0841f09878e  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-5cd9495d9316cf6cc937bb328a7fd491c3248ef2469cfa42511f1039f6148aca  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165  libpng-$LIBPNG-apng.patch.gz
+8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d  qtbase-everywhere-src-$QT.tar.xz
+64450a52507c540de53616ed5e516df0e0905a99d3035ddfaa690f2b3f7c0cea  qtimageformats-everywhere-src-$QT.tar.xz
+5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533  qtsvg-everywhere-src-$QT.tar.xz
+d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a  qttools-everywhere-src-$QT.tar.xz
+326e8253cfd0cb5745238117f297da80e30ce8f4c1db81990497bd388b026cde  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
+a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937  shaderc-$SHADERC.tar.gz
+9427deccbdf4bde6a269938df38c6bd75247493786a310d8d733a2c82065ef47  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
+c2225a49c3d7efa5c4f4ce4a6b42081e6ea3daca376f3353d9d7c2722d77a28a  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
+44d1005880c583fc00a0fb41c839214c68214b000ea8dcb54d352732fee600ff  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+843baf9e1812c1ab82fd81d85b57cbc0d29bb43245efeb2539039780004b1056  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+bea672eb96ee36c2cbeb911b9bac66dfe989b3ad9a9943101e00aeb2df2aefdb  plutovg-$PLUTOVG.tar.gz
 78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-e9efcdd17f86287748793cf21d106e461fcad8d103a3e5a23632afe93828660d  rapidyaml-$RAPIDYAML-src.tgz
-
-f924178e75e3293082481b25ed64d5e48a795b479dac3bd3c83d23070855df42  shaderc-$SHADERC.tar.gz
-971848a1cc639ce8dc244e778b17efe0f690e32ac398a75e31d1c67ad06d3e0a  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-a6cb1b300bb8171795e116457e858e555334749f9cacaed8068ae0ef8681110c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-e156be0bd81c8812f1bff8e520422bfa9df61b3045587b9eb483185f1074a7b2  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
 EOF

-if ! shasum -sa 256 --check SHASUMS 2> /dev/null; then
-	curl -L \
-		-O "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz" \
-		-O "https://github.com/harfbuzz/harfbuzz/archive/$HARFBUZZ/harfbuzz-$HARFBUZZ.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/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" \
-		-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
-		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
-		-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
-		-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 "https://github.com/jurplel/QtApng/archive/$QTAPNG/QtApng-$QTAPNG.tar.gz" \
-		-O "https://github.com/google/shaderc/archive/v$SHADERC/shaderc-$SHADERC.tar.gz" \
-		-O "https://github.com/KhronosGroup/glslang/archive/$SHADERC_GLSLANG/shaderc-glslang-$SHADERC_GLSLANG.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Headers/archive/$SHADERC_SPIRVHEADERS/shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz" \
-		-O "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS/shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" \
-		-O "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS/KDDockWidgets-$KDDOCKWIDGETS.tar.gz" \
-		-O "https://github.com/sammycage/plutovg/archive/v$PLUTOVG/plutovg-$PLUTOVG.tar.gz" \
-		-O "https://github.com/sammycage/plutosvg/archive/v$PLUTOSVG/plutosvg-$PLUTOSVG.tar.gz" \
-		-O "https://github.com/biojppm/rapidyaml/releases/download/v$RAPIDYAML/rapidyaml-$RAPIDYAML-src.tgz"
-fi
+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://libsdl.org/release/$SDL.tar.gz" \
+	-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" \
+	-O "https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/v$MOLTENVK.tar.gz" \
+	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
+	-O "https://download.qt.io/archive/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
+	-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" \
+	-o "shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz" "https://github.com/KhronosGroup/SPIRV-Tools/archive/$SHADERC_SPIRVTOOLS.tar.gz" \
+	-o "KDDockWidgets-$KDDOCKWIDGETS.tar.gz" "https://github.com/KDAB/KDDockWidgets/archive/v$KDDOCKWIDGETS.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 --strict SHASUMS
+shasum -a 256 --check SHASUMS

 echo "Installing SDL..."
 rm -fr "$SDL"
 tar xf "$SDL.tar.gz"
 cd "$SDL"
-cmake -B build "${CMAKE_COMMON[@]}" -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -DBUILD_SHARED_LIBS=ON
+cmake -B build "${CMAKE_COMMON[@]}" -DSDL_X11=OFF -DBUILD_SHARED_LIBS=ON
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -170,7 +162,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
+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
@@ -211,7 +203,7 @@ echo "Building HarfBuzz..."
 rm -fr "harfbuzz-$HARFBUZZ"
 tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
-cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build
+cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build
 make -C build "-j$NPROCS"
 make -C build install
 cd ..
@@ -233,7 +225,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 ..

@@ -244,8 +236,6 @@ cd "qtbase-everywhere-src-$QT"

 # Patch Qt to support macOS 11
 patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
-# Backport fix build on Xcode 26.4 (https://codereview.qt-project.org/c/qt/qtbase/+/724619)
-patch -p1 < "$SCRIPTDIR/qt110-xcode264.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.
@@ -375,15 +365,6 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..

-echo "Building RapidYAML..."
-rm -fr "rapidyaml-$RAPIDYAML-src"
-tar xf "rapidyaml-$RAPIDYAML-src.tgz"
-cd "rapidyaml-$RAPIDYAML-src"
-cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -B build
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
-
 echo "Cleaning up..."
 cd ..
 rm -rf deps-build
@@ -1,4 +1,5 @@
 diff --git a/.cmake.conf b/.cmake.conf
+index 9a21ff42a74..d6707ba7dff 100644
 --- a/.cmake.conf
 +++ b/.cmake.conf
@@ -51,7 +51,7 @@ set(QT_MAX_NEW_POLICY_CMAKE_VERSION_QT_APPLE "3.21")
@@ -11,6 +12,7 @@ diff --git a/.cmake.conf b/.cmake.conf
 
 set(QT_SUPPORTED_MIN_IOS_SDK_VERSION "17")
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d3a14fc67eb..1553b956fe3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -12,6 +12,10 @@ cmake_minimum_required(VERSION 3.16)
@@ -25,6 +27,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 
 qt_internal_check_if_path_has_symlinks("${CMAKE_BINARY_DIR}")
 diff --git a/src/corelib/global/qsysinfo.cpp b/src/corelib/global/qsysinfo.cpp
+index ae762c0cc6d..9171a5736b4 100644
 --- a/src/corelib/global/qsysinfo.cpp
 +++ b/src/corelib/global/qsysinfo.cpp
@@ -1027,7 +1027,7 @@ QByteArray QSysInfo::machineUniqueId()
@@ -37,9 +40,10 @@ diff --git a/src/corelib/global/qsysinfo.cpp b/src/corelib/global/qsysinfo.cpp
     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
+index 9f27dbe694e..c023a48cad3 100644
 --- a/src/corelib/kernel/qcore_mac.mm
 +++ b/src/corelib/kernel/qcore_mac.mm
-@@ -367,7 +367,7 @@ bool qt_apple_runningWithLiquidGlass()
+@@ -372,7 +372,7 @@ bool qt_apple_runningWithLiquidGlass()
             return config;
 #endif
 
@@ -48,50 +52,8 @@ diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
         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
+index 6b33d94d58c..867389e4c93 100644
 --- 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.
@@ -1,25 +0,0 @@
-diff --git a/src/corelib/thread/qyieldcpu.h b/src/corelib/thread/qyieldcpu.h
-index ab710ea..954c49a 100644
--- a/src/corelib/thread/qyieldcpu.h
-+++ b/src/corelib/thread/qyieldcpu.h
-@@ -33,7 +33,9 @@
-     noexcept
- #endif
- {
-#if __has_builtin(__yield)
-+#if __has_builtin(__builtin_arm_yield)
-+    __builtin_arm_yield();
-+#elif __has_builtin(__yield)
-     __yield();              // Generic
- #elif defined(_YIELD_PROCESSOR) && defined(Q_CC_MSVC)
-     _YIELD_PROCESSOR();     // Generic; MSVC's <atomic>
-@@ -47,9 +49,6 @@
-     _mm_pause();
- #elif defined(Q_PROCESSOR_X86)
-     __asm__("pause");           // hopefully asm() works in this compiler
-
-#elif __has_builtin(__builtin_arm_yield)
-    __builtin_arm_yield();
- #elif defined(Q_PROCESSOR_ARM) && Q_PROCESSOR_ARM >= 7 && defined(Q_CC_GNU)
-     __asm__("yield");           // this works everywhere
- 
@@ -38,54 +38,39 @@ const octokit = new Octokit({
  }
 });

-let embed;
-
-if (process.env.FLATHUB_FAILURE === undefined)
-{
-  if (process.env.TAG_VAL === undefined || process.env.TAG_VAL === "") {
-    console.log(`Not announcing - TAG_VAL not defined`);
-    process.exit(1);
-  }
-
-  const { data: releaseInfo } = await octokit.rest.repos.getReleaseByTag({
-    owner: owner,
-    repo: repo,
-    tag: process.env.TAG_VAL,
-  });
-
-  if (releaseInfo === undefined) {
-    console.log(`Not announcing - could not locate release with tag ${process.env.TAG_VAL}`);
-    process.exit(1);
-  }
-
-  if (!releaseInfo.prerelease) {
-    console.log("Not announcing - release was not a pre-release (aka a Nightly)");
-    process.exit(0);
-  }
-
-  // Publish Webhook
-  embed = new MessageEmbed()
-    .setColor('#FF8000')
-    .setTitle('New PCSX2 Nightly Build Available!')
-    .setDescription("To download the latest or previous builds, [visit the official downloads page](https://pcsx2.net/downloads/).")
-    .addFields(
-      { name: 'Version', value: releaseInfo.tag_name, inline: true },
-      { name: 'Installation Steps', value: '[See Here](https://pcsx2.net/docs/category/setup)', inline: true },
-      { name: 'Included Changes', value: releaseInfo.body, inline: false }
-    );
-  console.log(embed);
+if (process.env.TAG_VAL === undefined || process.env.TAG_VAL === "") {
+  console.log(`Not announcing - TAG_VAL not defined`);
+  process.exit(1);
 }
-else
-{
-  // Flathub upload failure

-  embed = new MessageEmbed()
-    .setColor('#FF0000')
-    .setTitle('PCSX2 Failed to Build/Upload to FlatHub')
-    .setDescription("Please check the latest Flathub build job to determine the root cause.")
-  console.log(embed);
+const { data: releaseInfo } = await octokit.rest.repos.getReleaseByTag({
+  owner: owner,
+  repo: repo,
+  tag: process.env.TAG_VAL,
+});
+
+if (releaseInfo === undefined) {
+  console.log(`Not announcing - could not locate release with tag ${process.env.TAG_VAL}`);
+  process.exit(1);
 }

+if (!releaseInfo.prerelease) {
+  console.log("Not announcing - release was not a pre-release (aka a Nightly)");
+  process.exit(0);
+}
+
+// Publish Webhook
+const embed = new MessageEmbed()
+  .setColor('#FF8000')
+  .setTitle('New PCSX2 Nightly Build Available!')
+  .setDescription("To download the latest or previous builds, [visit the official downloads page](https://pcsx2.net/downloads/).")
+  .addFields(
+    { name: 'Version', value: releaseInfo.tag_name, inline: true },
+    { name: 'Installation Steps', value: '[See Here](https://pcsx2.net/docs/category/setup)', inline: true },
+    { name: 'Included Changes', value: releaseInfo.body, inline: false }
+  );
+console.log(embed);
+
 // Get all webhooks, simple comma-sep string
 const webhookUrls = process.env.DISCORD_BUILD_WEBHOOK.split(",");

@@ -2,24 +2,12 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-rem Favour VS2022 over VS2026 for now.
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-  if defined VSINSTPATH (
-    echo VSINSTPATH=!VSINSTPATH!
-    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" || goto error
-  ) else (
-    for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[18, 19)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-    if defined VSINSTPATH (
-      echo VSINSTPATH=!VSINSTPATH!
-      call "!VSINSTPATH!\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" || goto error
-    ) else (
-      echo Visual Studio not found.
-      goto error
-    )
-  )
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
 ) else (
-  echo Visual Studio not found.
+  echo Visual Studio 2022 not found.
  goto error
 )

@@ -54,60 +42,54 @@ echo INSTALLDIR=%INSTALLDIR%

 cd "%BUILDDIR%"

-set QT=6.11.1
-set QTMINOR=6.11
+set FREETYPE=2.14.1
+set HARFBUZZ=12.0.0
+set LIBJPEGTURBO=3.1.2
+set LIBPNG=1650
+set LIBPNGLONG=1.6.50
+set SDL=SDL3-3.2.24
+set QT=6.10.0
+set QTMINOR=6.10
 set QTAPNG=1.3.0
-
-set FREETYPE=2.14.3
-set HARFBUZZ=14.2.0
-set SDL=SDL3-3.4.12
-set LIBJPEGTURBO=3.2.0
-set LIBPNG=1658
-set LIBPNGLONG=1.6.58
 set LZ4=1.10.0
 set WEBP=1.6.0
-set ZLIB=1.3.2
-set ZLIBSHORT=132
+set ZLIB=1.3.1
+set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.4.1
-set PLUTOVG=1.3.2
+set KDDOCKWIDGETS=2.3.0
+set PLUTOVG=1.3.1
 set PLUTOSVG=0.0.7
-set RAPIDYAML=0.12.1

-set SHADERC=2026.2
-set SHADERC_GLSLANG=275822a6261ee689aadb1da5f09a0ec2f058685c
-set SHADERC_SPIRVHEADERS=58006c901d1d5c37dece6b6610e9af87fa951375
-set SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73
+set SHADERC=2025.3
+set SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+set SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+set SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

-set AGILITYSDK=1.619.2
-
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 3529cc37297a5a7aae4486843b9fd41c30df1d79a770f85e240b537dcc327ca5 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 37fba768f2780580dfae535ad6654cb9dc0bf2272e71b9b9781988de9ed0dac0 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 767730188d4610a89bf8da502f87acf1c8881a3ac54f1e0eb167ab1e08b03a75 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 2d6ed2a98f458152e3cb17bf0be0494250194933a2d937b5a434e5b2006efca9 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" eef43700ffd079f5893e435aca1330c8bdbf2a94ae45013e3fc63870df53d3b0 || 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 e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip bb2f83255706b1c92d731541c7cefaf98bb5b93e8f76d16f6deda05225ff20ee || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1658.zip b32f170855dbbe3e6d9e645af40b538137041773672c3ba3e02db5816c82d376 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0 || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 6f30092cef9fb839779646608f4ee14ae3cbac989c47fa05e841b0841f09878e || goto error
+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 0f3e036294974736982d8ec00f0bed763cd9f75ab9eacf8effe413af5d78ef06 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
+call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165 || 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" 3d4de8967a49c0451e775a0c1e9022092c19fdef41ba38a83fcf031c5a6496e2 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95 || goto error
+call :downloadfile "SDL-7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch" https://github.com/libsdl-org/SDL/commit/7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch 5c09a29a9cac87a85ec3b8f5a68ff0e5c6c47229f3e2282241b9c32166f26977 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" d3b5379edcace266273d789249b6d68ae9495ec1b0b562ba6d039034cd315d8e || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" ac2fe34a9f1c1451b6785474e9b1b64eb59edef6553be3d630240f16a730456d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" c12f8bfb617e4a03da104be36f6966ba7f64bee331f0095da1a649a1149796d2 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" c6d0f0a512304ad87b20f5ff604442dd8d55769d659576ecfe5462fcd7bb9b7d || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" e6cc1ebf62cf37d81f3b86990086108518037bb383e75da327f297cc4fc1ae36 || goto error
+call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || 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" e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28 || 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" 6f803c533e95687b3cf968ea851fb9b04e253b32e02b5a40a1542cf202dcd9d1 || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || 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%" eb92d90bb23b2ec23410c41d791e41dbdbec942ab946924d1fdcb31eac6f0735 || goto error
-call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 96276f55b9fa7837ac8f3f72fd52965879cbb5d5d2e6af548c69a177fb078304 || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" f9401cc5cb36c276cd1e072b6595dbd728148e8dba389e50f7339e2d388dbc08 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 2b63189efad0348d88d410a5e12ec550a612e0b6ceef64624b8f45491269fb9c || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" d2f071e94c081f5a4606559770ebf1f7d1eac92a1def0c3e10609844aa8b69b2 || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 4011be89aa73e3461c9deef73936a62c79a3097590c5135d058041cc9fb99c6f || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 77d2425458bca62c16b1ed49ed02de4c4114a113781bd94c1961b273bdca00fb || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" ebd389bf79c17d79d999b3e9756359945020bbef799537aa96d8900464c373c5 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 6b954cb358a43915a54b6ca7a27db11b15c4f6e9ec547ab4cad71857354692bc || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 00c4fa1a26de21c7c8db6947e06094a338e7d4edf972bc70d30afea9315373f2 || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -171,7 +153,7 @@ echo Building HarfBuzz...
 rmdir /S /Q "harfbuzz-%HARFBUZZ%"
 %SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
 cd "harfbuzz-%HARFBUZZ%" || goto error
-cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build -G Ninja || goto error
+cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -207,7 +189,8 @@ echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -G Ninja || goto error
+%PATCH% -p1 < "..\SDL-7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch" || goto error
+cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error
@@ -223,7 +206,7 @@ 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
-cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %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 -DQT_FEATURE_windows_ioring=OFF %QTBUILDSPEC% || goto error
+cmake -B build %ARM64TOOLCHAIN% -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DQT_HOST_PATH="%X64INSTALLDIR%" %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
 cd .. || goto error
@@ -283,7 +266,7 @@ 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 -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
@@ -324,29 +307,6 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

-echo "Building RapidYAML..."
-rmdir /S /Q "rapidyaml-%RAPIDYAML%-src"
-%SEVENZIP% x "rapidyaml-%RAPIDYAML%-src.zip" || goto error
-cd "rapidyaml-%RAPIDYAML%-src" || goto error
-cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -B build -G Ninja || goto error
-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
@@ -2,32 +2,17 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-rem Favour VS2022 over VS2026 for now.
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-  if defined VSINSTPATH (
-    echo VSINSTPATH=!VSINSTPATH!
-    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvars64.bat" || goto error
-  ) else (
-    for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[18, 19)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-    if defined VSINSTPATH (
-      echo VSINSTPATH=!VSINSTPATH!
-      call "!VSINSTPATH!\VC\Auxiliary\Build\vcvars64.bat" || goto error
-    ) else (
-      echo Visual Studio not found.
-      goto error
-    )
-  )
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 ) else (
-  echo Visual Studio not found.
+  echo Visual Studio 2022 not found.
  goto error
 )

 set SEVENZIP="C:\Program Files\7-Zip\7z.exe"
 set PATCH="C:\Program Files\Git\usr\bin\patch.exe"
-set BASH="C:\Program Files\Git\usr\bin\bash.exe"
-
-set "UNIX_TOOLS=C:\Program Files\Git\usr\bin\"

 if defined DEBUG (
  echo DEBUG=%DEBUG%
@@ -35,12 +20,6 @@ if defined DEBUG (
  set DEBUG=1
 )

-if defined BUILD_FFMPEG (
-  echo BUILD_FFMPEG=%BUILD_FFMPEG%
-) else (
-  set BUILD_FFMPEG=0
-)
-
 pushd %~dp0
 set "SCRIPTDIR=%CD%"
 cd ..\..\..\..
@@ -61,82 +40,54 @@ set "PATH=%PATH%;%INSTALLDIR%\bin"

 cd "%BUILDDIR%"

-set QT=6.11.1
-set QTMINOR=6.11
+set FREETYPE=2.14.1
+set HARFBUZZ=12.0.0
+set LIBJPEGTURBO=3.1.2
+set LIBPNG=1650
+set SDL=SDL3-3.2.24
+set LIBPNGLONG=1.6.50
+set QT=6.10.0
+set QTMINOR=6.10
 set QTAPNG=1.3.0
-
-set FFMPEG=8.1
-set MESON=1.10.2
-set PKGCONF=2.5.1
-set AMF=1.5.0
-set LIBVPL=2.16.0
-set NVENC=13.0.19.0
-set LIBOPUS=1.6.1
-set LIBSVTAV1=4.0.1
-set LIBX264=b35605ace3ddf7c1a5d67a2eb553f034aef41d55
-
-set FREETYPE=2.14.3
-set HARFBUZZ=14.2.0
-set SDL=SDL3-3.4.12
-set LIBJPEGTURBO=3.2.0
-set LIBPNG=1658
-set LIBPNGLONG=1.6.58
 set LZ4=1.10.0
 set WEBP=1.6.0
-set ZLIB=1.3.2
-set ZLIBSHORT=132
+set ZLIB=1.3.1
+set ZLIBSHORT=131
 set ZSTD=1.5.7
-set KDDOCKWIDGETS=2.4.1
-set PLUTOVG=1.3.2
+set KDDOCKWIDGETS=2.3.0
+set PLUTOVG=1.3.1
 set PLUTOSVG=0.0.7
-set RAPIDYAML=0.12.1

-set SHADERC=2026.2
-set SHADERC_GLSLANG=275822a6261ee689aadb1da5f09a0ec2f058685c
-set SHADERC_SPIRVHEADERS=58006c901d1d5c37dece6b6610e9af87fa951375
-set SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73
+set SHADERC=2025.3
+set SHADERC_GLSLANG=efd24d75bcbc55620e759f6bf42c45a32abac5f8
+set SHADERC_SPIRVHEADERS=2a611a970fdbc41ac2e3e328802aed9985352dca
+set SHADERC_SPIRVTOOLS=33e02568181e3312f49a3cf33df470bf96ef293a

-set AGILITYSDK=1.619.2
-set DXHEADERS=1.619.1
-
-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 3529cc37297a5a7aae4486843b9fd41c30df1d79a770f85e240b537dcc327ca5 || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 37fba768f2780580dfae535ad6654cb9dc0bf2272e71b9b9781988de9ed0dac0 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" 767730188d4610a89bf8da502f87acf1c8881a3ac54f1e0eb167ab1e08b03a75 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" 2d6ed2a98f458152e3cb17bf0be0494250194933a2d937b5a434e5b2006efca9 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" eef43700ffd079f5893e435aca1330c8bdbf2a94ae45013e3fc63870df53d3b0 || goto error
-call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
-
-call :downloadfile "ffmpeg-%FFMPEG%.tar.xz" "https://ffmpeg.org/releases/ffmpeg-%FFMPEG%.tar.xz" b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a || goto error
-call :downloadfile "meson-%MESON%.tar.gz" "https://github.com/mesonbuild/meson/releases/download/%MESON%/meson-%MESON%.tar.gz" 7890287d911dd4ee1ebd0efb61ed0321bfcd87c725df923a837cf90c6508f96b || goto error
-call :downloadfile "pkgconf-pkgconf-%PKGCONF%.zip" "https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-%PKGCONF%.zip" c5b5f88a2ca2324dc5d857e35bb145e24290e326357ea94a86d47b8d7fa15477 || goto error
-call :downloadfile "amf-headers-v%AMF%.tar.gz" "https://github.com/GPUOpen-LibrariesAndSDKs/AMF/releases/download/v%AMF%/AMF-headers-v%AMF%.tar.gz" d569647fa26f289affe81a206259fa92f819d06db1e80cc334559953e82a3f01 || goto error
-call :downloadfile "libvpl-%LIBVPL%.zip" "https://github.com/intel/libvpl/archive/v%LIBVPL%.zip" 0b2ee8da8b9ef07ed4b52bf9ddee05008ec999b7c3c41944d7a9f804631c398e || goto error
-call :downloadfile "nv-codec-headers-%NVENC%.tar.gz" "https://github.com/FFmpeg/nv-codec-headers/releases/download/n%NVENC%/nv-codec-headers-%NVENC%.tar.gz" 13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee || goto error
-call :downloadfile "opus-%LIBOPUS%.tar.gz" "https://downloads.xiph.org/releases/opus/opus-%LIBOPUS%.tar.gz" 6ffcb593207be92584df15b32466ed64bbec99109f007c82205f0194572411a1 || goto error
-call :downloadfile "SVT-AV1-v%LIBSVTAV1%.zip" "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v%LIBSVTAV1%/SVT-AV1-v%LIBSVTAV1%.zip" bfafad9af17f87fff75e44ca9b2c10cdd83c576047c3e96229285a8a64c81afc || goto error
-call :downloadfile "x264-%LIBX264%.zip" "https://code.videolan.org/videolan/x264/-/archive/%LIBX264%.zip" d95d059eff81cc565165cd058b66e208f0cc9874106a8fe94a811a66cf8a85a2 || goto error
-
-call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 || goto error
-call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip bb2f83255706b1c92d731541c7cefaf98bb5b93e8f76d16f6deda05225ff20ee || goto error
-call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1658.zip b32f170855dbbe3e6d9e645af40b538137041773672c3ba3e02db5816c82d376 || goto error
-call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0 || goto error
-call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 6f30092cef9fb839779646608f4ee14ae3cbac989c47fa05e841b0841f09878e || goto error
+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 0f3e036294974736982d8ec00f0bed763cd9f75ab9eacf8effe413af5d78ef06 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
+call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net/libpng-apng/libpng-%LIBPNGLONG%-apng.patch.gz 687ddc0c7cb128a3ea58e159b5129252537c27ede0c32a93f11f03127f0c0165 || 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" 3d4de8967a49c0451e775a0c1e9022092c19fdef41ba38a83fcf031c5a6496e2 || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95 || goto error
+call :downloadfile "SDL-7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch" https://github.com/libsdl-org/SDL/commit/7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch 5c09a29a9cac87a85ec3b8f5a68ff0e5c6c47229f3e2282241b9c32166f26977 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" d3b5379edcace266273d789249b6d68ae9495ec1b0b562ba6d039034cd315d8e || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" ac2fe34a9f1c1451b6785474e9b1b64eb59edef6553be3d630240f16a730456d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" c12f8bfb617e4a03da104be36f6966ba7f64bee331f0095da1a649a1149796d2 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" c6d0f0a512304ad87b20f5ff604442dd8d55769d659576ecfe5462fcd7bb9b7d || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" e6cc1ebf62cf37d81f3b86990086108518037bb383e75da327f297cc4fc1ae36 || goto error
+call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || 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" e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28 || 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" 6f803c533e95687b3cf968ea851fb9b04e253b32e02b5a40a1542cf202dcd9d1 || goto error
-call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 4fe4e48f28aa80171b2166d45c0976ab0f21eecedb52cd4c3ef73b5afb48fac9 || goto error
+call :downloadfile "KDDockWidgets-%KDDOCKWIDGETS%.zip" "https://github.com/KDAB/KDDockWidgets/archive/v%KDDOCKWIDGETS%.zip" d2b9592ebe5d053ac97a0213ea35139866d8d5e0a1d84b7d3fb581db7f0b01c6 || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 615184f756d91ce416f2cf883bb67fd4262651417c2e40c4d681c8641a48263e || 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%" eb92d90bb23b2ec23410c41d791e41dbdbec942ab946924d1fdcb31eac6f0735 || goto error
-call :downloadfile "DirectX-Headers-%DXHEADERS%.zip" "https://github.com/microsoft/DirectX-Headers/archive/v%DXHEADERS%.zip" 9eb8b102a90a42e4ea72a825f7d249d55ec90d164f030966c9b7784b93374927 || goto error
-call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 96276f55b9fa7837ac8f3f72fd52965879cbb5d5d2e6af548c69a177fb078304 || goto error

-call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" f9401cc5cb36c276cd1e072b6595dbd728148e8dba389e50f7339e2d388dbc08 || goto error
-call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" 2b63189efad0348d88d410a5e12ec550a612e0b6ceef64624b8f45491269fb9c || goto error
-call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" d2f071e94c081f5a4606559770ebf1f7d1eac92a1def0c3e10609844aa8b69b2 || goto error
-call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 4011be89aa73e3461c9deef73936a62c79a3097590c5135d058041cc9fb99c6f || goto error
+call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" 77d2425458bca62c16b1ed49ed02de4c4114a113781bd94c1961b273bdca00fb || goto error
+call :downloadfile "shaderc-glslang-%SHADERC_GLSLANG%.zip" "https://github.com/KhronosGroup/glslang/archive/%SHADERC_GLSLANG%.zip" ebd389bf79c17d79d999b3e9756359945020bbef799537aa96d8900464c373c5 || goto error
+call :downloadfile "shaderc-spirv-headers-%SHADERC_SPIRVHEADERS%.zip" "https://github.com/KhronosGroup/SPIRV-Headers/archive/%SHADERC_SPIRVHEADERS%.zip" 6b954cb358a43915a54b6ca7a27db11b15c4f6e9ec547ab4cad71857354692bc || goto error
+call :downloadfile "shaderc-spirv-tools-%SHADERC_SPIRVTOOLS%.zip" "https://github.com/KhronosGroup/SPIRV-Tools/archive/%SHADERC_SPIRVTOOLS%.zip" 00c4fa1a26de21c7c8db6947e06094a338e7d4edf972bc70d30afea9315373f2 || goto error

 if %DEBUG%==1 (
  echo Building debug and release libraries...
@@ -146,139 +97,6 @@ if %DEBUG%==1 (

 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"

-if %BUILD_FFMPEG%==1 (
-  if not "%INSTALLDIR%"=="%INSTALLDIR: =%" (
-    echo FFmpeg does not support building in paths with spaces.
-    goto error
-  )
-
-  where nasm /q
-  set FOUND_NASM=0
-  if !ERRORLEVEL!==0 (
-    set FOUND_NASM=1
-  )
-
-  echo "Installing AMF headers"
-  rmdir /S /Q "amf-headers-v%AMF%"
-  tar -xf "amf-headers-v%AMF%.tar.gz" || goto error
-  xcopy "%BUILDDIR%\amf-headers-v%AMF%\AMF" "%INSTALLDIR%\include\AMF\" /y /s || goto error
-  echo.
-
-  echo "Installing libvpl"
-  rmdir /S /Q "libvpl-%LIBVPL%"
-  %SEVENZIP% x "libvpl-%LIBVPL%.zip" || goto error
-  cd "libvpl-%LIBVPL%" || goto error
-  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DINSTALL_EXAMPLES=OFF -DINSTALL_LIB=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -B build -G Ninja || goto error
-  cmake --build build --parallel || goto error
-  ninja -C build install || goto error
-  cd .. || goto error
-
-  echo "Installing libopus"
-  rmdir /S /Q "opus-%LIBOPUS%"
-  tar -xf "opus-%LIBOPUS%.tar.gz" || goto error
-  cd "opus-%LIBOPUS%" || goto error
-  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -B build -G Ninja || goto error
-  cmake --build build --parallel || goto error
-  ninja -C build install || goto error
-  cd .. || goto error
-
-  echo "Installing libsvtav1"
-  rmdir /S /Q "SVT-AV1-v%LIBSVTAV1%"
-  tar -xf "SVT-AV1-v%LIBSVTAV1%.zip" || goto error
-  cd "SVT-AV1-v%LIBSVTAV1%" || goto error
-  if !FOUND_NASM!==0 (
-    set LIBSTVAV1_NASM=-DCOMPILE_C_ONLY=ON
-  )
-  cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DBUILD_APPS=OFF -DSVT_AV1_LTO=ON !LIBSTVAV1_NASM! -B build -G Ninja || goto error
-  cmake --build build --parallel || goto error
-  ninja -C build install || goto error
-  cd .. || goto error
-
-  echo "Extracting meson"
-  rmdir /S /Q "meson-%MESON%"
-  tar xf "meson-%MESON%.tar.gz" || goto error
-  set MASON_PY=python "%BUILDDIR%\meson-%MESON%\meson.py"
-  !MASON_PY! -v || goto error
-  echo.
-
-  rem Alternatively we could grab pkg-config-lite from chocolatey or WinGet.
-  echo "Installing pkgconf"
-  rmdir /S /Q "pkgconf-pkgconf-%PKGCONF%"
-  %SEVENZIP% x "pkgconf-pkgconf-%PKGCONF%.zip" || goto error
-  cd "pkgconf-pkgconf-%PKGCONF%" || goto error
-  !MASON_PY! setup --buildtype=release --prefix="%INSTALLDIR%" -Dtests=disabled build --backend=ninja || goto error
-  !MASON_PY! compile -C build || goto error
-  ninja -C build install || goto error
-  set PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  set PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  Set "PKG_CONFIG_PATH=%INSTALLDIR%\lib\pkgconfig"
-  cd .. || goto error
-
-  set "OLD_PATH=%PATH%"
-  set "PATH=%PATH%;%UNIX_TOOLS%"
-
-  echo "Installing nvenc headers..."
-  rmdir /S /Q "nv-codec-headers-%NVENC%"
-  tar xf "nv-codec-headers-%NVENC%.tar.gz" || goto error
-  make -C "nv-codec-headers-%NVENC%" PREFIX="%INSTALLDIR%" install || goto error
-  echo.
-
-  set CC=cl
-  set CXX=cl
-
-  echo "Installing libx264"
-  rmdir /S /Q "x264-%LIBX264%"
-  %SEVENZIP% x "x264-%LIBX264%.zip" || goto error
-  cd "x264-%LIBX264%" || goto error
-  if !FOUND_NASM!==0 (
-    set LIBX264_NASM=--disable-asm
-  )
-  %BASH% configure --prefix="%INSTALLDIR%" --disable-cli --enable-static --extra-cflags="-MD -w -Os -GL" !LIBX264_NASM! || goto error
-  make -j%NUMBER_OF_PROCESSORS% || goto error
-  make install || goto error
-  cd .. || goto error
-  echo.
-
-  echo "Installing FFmpeg..."
-  rmdir /S /Q "ffmpeg-%FFMPEG%"
-  tar xf "ffmpeg-%FFMPEG%.tar.xz" || goto error
-  cd "ffmpeg-%FFMPEG%"
-  %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-configure-escape.patch" || goto error
-  if not !FOUND_NASM!==1 (
-    rem MSVC LTO gives linker errors when building without nasm.
-    rem The following patches fixes that issue.
-    %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-no-nasm-fix-avc-air.patch" || goto error
-    %PATCH% -p1 < "%SCRIPTDIR%\ffmpeg-no-nasm-fix-swc-air.patch" || goto error
-    set FFMPEG_NASM=--disable-x86asm
-  )
-  rem FFmpeg's build seems to choke when extra-cflags contain `\`, so use `/` as the path separator.
-  set VULKAN_INCLUDE=%INSTALLDIR:\=/%/../3rdparty/vulkan/include
-  rem libvpl needs to have advapi32.lib & ole32.lib added as extra libs.
-  rem For some reason QSV requires the hevc parser on windows.
-  rem --enable-small removes the display names of codecs, so instead we specify optflag for minsize
-  %BASH% configure --prefix="%INSTALLDIR%" --disable-all --disable-autodetect --disable-static --enable-shared --disable-debug ^
-    --toolchain=msvc --extra-ldflags="-LTCG" --extra-libs="advapi32.lib ole32.lib" !FFMPEG_NASM! --pkg-config="%INSTALLDIR%\bin\pkgconf.exe" ^
-    --extra-cflags="-MD -GL -I!VULKAN_INCLUDE!" --extra-cxxflags="-MD -GL -I!VULKAN_INCLUDE!" --optflags="-O1" ^
-    --enable-avcodec --enable-avformat --enable-avutil --enable-swresample --enable-swscale ^
-    --enable-gpl --enable-libx264 --enable-libsvtav1 --enable-libopus --enable-vulkan --enable-ffnvcodec --enable-nvenc --enable-libvpl --enable-amf ^
-    --enable-d3d11va --enable-mediafoundation ^
-    --enable-encoder=ffv1,qtrle,libx264*,libsvtav1,aac,flac,libopus,pcm_s16be,pcm_s16le ^
-    --enable-encoder=h264_qsv,hevc_qsv,av1_qsv ^
-    --enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc ^
-    --enable-encoder=h264_amf,hevc_amf,av1_amf ^
-    --enable-encoder=h264_vulkan,hevc_vulkan,av1_vulkan ^
-    --enable-encoder=h264_mf,hevc_mf,av1_mf ^
-    --enable-parser=hevc ^
-    --enable-muxer=avi,matroska,mov,mp3,mp4,wav ^
-    --enable-protocol=file || goto error
-  make -j%NUMBER_OF_PROCESSORS% || goto error
-  make install || goto error
-  cd ..
-  echo.
-
-  set "PATH=!OLD_PATH!"
-)
-
 echo Building Zlib...
 rmdir /S /Q "zlib-%ZLIB%"
 %SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
@@ -332,7 +150,7 @@ echo Building HarfBuzz...
 rmdir /S /Q "harfbuzz-%HARFBUZZ%"
 %SEVENZIP% x "-x^!harfbuzz-%HARFBUZZ%\README" "harfbuzz-%HARFBUZZ%.zip" || goto error
 cd "harfbuzz-%HARFBUZZ%" || goto error
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_BUILD_GPU=OFF -B build -G Ninja || goto error
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error
@@ -368,7 +186,8 @@ echo Building SDL...
 rmdir /S /Q "%SDL%"
 %SEVENZIP% x "%SDL%.zip" || goto error
 cd "%SDL%" || goto error
-cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_VIDEO=OFF -DSDL_POWER=OFF -DSDL_SENSOR=OFF -DSDL_DIALOG=OFF -DSDL_TRAY=OFF -DSDL_TEST_LIBRARY=OFF -G Ninja || goto error
+%PATCH% -p1 < "..\SDL-7914bdb7ea14ee5109d50df857c8dfc69a28a62d.patch" || goto error
+cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
 copy build\SDL3.pdb "%INSTALLDIR%\bin" || goto error
@@ -384,7 +203,11 @@ 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
-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 -DQT_FEATURE_windows_ioring=OFF %QTBUILDSPEC% || goto error
+
+rem Disable the PCRE2 JIT, it doesn't properly verify AVX2 support.
+%PATCH% -p1 < "%SCRIPTDIR%\qtbase-disable-pcre2-jit.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
 cd .. || goto error
@@ -485,39 +308,6 @@ cmake --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error

-echo "Building RapidYAML..."
-rmdir /S /Q "rapidyaml-%RAPIDYAML%-src"
-%SEVENZIP% x "rapidyaml-%RAPIDYAML%-src.zip" || goto error
-cd "rapidyaml-%RAPIDYAML%-src" || goto error
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -B build -G Ninja || goto error
-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
-
-rem DirectX Headers include a CMakeList file, which is absent in the Nuget package
-echo Unpacking DirectX Headers
-rmdir /S /Q "DirectX-Headers-%DXHEADERS%"
-%SEVENZIP% x "DirectX-Headers-%DXHEADERS%.zip" || goto error
-cd "DirectX-Headers-%DXHEADERS%" || goto error
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF -B build -G Ninja || goto error
-cmake --build build --parallel || goto error
-ninja -C build install || goto error
-cd .. || goto error
-
 echo Building shaderc...
 rmdir /S /Q "shaderc-%SHADERC%"
 %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 747cbe6f40..c8a029cf19 100755
--- a/configure
-+++ b/configure
-@@ -5190,7 +5190,7 @@ probe_cc(){
-             _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); if (!match($$0, / /)) { print $$0 } }'\'' | xargs -r -d\\n -n1 wslpath -u | awk '\''BEGIN { printf "%s:", "$@" }; { sub(/\r/,""); printf " %s", $$0 }; END { print "" }'\'' > $(@:.o=.d)'
- 
-         else
-            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
-+            _DEPCMD='$(DEP$(1)) $(DEP$(1)FLAGS) $($(1)DEP_FLAGS) $< 2>&1 | awk '\''/including/ { sub(/^.*file: */, ""); gsub(/\\\\/, "/"); if (!match($$0, / /)) print "$@:", $$0 }'\'' > $(@:.o=.d)'
-         fi
-         _DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -showIncludes -Zs'
-         _cflags_speed="-O2"
@@ -1,29 +0,0 @@
-diff --git a/libavcodec/x86/lpc_init.c b/libavcodec/x86/lpc_init.c
-index f2fca53799..da2c5a526d 100644
--- a/libavcodec/x86/lpc_init.c
-+++ b/libavcodec/x86/lpc_init.c
-@@ -19,6 +19,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+#include "config.h"
- #include "libavutil/attributes.h"
- #include "libavutil/x86/asm.h"
- #include "libavutil/x86/cpu.h"
-@@ -112,9 +113,13 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
-         c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
- #endif
- 
-+#if HAVE_SSE2_EXTERNAL
-     if (EXTERNAL_SSE2(cpu_flags))
-         c->lpc_apply_welch_window = ff_lpc_apply_welch_window_sse2;
-+#endif
- 
-+#if HAVE_AVX2_EXTERNAL
-     if (EXTERNAL_AVX2(cpu_flags))
-         c->lpc_apply_welch_window = ff_lpc_apply_welch_window_avx2;
-+#endif
- }
-- 
-2.43.0.windows.1
-
@@ -1,177 +0,0 @@
-diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c
-index 48a73bd0b2..718b90ec81 100644
--- a/libswscale/x86/rgb2rgb.c
-+++ b/libswscale/x86/rgb2rgb.c
-@@ -2439,6 +2439,7 @@ av_cold void rgb2rgb_init_x86(void)
-         deinterleaveBytes = deinterleave_bytes_sse2;
-     }
- #endif
-+#if HAVE_SSE3_EXTERNAL
-     if (EXTERNAL_SSSE3(cpu_flags)) {
-         shuffle_bytes_0321 = ff_shuffle_bytes_0321_ssse3;
-         shuffle_bytes_2103 = ff_shuffle_bytes_2103_ssse3;
-@@ -2450,6 +2451,7 @@ av_cold void rgb2rgb_init_x86(void)
-         shuffle_bytes_2130 = ff_shuffle_bytes_2130_ssse3;
-         shuffle_bytes_1203 = ff_shuffle_bytes_1203_ssse3;
-     }
-+#endif
- #if HAVE_AVX_EXTERNAL
-     if (EXTERNAL_AVX(cpu_flags)) {
-         deinterleaveBytes = deinterleave_bytes_avx;
-diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
-index 8b6f9bd58a..33b9673779 100644
--- a/libswscale/x86/swscale.c
-+++ b/libswscale/x86/swscale.c
-@@ -473,6 +473,7 @@ RANGE_CONVERT_FUNCS_DECL(avx2, 16)
- 
- av_cold void ff_sws_init_range_convert_x86(SwsInternal *c)
- {
-+#if HAVE_X86ASM
-     int cpu_flags = av_get_cpu_flags();
-     if (EXTERNAL_AVX2_FAST(cpu_flags)) {
-         if (c->dstBpc <= 14) {
-@@ -485,6 +486,7 @@ av_cold void ff_sws_init_range_convert_x86(SwsInternal *c)
-     } else if (EXTERNAL_SSE4(cpu_flags) && c->dstBpc > 14) {
-         RANGE_CONVERT_FUNCS(sse4, 16);
-     }
-+#endif
- }
- 
- av_cold void ff_sws_init_swscale_x86(SwsInternal *c)
-@@ -569,6 +571,7 @@ switch(c->dstBpc){ \
-              else                ASSIGN_SCALE_FUNC2(hscalefn, X8, opt1, opt2); \
-              break; \
-     }
-+#if HAVE_SSE2_EXTERNAL
-     if (EXTERNAL_SSE2(cpu_flags)) {
-         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, sse2, sse2);
-         ASSIGN_SSE_SCALE_FUNC(c->hcScale, c->hChrFilterSize, sse2, sse2);
-@@ -607,6 +610,8 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
-+#if HAVE_SSE3_EXTERNAL
-     if (EXTERNAL_SSSE3(cpu_flags)) {
-         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, ssse3, ssse3);
-         ASSIGN_SSE_SCALE_FUNC(c->hcScale, c->hChrFilterSize, ssse3, ssse3);
-@@ -617,6 +622,8 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
-+#if HAVE_SSE4_EXTERNAL
-     if (EXTERNAL_SSE4(cpu_flags)) {
-         /* Xto15 don't need special sse4 functions */
-         ASSIGN_SSE_SCALE_FUNC(c->hyScale, c->hLumFilterSize, sse4, ssse3);
-@@ -627,7 +634,9 @@ switch(c->dstBpc){ \
-         if (c->dstBpc == 16 && !isBE(c->opts.dst_format) && !(c->opts.flags & SWS_ACCURATE_RND))
-             c->yuv2plane1 = ff_yuv2plane1_16_sse4;
-     }
-+#endif
- 
-+#if HAVE_AVX_EXTERNAL
-     if (EXTERNAL_AVX(cpu_flags)) {
-         ASSIGN_VSCALEX_FUNC(c->yuv2planeX, avx, ,
-                             HAVE_ALIGNED_STACK || ARCH_X86_64);
-@@ -657,6 +666,7 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
- 
- #if ARCH_X86_64
- #define ASSIGN_AVX2_SCALE_FUNC(hscalefn, filtersize) \
-@@ -666,6 +676,7 @@ switch(c->dstBpc){ \
-              break; \
-     }
- 
-+#if HAVE_AVX2_EXTERNAL
-     if (EXTERNAL_AVX2_FAST(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_SLOW_GATHER)) {
-         if ((c->srcBpc == 8) && (c->dstBpc <= 14)) {
-             ASSIGN_AVX2_SCALE_FUNC(c->hcScale, c->hChrFilterSize);
-@@ -697,6 +708,7 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
- 
- 
- #define INPUT_PLANER_RGB_A_FUNC_CASE_NOBREAK(fmt, name, opt)          \
-@@ -756,6 +768,7 @@ switch(c->dstBpc){ \
-         INPUT_PLANER_RGBAXX_YUVA_FUNC_CASE(AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, rgbf32, opt)
- 
- 
-+#if HAVE_SSE2_EXTERNAL
-     if (EXTERNAL_SSE2(cpu_flags)) {
-         switch (c->opts.src_format) {
-         INPUT_PLANER_RGB_A_FUNC_CASE_NOBREAK(AV_PIX_FMT_GBRAP,                         rgb, sse2);
-@@ -770,7 +783,9 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
- 
-+#if HAVE_SSE4_EXTERNAL
-     if (EXTERNAL_SSE4(cpu_flags)) {
-         switch (c->opts.src_format) {
-         case AV_PIX_FMT_GBRAP:
-@@ -785,7 +800,9 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
- 
-+#if HAVE_AVX2_EXTERNAL
-     if (EXTERNAL_AVX2_FAST(cpu_flags)) {
-         switch (c->opts.src_format) {
-         INPUT_PLANER_RGB_YUVA_ALL_CASES(avx2)
-@@ -793,6 +810,7 @@ switch(c->dstBpc){ \
-             break;
-         }
-     }
-+#endif
- 
-     if(c->opts.flags & SWS_FULL_CHR_H_INT) {
- 
-@@ -825,6 +843,7 @@ switch(c->dstBpc){ \
-         YUV2ANYX_FUNC_CASE(AV_PIX_FMT_GBRPF32BE,  gbrpf32be,  opt) \
-         YUV2ANYX_FUNC_CASE(AV_PIX_FMT_GBRAPF32BE, gbrapf32be, opt)
- 
-+#if HAVE_SSE2_EXTERNAL
-         if (EXTERNAL_SSE2(cpu_flags)) {
-             switch (c->opts.dst_format) {
-             YUV2ANYX_GBRAP_CASES(sse2)
-@@ -832,7 +851,9 @@ switch(c->dstBpc){ \
-                 break;
-             }
-         }
-+#endif
- 
-+#if HAVE_SSE4_EXTERNAL
-         if (EXTERNAL_SSE4(cpu_flags)) {
-             switch (c->opts.dst_format) {
-             YUV2ANYX_GBRAP_CASES(sse4)
-@@ -840,7 +861,9 @@ switch(c->dstBpc){ \
-                 break;
-             }
-         }
-+#endif
- 
-+#if HAVE_AVX2_EXTERNAL
-         if (EXTERNAL_AVX2_FAST(cpu_flags)) {
-             switch (c->opts.dst_format) {
-             YUV2ANYX_GBRAP_CASES(avx2)
-@@ -848,7 +871,8 @@ switch(c->dstBpc){ \
-                 break;
-             }
-         }
-+#endif
-     }
- 
-#endif
-+#endif /* ARCH_X86_64 */
- }
-- 
-2.43.0.windows.1
-
@@ -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
@@ -8,7 +8,7 @@ jobs:
    if: github.repository == 'PCSX2/pcsx2'
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/labeler@v7
+    - uses: actions/labeler@v6
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}

@@ -13,10 +13,10 @@ jobs:
  lint_vs_proj_files:
    name: Lint VS Project Files
    if: github.repository != 'PCSX2/pcsx2' || github.event_name == 'pull_request'
-    runs-on: windows-2025-vs2026
+    runs-on: windows-2025
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5
      - name: Verify VS Project Files
        run: .github\workflows\scripts\windows\validate-vs-filters.ps1

@@ -12,7 +12,7 @@ on:
      os:
        required: false
        type: string
-        default: windows-2025-vs2026
+        default: windows-2025
      platform:
        required: false
        type: string
@@ -56,17 +56,17 @@ jobs:

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v7
+        uses: actions/checkout@v5

      - name: Configure MSBuild Clang Version
        if: inputs.configuration != 'CMake'
        shell: pwsh
        run: |
          [string[]] $clang_cl = &clang-cl.exe --version
-
+          
          $version = [Regex]::Match($clang_cl[0], "(\d+\.\d+\.\d+)")
          $path = $clang_cl[3].TrimStart("InstalledDir: ").TrimEnd("\bin")
-
+          
          $output = @"
          <Project>
            <PropertyGroup>
@@ -75,9 +75,9 @@ jobs:
            </PropertyGroup>
          </Project>
          "@
-
+          
          Write-Host $output
-
+          
          $output | Out-File Directory.build.props

      # actions/checkout elides tags, fetch them primarily for releases
@@ -105,14 +105,7 @@ jobs:

      - name: Setup msbuild
        if: inputs.configuration != 'CMake'
-        uses: microsoft/setup-msbuild@v3
-
-      - name: Locate vcvars
-        if: inputs.configuration == 'CMake'
-        shell: cmd
-        run: |
-            for /f "usebackq tokens=*" %%i in (`call vswhere -latest -property installationPath`) do set "VSINSTPATH=%%i"
-            echo VCVARSPATH=%VSINSTPATH%\VC\Auxiliary\Build\vcvars64.bat>>%GITHUB_ENV%
+        uses: microsoft/setup-msbuild@v2

      - name: Download patches
        shell: cmd
@@ -122,7 +115,7 @@ jobs:

      - name: Cache Dependencies
        id: cache-deps
-        uses: actions/cache@v6
+        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') }}
@@ -131,7 +124,6 @@ jobs:
        if: steps.cache-deps.outputs.cache-hit != 'true'
        env:
          DEBUG: 0
-          BUILD_FFMPEG: 1
        run: .github/workflows/scripts/windows/build-dependencies.bat

      - name: Generate CMake
@@ -139,32 +131,30 @@ jobs:
        id: cmake
        shell: cmd
        run: |
-          call "%VCVARSPATH%" || exit /b
+          call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
          cmake . -B build ${{ inputs.cmakeFlags }} "-DCMAKE_PREFIX_PATH=%cd%\deps" -DQT_BUILD=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DDISABLE_ADVANCE_SIMD=ON -G Ninja

      - name: Build PCSX2
        shell: cmd
        run: |
          if "${{ inputs.configuration }}"=="CMake" (
-            call "%VCVARSPATH%" || exit /b
+            call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
            cmake --build build --config Release || exit /b
            cmake --install build --config Release || exit /b
          ) else (
-            msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}" || exit /b
+            msbuild "PCSX2_qt.sln" /m /v:m /p:Configuration="${{ inputs.configuration }}" /p:Platform="${{ inputs.platform }}"
          )
-          REM We can use Segoe UI Emoji so we don't need to bundle this
-          del bin\resources\fonts\Twemoji*

      - name: Run Tests
        if: inputs.configuration == 'CMake'
        shell: cmd
        run: |
-          call "%VCVARSPATH%" || exit /b
+          call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
          set PATH=%PATH%;%GITHUB_WORKSPACE%\bin
          cmake --build build --config Release --target unittests

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

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

@@ -186,9 +176,9 @@ jobs:
        shell: pwsh
        run: |
          mkdir -Force symbols
-          Get-ChildItem -Path ./bin -Recurse -File | Where-Object {
-            ($_.Extension -eq ".exe" -or $_.Extension -eq ".pdb") -and ($_.Name -notmatch "updater")
-          } | ForEach-Object {
+          Get-ChildItem -Path ./bin -Recurse -File | Where-Object { 
+            ($_.Extension -eq ".exe" -or $_.Extension -eq ".pdb") -and ($_.Name -notmatch "updater") 
+          } | ForEach-Object { 
            & dump_syms $_.FullName >> symbols/pcsx2-qt.bpsym
          }
          Get-ChildItem -Path ./bin -Recurse -Filter "*.pdb" | ForEach-Object {
@@ -196,7 +186,7 @@ jobs:
          }

      - name: Upload artifact - with symbols
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
          path: |
@@ -63,9 +63,6 @@ oprofile_data/
 *.kdev4
 /.kdev4*

-# Kate Projects
-.kateproject*
-
 # Resources and docs in /bin are tracked
 /bin/**/*.dll
 /bin/**/*.dmp
@@ -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>
@@ -11,10 +11,6 @@ obj/
 *.pyc
 *.pyo

-# Bazel-related files
-bazel-*
-MODULE.bazel.lock
-
 # System files
 .DS_Store
 .DS_Store?
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.18 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)

 # ---[ Setup project
 PROJECT(
@@ -42,7 +42,7 @@ ENDMACRO()

 MACRO(CPUINFO_TARGET_ENABLE_CXX11 target)
  SET_TARGET_PROPERTIES(${target} PROPERTIES
-    CXX_STANDARD 17
+    CXX_STANDARD 14
    CXX_EXTENSIONS NO)
 ENDMACRO()

@@ -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)
@@ -155,17 +155,15 @@ executable(

 This project can be built using [Bazel](https://bazel.build/install). 

-You can also use this library as a dependency to your Bazel project. Add to your `MODULE.bazel` file:
+You can also use this library as a dependency to your Bazel project. Add to the `WORKSPACE` file:

 ```python
-# fetch cpuinfo from Bazel Central Registry: https://registry.bazel.build/modules/cpuinfo
-bazel_dep(name = "cpuinfo", version = "0.0.0-20250925-877328f")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

-# Optional: Override it with some specific commit hash
-git_override(
-    module_name = "cpuinfo",
-    commit = "<replace_with_commit_hash>"
-    remote = "https://github.com/pytorch/cpuinfo.git",
+git_repository(
+    name = "org_pytorch_cpuinfo",
+    branch = "master",
+    remote = "https://github.com/Vertexwahn/cpuinfo.git",
 )
 ```

@@ -178,7 +176,7 @@ cc_binary(
        # ...
    ],
    deps = [
-        "@cpuinfo",
+        "@org_pytorch_cpuinfo//:cpuinfo",
    ],
 )
 ```
@@ -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 ""
@@ -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 ""
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)

 INCLUDE(GNUInstallDirs)

@@ -355,14 +355,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_sunny_cove = 0x0010020C,
 	/** Intel Willow Cove microarchitecture (10 nm, Tiger Lake). */
 	cpuinfo_uarch_willow_cove = 0x0010020D,
-	/** Intel Golden Cove microarchitecture (Sapphire Rapids). */
-	cpuinfo_uarch_golden_cove = 0x0010020E,
-	/** Intel Raptor Cove microarchitecture (Emerald Rapids). */
-	cpuinfo_uarch_raptor_cove = 0x0010020F,
-	/** Intel Redwood Cove microarchitecture (Granite Rapids). */
-	cpuinfo_uarch_redwood_cove = 0x00100210,
-	/** Intel Coyote Cove microarchitecture. */
-	cpuinfo_uarch_coyote_cove = 0x00100211,

 	/** Pentium 4 with Willamette, Northwood, or Foster cores. */
 	cpuinfo_uarch_willamette = 0x00100300,
@@ -381,14 +373,10 @@ 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 Gracemont microarchitecture (Twin Lake). */
+	cpuinfo_uarch_gracemont = 0x00100406,
 	/** Intel Crestmont microarchitecture (Sierra Forest). */
-	cpuinfo_uarch_crestmont = 0x00100408,
-	/** Intel Darkmont microarchitecture (e-core used in Clearwater Forest). */
-	cpuinfo_uarch_darkmont = 0x00100409,
+	cpuinfo_uarch_crestmont = 0x00100407,

 	/** Intel Knights Ferry HPC boards. */
 	cpuinfo_uarch_knights_ferry = 0x00100500,
@@ -400,6 +388,8 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_knights_hill = 0x00100503,
 	/** Intel Knights Mill Xeon Phi. */
 	cpuinfo_uarch_knights_mill = 0x00100504,
+	/** Intel Darkmont microarchitecture (e-core used in Clearwater Forest). */
+	cpuinfo_uarch_darkmont = 0x00100505,

 	/** Intel/Marvell XScale series. */
 	cpuinfo_uarch_xscale = 0x00100600,
@@ -439,8 +429,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_zen4 = 0x0020010C,
 	/** AMD Zen 5 microarchitecture. */
 	cpuinfo_uarch_zen5 = 0x0020010D,
-	/** AMD Zen 6 microarchitecture. */
-	cpuinfo_uarch_zen6 = 0x0020010E,

 	/** NSC Geode and AMD Geode GX and LX. */
 	cpuinfo_uarch_geode = 0x00200200,
@@ -520,32 +508,17 @@ 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,
 	/** ARM Cortex-A520. */
 	cpuinfo_uarch_cortex_a520 = 0x00300552,
-	/** ARM Cortex-A320. */
-	cpuinfo_uarch_cortex_a320 = 0x00300553,
 	/** ARM Cortex-A710. */
 	cpuinfo_uarch_cortex_a710 = 0x00300571,
 	/** ARM Cortex-A715. */
 	cpuinfo_uarch_cortex_a715 = 0x00300572,
 	/** ARM Cortex-A720. */
 	cpuinfo_uarch_cortex_a720 = 0x00300573,
-	/** ARM Cortex-A725. */
-	cpuinfo_uarch_cortex_a725 = 0x00300574,
-
-	/** ARM Lumex-C1-Ultra. */
-	cpuinfo_uarch_lumex_c1_ultra = 0x00300600,
-	/** ARM Lumex-C1-Premium. */
-	cpuinfo_uarch_lumex_c1_premium = 0x00300601,
-	/** ARM Lumex-C1-Pro. */
-	cpuinfo_uarch_lumex_c1_pro = 0x00300602,
-	/** ARM Lumex-C1-Nano. */
-	cpuinfo_uarch_lumex_c1_nano = 0x00300603,

 	/** Qualcomm Scorpion. */
 	cpuinfo_uarch_scorpion = 0x00400100,
@@ -559,8 +532,6 @@ enum cpuinfo_uarch {
 	cpuinfo_uarch_saphira = 0x00400104,
 	/** Qualcomm Oryon. */
 	cpuinfo_uarch_oryon = 0x00400105,
-	/** Qualcomm Oryon V3. */
-	cpuinfo_uarch_oryon_v3 = 0x00400106,

 	/** Nvidia Denver. */
 	cpuinfo_uarch_denver = 0x00500100,
@@ -635,16 +606,6 @@ enum cpuinfo_uarch {
 	/** Apple A18 pro processor (little cores). */
 	cpuinfo_uarch_tahiti_sawtooth = 0x00700207,

-	/** Apple A19 processor (big cores). */
-	cpuinfo_uarch_tilos_everest = 0x00700208,
-	/** Apple A19 processor (little cores). */
-	cpuinfo_uarch_tilos_sawtooth = 0x00700209,
-
-	/** Apple M4 processor (big cores). */
-	cpuinfo_uarch_donan_everest = 0x00700308,
-	/** Apple M4 processor (little cores). */
-	cpuinfo_uarch_donan_sawtooth = 0x00700309,
-
 	/** Cavium ThunderX. */
 	cpuinfo_uarch_thunderx = 0x00800100,
 	/** Cavium ThunderX2 (originally Broadcom Vulkan). */
@@ -769,7 +730,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 */
@@ -2236,12 +2197,6 @@ struct cpuinfo_riscv_isa {
 	bool c;
 	/* Vector Extension. */
 	bool v;
-
-	/* ISA Extensions */
-	/* Half-Precision Floating-Point Extension. */
-	bool zfh;
-	/* Half-Precision Floating-Point Vector Extension. */
-	bool zvfh;
 };

 extern struct cpuinfo_riscv_isa cpuinfo_isa;
@@ -2317,22 +2272,6 @@ static inline bool cpuinfo_has_riscv_v(void) {
 #endif
 }

-static inline bool cpuinfo_has_riscv_zfh(void) {
-#if CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	return cpuinfo_isa.zfh;
-#else
-	return false;
-#endif
-}
-
-static inline bool cpuinfo_has_riscv_zvfh(void) {
-#if CPUINFO_ARCH_RISCV32 || CPUINFO_ARCH_RISCV64
-	return cpuinfo_isa.zvfh;
-#else
-	return false;
-#endif
-}
-
 const struct cpuinfo_processor* CPUINFO_ABI cpuinfo_get_processors(void);
 const struct cpuinfo_core* CPUINFO_ABI cpuinfo_get_cores(void);
 const struct cpuinfo_cluster* CPUINFO_ABI cpuinfo_get_clusters(void);
@@ -1,6 +1,3 @@
-/* for syscall() */
-#define _DEFAULT_SOURCE
-
 #include <stdbool.h>
 #include <stddef.h>

@@ -13,7 +13,6 @@ enum cpuinfo_android_chipset_property {
 	cpuinfo_android_chipset_property_ro_arch,
 	cpuinfo_android_chipset_property_ro_chipname,
 	cpuinfo_android_chipset_property_ro_hardware_chipname,
-	cpuinfo_android_chipset_property_ro_soc_model,
 	cpuinfo_android_chipset_property_max,
 };

@@ -63,7 +63,4 @@ void cpuinfo_arm_android_parse_properties(struct cpuinfo_android_properties prop
 		cpuinfo_android_property_get("ro.hardware.chipname", properties->ro_hardware_chipname);
 	cpuinfo_log_debug(
 		"read ro.hardware.chipname = \"%.*s\"", ro_hardware_chipname_length, properties->ro_hardware_chipname);
-
-	const int ro_soc_model_length = cpuinfo_android_property_get("ro.soc.model", properties->ro_soc_model);
-	cpuinfo_log_debug("read ro.soc.model = \"%.*s\"", ro_soc_model_length, properties->ro_soc_model);
 }
@@ -36,7 +36,6 @@ enum cpuinfo_arm_chipset_vendor {
 	cpuinfo_arm_chipset_vendor_texas_instruments,
 	cpuinfo_arm_chipset_vendor_unisoc,
 	cpuinfo_arm_chipset_vendor_wondermedia,
-	cpuinfo_arm_chipset_vendor_google,
 	cpuinfo_arm_chipset_vendor_max,
 };

@@ -46,7 +45,6 @@ enum cpuinfo_arm_chipset_series {
 	cpuinfo_arm_chipset_series_qualcomm_msm,
 	cpuinfo_arm_chipset_series_qualcomm_apq,
 	cpuinfo_arm_chipset_series_qualcomm_snapdragon,
-	cpuinfo_arm_chipset_series_qualcomm_sm,
 	cpuinfo_arm_chipset_series_mediatek_mt,
 	cpuinfo_arm_chipset_series_samsung_exynos,
 	cpuinfo_arm_chipset_series_hisilicon_k3v,
@@ -74,7 +72,6 @@ enum cpuinfo_arm_chipset_series {
 	cpuinfo_arm_chipset_series_unisoc_t,
 	cpuinfo_arm_chipset_series_unisoc_ums,
 	cpuinfo_arm_chipset_series_wondermedia_wm,
-	cpuinfo_arm_chipset_series_google_tensor,
 	cpuinfo_arm_chipset_series_max,
 };

@@ -69,7 +69,6 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 		 * - Processors with Cortex-A77 cores
 		 * - Processors with Cortex-A78 cores
 		 * - Processors with Cortex-A510 cores
-		 * - Processors with Cortex-A520 cores
 		 * - Processors with Cortex-A710 cores
 		 * - Processors with Cortex-A715 cores
 		 * - Processors with Cortex-X1 cores
@@ -102,7 +101,6 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D470): /* Cortex-A710 */
 				case UINT32_C(0x4100D480): /* Cortex-X2 */
 				case UINT32_C(0x4100D490): /* Neoverse N2 */
-				case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
@@ -151,6 +149,8 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc T310");
 		} else if (chipset->series == cpuinfo_arm_chipset_series_unisoc_ums && chipset->model == 312) {
 			cpuinfo_log_warning("VDOT instructions disabled: cause occasional SIGILL on Unisoc UMS312");
+		} else if (chipset->vendor == cpuinfo_arm_chipset_vendor_unknown) {
+			cpuinfo_log_warning("VDOT instructions disabled: unknown chipset");
 		} else {
 			switch (midr & (CPUINFO_ARM_MIDR_IMPLEMENTER_MASK | CPUINFO_ARM_MIDR_PART_MASK)) {
 				case UINT32_C(0x4100D0B0): /* Cortex-A76 */
@@ -164,7 +164,6 @@ void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo(
 				case UINT32_C(0x4100D470): /* Cortex-A710 */
 				case UINT32_C(0x4100D480): /* Cortex-X2 */
 				case UINT32_C(0x4100D490): /* Neoverse N2 */
-				case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 				case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 				case UINT32_C(0x4100D4E0): /* Cortex-X3 */
 				case UINT32_C(0x4100D4F0): /* Neoverse V2 */
@@ -29,7 +29,6 @@ struct cpuinfo_android_properties {
 	char ro_arch[CPUINFO_BUILD_PROP_VALUE_MAX];
 	char ro_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
 	char ro_hardware_chipname[CPUINFO_BUILD_PROP_VALUE_MAX];
-	char ro_soc_model[CPUINFO_BUILD_PROP_VALUE_MAX];
 };
 #endif

@@ -365,8 +364,6 @@ CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_f
 	const char ro_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
 CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_hardware_chipname(
 	const char ro_hardware_chipname[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
-CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_soc_model(
-	const char soc_model[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]);
 #else
 CPUINFO_INTERNAL struct cpuinfo_arm_chipset cpuinfo_arm_linux_decode_chipset_from_proc_cpuinfo_revision(
 	const char proc_cpuinfo_revision[restrict static CPUINFO_REVISION_VALUE_MAX]);
@@ -264,7 +264,7 @@ static bool match_sm(const char* start, const char* end, struct cpuinfo_arm_chip
 	/* Return parsed chipset. */
 	*chipset = (struct cpuinfo_arm_chipset){
 		.vendor = cpuinfo_arm_chipset_vendor_qualcomm,
-		.series = cpuinfo_arm_chipset_series_qualcomm_sm,
+		.series = cpuinfo_arm_chipset_series_qualcomm_snapdragon,
 		.model = model,
 	};
 	return true;
@@ -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;
 	}

@@ -1314,7 +1262,7 @@ static bool match_omap(const char* start, const char* end, struct cpuinfo_arm_ch
 * ro.board.platform) to match.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 * @param[out] chipset - location where chipset information will be stored upon
 * a successful match and decoding.
 *
@@ -1607,7 +1555,7 @@ static bool match_and_parse_sunxi(
 * @param end - end of the /proc/cpuinfo Hardware string to match.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 * @param[out] chipset - location where chipset information will be stored upon
 * a successful match and decoding.
 *
@@ -2456,7 +2404,7 @@ static const struct special_map_entry tegra_hardware_map_entries[] = {
 * @param[in] platform - /proc/cpuinfo Hardware string.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -2857,7 +2805,7 @@ static const struct special_map_entry special_board_map_entries[] = {
 * @param[in] platform - ro.product.board value.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -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)) {
@@ -3162,7 +3101,7 @@ static const struct special_map_entry special_platform_map_entries[] = {
 * @param[in] platform - ro.board.platform value.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -3491,65 +3430,6 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_chipname(
 		.series = cpuinfo_arm_chipset_series_unknown,
 	};
 }
-
-/*
- * Decodes chipset name from ro.soc.model Android system property.
- *
- * @param[in] soc_model - ro.soc.model value.
- *
- * @returns Decoded chipset name. If chipset could not be decoded, the resulting
- * structure would use `unknown` vendor and series identifiers.
- */
-struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_soc_model(
-	const char soc_model[restrict static CPUINFO_BUILD_PROP_VALUE_MAX]) {
-	struct cpuinfo_arm_chipset chipset = {
-		.vendor = cpuinfo_arm_chipset_vendor_unknown,
-		.series = cpuinfo_arm_chipset_series_unknown,
-	};
-	const size_t soc_model_length = strnlen(soc_model, CPUINFO_BUILD_PROP_VALUE_MAX);
-	const char* soc_model_end = soc_model + soc_model_length;
-
-	/* Check Qualcomm SMxxxx signature */
-	if (match_sm(soc_model, soc_model_end, &chipset)) {
-		cpuinfo_log_debug(
-			"matched Qualcomm SM signature in ro.soc.model string \"%.*s\"",
-			(int)soc_model_length,
-			soc_model);
-		return chipset;
-	}
-
-	/* Check Qualcomm MSM/APQ signatures */
-	if (match_msm_apq(soc_model, soc_model_end, &chipset)) {
-		cpuinfo_log_debug(
-			"matched Qualcomm MSM/APQ signature in ro.soc.model string \"%.*s\"",
-			(int)soc_model_length,
-			soc_model);
-		return chipset;
-	}
-
-	if (soc_model[0] != '\0') {
-		if (strncmp(soc_model, "Tensor", 6) == 0) {
-			chipset.vendor = cpuinfo_arm_chipset_vendor_google;
-			chipset.series = cpuinfo_arm_chipset_series_google_tensor;
-			const char* suffix_start = soc_model + 6;
-			while (*suffix_start == ' ') {
-				suffix_start++;
-			}
-			const size_t suffix_length = strnlen(suffix_start, CPUINFO_ARM_CHIPSET_SUFFIX_MAX);
-			if (suffix_length > 0) {
-				strncpy(chipset.suffix, suffix_start, suffix_length);
-			}
-			return chipset;
-		} else if (strncmp(soc_model, "GS201", 5) == 0) {
-			chipset.vendor = cpuinfo_arm_chipset_vendor_google;
-			chipset.series = cpuinfo_arm_chipset_series_google_tensor;
-			strncpy(chipset.suffix, "G2", 2);
-			return chipset;
-		}
-	}
-
-	return chipset;
-}
 #endif /* __ANDROID__ */

 /*
@@ -3558,7 +3438,7 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_soc_model(
 * @param[in,out] chipset - chipset name to fix.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 */
 void cpuinfo_arm_fixup_chipset(
 	struct cpuinfo_arm_chipset chipset[restrict static 1],
@@ -3887,7 +3767,6 @@ static const char* chipset_vendor_string[cpuinfo_arm_chipset_vendor_max] = {
 	[cpuinfo_arm_chipset_vendor_texas_instruments] = "Texas Instruments",
 	[cpuinfo_arm_chipset_vendor_unisoc] = "Unisoc",
 	[cpuinfo_arm_chipset_vendor_wondermedia] = "WonderMedia",
-	[cpuinfo_arm_chipset_vendor_google] = "Google",
 };

 /* Map from ARM chipset series ID to its string representation */
@@ -3897,7 +3776,6 @@ static const char* chipset_series_string[cpuinfo_arm_chipset_series_max] = {
 	[cpuinfo_arm_chipset_series_qualcomm_msm] = "MSM",
 	[cpuinfo_arm_chipset_series_qualcomm_apq] = "APQ",
 	[cpuinfo_arm_chipset_series_qualcomm_snapdragon] = "Snapdragon ",
-	[cpuinfo_arm_chipset_series_qualcomm_sm] = "SM",
 	[cpuinfo_arm_chipset_series_mediatek_mt] = "MT",
 	[cpuinfo_arm_chipset_series_samsung_exynos] = "Exynos ",
 	[cpuinfo_arm_chipset_series_hisilicon_k3v] = "K3V",
@@ -3925,7 +3803,6 @@ static const char* chipset_series_string[cpuinfo_arm_chipset_series_max] = {
 	[cpuinfo_arm_chipset_series_unisoc_t] = "T",
 	[cpuinfo_arm_chipset_series_unisoc_ums] = "UMS",
 	[cpuinfo_arm_chipset_series_wondermedia_wm] = "WM",
-	[cpuinfo_arm_chipset_series_google_tensor] = "Tensor",
 };

 /* Convert chipset name represented by cpuinfo_arm_chipset structure to a string
@@ -3944,35 +3821,14 @@ void cpuinfo_arm_chipset_to_string(
 	const char* vendor_string = chipset_vendor_string[vendor];
 	const char* series_string = chipset_series_string[series];
 	const uint32_t model = chipset->model;
-	const size_t suffix_length = strnlen(chipset->suffix, CPUINFO_ARM_CHIPSET_SUFFIX_MAX);
 	if (model == 0) {
-		if (suffix_length > 0) {
-			if (series == cpuinfo_arm_chipset_series_unknown) {
-				snprintf(
-					name,
-					CPUINFO_ARM_CHIPSET_NAME_MAX,
-					"%s %.*s",
-					vendor_string,
-					(int)suffix_length,
-					chipset->suffix);
-			} else {
-				snprintf(
-					name,
-					CPUINFO_ARM_CHIPSET_NAME_MAX,
-					"%s %s %.*s",
-					vendor_string,
-					series_string,
-					(int)suffix_length,
-					chipset->suffix);
-			}
+		if (series == cpuinfo_arm_chipset_series_unknown) {
+			strncpy(name, vendor_string, CPUINFO_ARM_CHIPSET_NAME_MAX);
 		} else {
-			if (series == cpuinfo_arm_chipset_series_unknown) {
-				strncpy(name, vendor_string, CPUINFO_ARM_CHIPSET_NAME_MAX);
-			} else {
-				snprintf(name, CPUINFO_ARM_CHIPSET_NAME_MAX, "%s %s", vendor_string, series_string);
-			}
+			snprintf(name, CPUINFO_ARM_CHIPSET_NAME_MAX, "%s %s", vendor_string, series_string);
 		}
 	} else {
+		const size_t suffix_length = strnlen(chipset->suffix, CPUINFO_ARM_CHIPSET_SUFFIX_MAX);
 		snprintf(
 			name,
 			CPUINFO_ARM_CHIPSET_NAME_MAX,
@@ -4093,19 +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
@@ -4120,7 +3963,7 @@ static enum cpuinfo_arm_chipset_vendor disambiguate_chipset_vendor(
 * described above.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -4156,8 +3999,6 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset(
 			cpuinfo_arm_android_decode_chipset_from_ro_chipname(properties->ro_chipname),
 		[cpuinfo_android_chipset_property_ro_hardware_chipname] =
 			cpuinfo_arm_android_decode_chipset_from_ro_chipname(properties->ro_hardware_chipname),
-		[cpuinfo_android_chipset_property_ro_soc_model] =
-			cpuinfo_arm_android_decode_chipset_from_ro_soc_model(properties->ro_soc_model),
 	};
 	enum cpuinfo_arm_chipset_vendor vendor = cpuinfo_arm_chipset_vendor_unknown;
 	for (size_t i = 0; i < cpuinfo_android_chipset_property_max; i++) {
@@ -4168,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;
 			}
 		}
 	}
@@ -4375,7 +4207,7 @@ void cpuinfo_arm_fixup_raspberry_pi_chipset(
 * @param[in] hardware - /proc/cpuinfo Hardware string.
 * @param cores - number of cores in the chipset.
 * @param max_cpu_freq_max - maximum of
- * /sys/devices/system/cpu/cpu<number>/cpufreq/cpu_freq_max values.
+ * /sys/devices/system/cpu/cpu<number>/cpofreq/cpu_freq_max values.
 *
 * @returns Decoded chipset name. If chipset could not be decoded, the resulting
 * structure would use `unknown` vendor and series identifiers.
@@ -1,7 +1,5 @@
-#include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

@@ -16,92 +14,6 @@
 #include <cpuinfo/log.h>
 #include <linux/api.h>

-/* Parse a uint32 from sysfs file content */
-static bool uint32_parser(const char* filename, const char* text_start, const char* text_end, void* context) {
-	uint32_t* value_ptr = (uint32_t*)context;
-	if (text_start == text_end) {
-		return false;
-	}
-	uint32_t value = 0;
-	for (const char* p = text_start; p < text_end && *p >= '0' && *p <= '9'; p++) {
-		value = value * 10 + (*p - '0');
-	}
-	*value_ptr = value;
-	return value > 0;
-}
-
-/* Parse cache size with K/M suffix from /sys/devices/system/cpu/cpuN/cache/indexN/size (e.g. "2048K", "1M") */
-static bool cache_size_parser(const char* filename, const char* text_start, const char* text_end, void* context) {
-	uint32_t* size_ptr = (uint32_t*)context;
-	if (text_start == text_end) {
-		return false;
-	}
-	uint32_t value = 0;
-	const char* p = text_start;
-	while (p < text_end && *p >= '0' && *p <= '9') {
-		value = value * 10 + (*p - '0');
-		p++;
-	}
-	if (p == text_start || value == 0) {
-		return false;
-	}
-	uint32_t multiplier = 1024;
-	if (p < text_end && toupper(*p) == 'M') {
-		multiplier = 1024 * 1024;
-	}
-	*size_ptr = value * multiplier;
-	return true;
-}
-
-/* Check if /sys/devices/system/cpu/cpuN/cache/index2/shared_cpu_list indicates a single CPU (per-core cache) */
-static bool shared_cpu_list_parser(const char* filename, const char* text_start, const char* text_end, void* context) {
-	bool* is_per_core = (bool*)context;
-	for (const char* p = text_start; p < text_end; p++) {
-		if (*p == ',' || *p == '-') {
-			*is_per_core = false;
-			return true;
-		}
-	}
-	*is_per_core = (text_start != text_end);
-	return *is_per_core;
-}
-
-/*
- * Read cache size from sysfs.
- *
- * ARM CPUs lack a CPUID-equivalent instruction to query cache properties,
- * so the library relies on hardcoded values that are often incorrect.
- * Linux exposes cache topology via sysfs (existed before 2008, documented 2014):
- * https://raw.githubusercontent.com/torvalds/linux/master/Documentation/ABI/testing/sysfs-devices-system-cpu
- *
- */
-static uint32_t cpuinfo_linux_read_sysfs_cache_size(uint32_t cpu_id, uint32_t cache_level) {
-	char path[256];
-
-	/* Verify the index corresponds to the requested cache level */
-	snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%u/cache/index%u/level", cpu_id, cache_level);
-	uint32_t actual_level = 0;
-	if (!cpuinfo_linux_parse_small_file(path, 16, uint32_parser, &actual_level) || actual_level != cache_level) {
-		return 0;
-	}
-
-	snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%u/cache/index%u/size", cpu_id, cache_level);
-	uint32_t size = 0;
-	if (!cpuinfo_linux_parse_small_file(path, 32, cache_size_parser, &size)) {
-		return 0;
-	}
-	return size;
-}
-
-/* Check if L2 cache is per-core by reading sysfs shared_cpu_list */
-static bool cpuinfo_linux_is_l2_per_core(uint32_t cpu_id) {
-	char path[256];
-	snprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%u/cache/index2/shared_cpu_list", cpu_id);
-	bool is_per_core = false;
-	cpuinfo_linux_parse_small_file(path, 128, shared_cpu_list_parser, &is_per_core);
-	return is_per_core;
-}
-
 struct cpuinfo_arm_isa cpuinfo_isa = {0};

 static struct cpuinfo_package package = {{0}};
@@ -256,12 +168,12 @@ void cpuinfo_arm_linux_init(void) {
 	}

 #if defined(__ANDROID__)
-	struct cpuinfo_android_properties android_properties = {0};
+	struct cpuinfo_android_properties android_properties;
 	cpuinfo_arm_android_parse_properties(&android_properties);
 #else
-	char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX] = {0};
+	char proc_cpuinfo_hardware[CPUINFO_HARDWARE_VALUE_MAX];
 #endif
-	char proc_cpuinfo_revision[CPUINFO_REVISION_VALUE_MAX] = {0};
+	char proc_cpuinfo_revision[CPUINFO_REVISION_VALUE_MAX];

 	if (!cpuinfo_arm_linux_parse_proc_cpuinfo(
 #if defined(__ANDROID__)
@@ -807,21 +719,11 @@ void cpuinfo_arm_linux_init(void) {
 			 */
 			shared_l3 = false;
 			if (temp_l2.size != 0) {
-				/* Check if L2 is per-core using sysfs */
-				uint32_t sysfs_l2_size = cpuinfo_linux_read_sysfs_cache_size(
-					arm_linux_processors[i].system_processor_id, 2);
-				bool l2_is_per_core = (sysfs_l2_size > 0) &&
-					cpuinfo_linux_is_l2_per_core(arm_linux_processors[i].system_processor_id);
-
-				if (l2_is_per_core) {
-					/* L2 is private to each core */
+				/* Assume L2 is shared by cores in the same
+				 * cluster */
+				if (arm_linux_processors[i].package_leader_id ==
+				    arm_linux_processors[i].system_processor_id) {
 					l2_count += 1;
-				} else {
-					/* Assume L2 is shared by cores in the same cluster */
-					if (arm_linux_processors[i].package_leader_id ==
-					    arm_linux_processors[i].system_processor_id) {
-						l2_count += 1;
-					}
 				}
 			}
 		}
@@ -869,27 +771,10 @@ void cpuinfo_arm_linux_init(void) {
 			&temp_l2,
 			&temp_l3);

-		/* Try to read L2 cache size from sysfs (more accurate) */
-		uint32_t sysfs_l2_size =
-			cpuinfo_linux_read_sysfs_cache_size(arm_linux_processors[i].system_processor_id, 2);
-		if (sysfs_l2_size > 0) {
-			temp_l2.size = sysfs_l2_size;
-			/* Recalculate sets to maintain consistency: size = associativity * sets * partitions *
-			 * line_size */
-			if (temp_l2.associativity > 0 && temp_l2.line_size > 0 && temp_l2.partitions > 0) {
-				temp_l2.sets = sysfs_l2_size /
-					(temp_l2.associativity * temp_l2.partitions * temp_l2.line_size);
-			}
-		}
-
-		/* Check if L2 is per-core by reading sysfs */
-		bool l2_is_per_core = (sysfs_l2_size > 0) &&
-			cpuinfo_linux_is_l2_per_core(arm_linux_processors[i].system_processor_id);
-
-		if (temp_l3.size != 0 || l2_is_per_core) {
+		if (temp_l3.size != 0) {
 			/*
 			 * Assumptions:
-			 * - L2 is private to each core (either has L3, or sysfs confirms per-core L2)
+			 * - L2 is private to each core
 			 * - L3 is shared by cores in the same cluster
 			 * - If cores in different clusters report the same L3,
 			 * it is shared between all cores.
@@ -21,11 +21,9 @@
 #ifndef CPUFAMILY_ARM_LIGHTNING_THUNDER
 #define CPUFAMILY_ARM_LIGHTNING_THUNDER 0x462504D2
 #endif
-// A14 / M1
 #ifndef CPUFAMILY_ARM_FIRESTORM_ICESTORM
 #define CPUFAMILY_ARM_FIRESTORM_ICESTORM 0x1B588BB3
 #endif
-// A15 / M2
 #ifndef CPUFAMILY_ARM_AVALANCHE_BLIZZARD
 #define CPUFAMILY_ARM_AVALANCHE_BLIZZARD 0xDA33D83D
 #endif
@@ -68,18 +66,6 @@
 #ifndef CPUFAMILY_ARM_BRAVA
 #define CPUFAMILY_ARM_BRAVA 0x17d5b93a
 #endif
-// M5
-#ifndef CPUFAMILY_ARM_HIDRA
-#define CPUFAMILY_ARM_HIDRA 0x1d5a87e8
-#endif
-// A19
-#ifndef CPUFAMILY_ARM_TILOS
-#define CPUFAMILY_ARM_TILOS 0x01d7a72b
-#endif
-// A19 Pro
-#ifndef CPUFAMILY_ARM_THERA
-#define CPUFAMILY_ARM_THERA 0xab345f09
-#endif

 struct cpuinfo_arm_isa cpuinfo_isa = {
 	.aes = true,
@@ -132,59 +118,37 @@ static enum cpuinfo_uarch decode_uarch(uint32_t cpu_family, uint32_t core_index,
 			/* 2x Monsoon + 4x Mistral cores */
 			return core_index < 2 ? cpuinfo_uarch_monsoon : cpuinfo_uarch_mistral;
 		case CPUFAMILY_ARM_VORTEX_TEMPEST:
-			/* Hexa-core: 2x Vortex + 4x Tempest; */
-			/* Octa-core: 4x Cortex + 4x Tempest */
+			/* Hexa-core: 2x Vortex + 4x Tempest; Octa-core: 4x
+			 * Cortex + 4x Tempest */
 			return core_index + 4 < core_count ? cpuinfo_uarch_vortex : cpuinfo_uarch_tempest;
 		case CPUFAMILY_ARM_LIGHTNING_THUNDER:
-			/* Hexa-core: 2x Lightning + 4x Thunder; */
-			/* Octa-core: 4x Lightning + 4x Thunder */
+			/* Hexa-core: 2x Lightning + 4x Thunder; Octa-core
+			 * (presumed): 4x Lightning + 4x Thunder */
 			return core_index + 4 < core_count ? cpuinfo_uarch_lightning : cpuinfo_uarch_thunder;
 		case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
-			/* Hexa-core: 2x Firestorm + 4x Icestorm; */
-			/* Octa-core: 4x Firestorm + 4x Icestorm */
+			/* Hexa-core: 2x Firestorm + 4x Icestorm; Octa-core: 4x
+			 * Firestorm + 4x Icestorm */
 			return core_index + 4 < core_count ? cpuinfo_uarch_firestorm : cpuinfo_uarch_icestorm;
 		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 Everest + 4x Sawtooth */
+			/* Hexa-core: 2x Avalanche + 4x Blizzard */
 			return core_index + 4 < core_count ? cpuinfo_uarch_everest : cpuinfo_uarch_sawtooth;
-
-		case CPUFAMILY_ARM_IBIZA: /* M3 */
-			/* 8-core: 4x Coll Everest v2 + 4x Coll Sawtooth v2*/
-		case CPUFAMILY_ARM_PALMA: /* M3 Max */
-			/* 14-core: 10x Coll Everest v2 + 4x Coll Sawtooth v2*/
+			return core_index + 4 < core_count ? cpuinfo_uarch_avalanche : cpuinfo_uarch_blizzard;
 		case CPUFAMILY_ARM_COLL:
-			/* Hexa-core: 2x Coll Everest v2 + 4x Coll Sawtooth v2 */
+			/* Hexa-core: 2x Avalanche + 4x Blizzard */
 			return core_index + 4 < core_count ? cpuinfo_uarch_coll_everest : cpuinfo_uarch_coll_sawtooth;
-		case CPUFAMILY_ARM_LOBOS: /* M3 Pro */
-			/* 12-core: 6x Coll Everest v2 + 6x Coll Sawtooth v2v2 */
-			return core_index + 6 < core_count ? cpuinfo_uarch_coll_everest : cpuinfo_uarch_coll_sawtooth;

 		case CPUFAMILY_ARM_TUPAI:
-			/* Hexa-core: 2x Tupai Everest v3 + 4x Tupai Sawtooth v3 */
+			/* 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 Tahiti Everest + 4x Tahiti Sawtooth */
+			/* Hexa-core: 2x Avalanche + 4x Blizzard */
 			return core_index + 4 < core_count ? cpuinfo_uarch_tahiti_everest
 							   : cpuinfo_uarch_tahiti_sawtooth;

-		case CPUFAMILY_ARM_DONAN: /* M4 */
-			/* 10-core: 4x Donan Everest v3 + 6x Donan Sawtooth v3 */
-			return core_index + 6 < core_count ? cpuinfo_uarch_donan_everest : cpuinfo_uarch_donan_sawtooth;
-		case CPUFAMILY_ARM_BRAVA: /* M4 Pro */
-			/* 14-core: 10x Donan Everest v3 + 4x Donan Sawtooth v3 */
-			return core_index + 4 < core_count ? cpuinfo_uarch_donan_everest : cpuinfo_uarch_donan_sawtooth;
-
-		case CPUFAMILY_ARM_TILOS: /* A19 */
-		case CPUFAMILY_ARM_THERA: /* A19 Pro */
-			/* Hexa-core: 2x Tilos Everest v4 + 4x Tilos Sawtooth v4 */
-			return core_index + 4 < core_count ? cpuinfo_uarch_tilos_everest : cpuinfo_uarch_tilos_sawtooth;
-		case CPUFAMILY_ARM_HIDRA: /* M5 */
-			/* 10-core: 4x Tilos Everest v4 + 6x Tilos Sawtooth v4 */
-			return core_index + 6 < core_count ? cpuinfo_uarch_tilos_everest : cpuinfo_uarch_tilos_sawtooth;
-
 		default:
 			/* Use hw.cpusubtype for detection */
 			break;
@@ -397,8 +361,10 @@ void cpuinfo_arm_mach_init(void) {
 	 * possible. Otherwise, fallback to hardcoded set of CPUs with known
 	 * support.
 	 */
-	cpuinfo_isa.atomics = get_sys_info_by_name("hw.optional.arm.FEAT_LSE") != 0;
-	if (!cpuinfo_isa.atomics) {
+	const uint32_t has_feat_lse = get_sys_info_by_name("hw.optional.arm.FEAT_LSE");
+	if (has_feat_lse != 0) {
+		cpuinfo_isa.atomics = true;
+	} else {
 		// Mandatory in ARMv8.1-A, list only cores released before iOS
 		// 15 / macOS 12
 		switch (cpu_family) {
@@ -410,8 +376,10 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.rdm = get_sys_info_by_name("hw.optional.arm.FEAT_RDM") != 0;
-	if (!cpuinfo_isa.rdm) {
+	const uint32_t has_feat_rdm = get_sys_info_by_name("hw.optional.arm.FEAT_RDM");
+	if (has_feat_rdm != 0) {
+		cpuinfo_isa.rdm = true;
+	} else {
 		// Optional in ARMv8.2-A (implemented in Apple cores),
 		// list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
@@ -423,8 +391,10 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.fp16arith = get_sys_info_by_name("hw.optional.arm.FEAT_FP16") != 0;
-	if (!cpuinfo_isa.fp16arith) {
+	const uint32_t has_feat_fp16 = get_sys_info_by_name("hw.optional.arm.FEAT_FP16");
+	if (has_feat_fp16 != 0) {
+		cpuinfo_isa.fp16arith = true;
+	} else {
 		// Optional in ARMv8.2-A (implemented in Apple cores),
 		// list only cores released before iOS 15 / macOS 12
 		switch (cpu_family) {
@@ -436,11 +406,15 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.fhm = get_sys_info_by_name("hw.optional.arm.FEAT_FHM") != 0;
-	if (!cpuinfo_isa.fhm) {
+	const uint32_t has_feat_fhm = get_sys_info_by_name("hw.optional.arm.FEAT_FHM");
+	if (has_feat_fhm != 0) {
+		cpuinfo_isa.fhm = true;
+	} else {
 		// Prior to iOS 15, use 'hw.optional.armv8_2_fhm'
-		cpuinfo_isa.fhm = get_sys_info_by_name("hw.optional.armv8_2_fhm") != 0;
-		if (!cpuinfo_isa.fhm) {
+		const uint32_t has_feat_fhm_legacy = get_sys_info_by_name("hw.optional.armv8_2_fhm");
+		if (has_feat_fhm_legacy != 0) {
+			cpuinfo_isa.fhm = true;
+		} else {
 			// Mandatory in ARMv8.4-A when FP16 arithmetics is
 			// implemented, list only cores released before iOS 15 /
 			// macOS 12
@@ -452,10 +426,17 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.bf16 = get_sys_info_by_name("hw.optional.arm.FEAT_BF16") != 0;
-	cpuinfo_isa.fcma = get_sys_info_by_name("hw.optional.arm.FEAT_FCMA") != 0;
-	if (!cpuinfo_isa.fcma) {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+	const uint32_t has_feat_bf16 = get_sys_info_by_name("hw.optional.arm.FEAT_BF16");
+	if (has_feat_bf16 != 0) {
+		cpuinfo_isa.bf16 = true;
+	}
+
+	const uint32_t has_feat_fcma = get_sys_info_by_name("hw.optional.arm.FEAT_FCMA");
+	if (has_feat_fcma != 0) {
+		cpuinfo_isa.fcma = true;
+	} else {
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -463,9 +444,12 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.jscvt = get_sys_info_by_name("hw.optional.arm.FEAT_JSCVT") != 0;
-	if (!cpuinfo_isa.jscvt) {
-		// Mandatory in ARMv8.3-A, list only cores released before iOS 15 / macOS 12
+	const uint32_t has_feat_jscvt = get_sys_info_by_name("hw.optional.arm.FEAT_JSCVT");
+	if (has_feat_jscvt != 0) {
+		cpuinfo_isa.jscvt = true;
+	} else {
+		// Mandatory in ARMv8.3-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -473,9 +457,12 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.dot = get_sys_info_by_name("hw.optional.arm.FEAT_DotProd") != 0;
-	if (!cpuinfo_isa.dot) {
-		// Mandatory in ARMv8.4-A, list only cores released before iOS 15 / macOS 12
+	const uint32_t has_feat_dotprod = get_sys_info_by_name("hw.optional.arm.FEAT_DotProd");
+	if (has_feat_dotprod != 0) {
+		cpuinfo_isa.dot = true;
+	} else {
+		// Mandatory in ARMv8.4-A, list only cores released before iOS
+		// 15 / macOS 12
 		switch (cpu_family) {
 			case CPUFAMILY_ARM_LIGHTNING_THUNDER:
 			case CPUFAMILY_ARM_FIRESTORM_ICESTORM:
@@ -483,16 +470,20 @@ void cpuinfo_arm_mach_init(void) {
 		}
 	}

-	cpuinfo_isa.i8mm = get_sys_info_by_name("hw.optional.arm.FEAT_I8MM") != 0;
-	cpuinfo_isa.sme = get_sys_info_by_name("hw.optional.arm.FEAT_SME") != 0;
-	cpuinfo_isa.sme2 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2") != 0;
-	cpuinfo_isa.sme2p1 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2p1") != 0;
-	cpuinfo_isa.sme_i16i32 = get_sys_info_by_name("hw.optional.arm.SME_I16I32") != 0;
-	cpuinfo_isa.sme_bi32i32 = get_sys_info_by_name("hw.optional.arm.SME_BI32I32") != 0;
-	cpuinfo_isa.sme_b16b16 = get_sys_info_by_name("hw.optional.arm.FEAT_SME_B16B16") != 0;
-	cpuinfo_isa.sme_f16f16 = get_sys_info_by_name("hw.optional.arm.FEAT_SME_F16F16") != 0;
+	const uint32_t has_feat_i8mm = get_sys_info_by_name("hw.optional.arm.FEAT_I8MM");
+	if (has_feat_i8mm != 0) {
+		cpuinfo_isa.i8mm = true;
+	}

-	cpuinfo_isa.smelen = get_sys_info_by_name("hw.optional.arm.sme_max_svl_b");
+	const uint32_t has_feat_sme = get_sys_info_by_name("hw.optional.arm.FEAT_SME");
+	if (has_feat_sme != 0) {
+		cpuinfo_isa.sme = true;
+	}
+
+	const uint32_t has_feat_sme2 = get_sys_info_by_name("hw.optional.arm.FEAT_SME2");
+	if (has_feat_sme2 != 0) {
+		cpuinfo_isa.sme2 = true;
+	}

 	uint32_t num_clusters = 1;
 	for (uint32_t i = 0; i < mach_topology.cores; i++) {
@@ -192,7 +192,6 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D0D0): /* Cortex-A77 */
 		case UINT32_C(0x4100D0E0): /* Cortex-A76AE */
 		case UINT32_C(0x4100D410): /* Cortex-A78 */
-		case UINT32_C(0x4100D4B0): /* Cortex-A78C */
 		case UINT32_C(0x4100D470): /* Cortex-A710 */
 		case UINT32_C(0x4100D4D0): /* Cortex-A715 */
 		case UINT32_C(0x4800D400): /* Cortex-A76 (HiSilicon) */
@@ -221,9 +220,6 @@ inline static uint32_t midr_score_core(uint32_t midr) {
 		case UINT32_C(0x4100D030): /* Cortex-A53 */
 		case UINT32_C(0x4100D050): /* Cortex-A55 */
 		case UINT32_C(0x4100D460): /* Cortex-A510 */
-#if CPUINFO_ARCH_ARM64
-		case UINT32_C(0x4100D800): /* Cortex-A520 */
-#endif /* CPUINFO_ARCH_ARM64 */
 			/* Cortex-A53 is usually in LITTLE role, but can be in
 			 * big role w.r.t. Cortex-A35 */
 			return 2;
@@ -11,11 +11,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 #endif /* CPUINFO_ARCH_ARM */
 	enum cpuinfo_vendor vendor[RESTRICT_STATIC 1],
 	enum cpuinfo_uarch uarch[RESTRICT_STATIC 1]) {
-	/* Ensure the out-parameters are always initialized, including for
-	 * implementers that are not handled in the switch below. */
-	*vendor = cpuinfo_vendor_unknown;
-	*uarch = cpuinfo_uarch_unknown;
-
 	switch (midr_get_implementer(midr)) {
 		case 'A':
 			*vendor = cpuinfo_vendor_arm;
@@ -99,7 +94,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 					*uarch = cpuinfo_uarch_neoverse_v1;
 					break;
 				case 0xD41: /* Cortex-A78 */
-				case 0xD4B: /* Cortex-A78C */
 					*uarch = cpuinfo_uarch_cortex_a78;
 					break;
 				case 0xD44: /* Cortex-X1 */
@@ -131,36 +125,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0xD4F: /* Neoverse V2 */
 					*uarch = cpuinfo_uarch_neoverse_v2;
 					break;
-				case 0xD80: /* Cortex-A520 */
-					*uarch = cpuinfo_uarch_cortex_a520;
-					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;
-				case 0xD8A:
-					*uarch = cpuinfo_uarch_lumex_c1_nano;
-					break;
-				case 0xD8B:
-					*uarch = cpuinfo_uarch_lumex_c1_pro;
-					break;
-				case 0xD8C:
-					*uarch = cpuinfo_uarch_lumex_c1_ultra;
-					break;
-				case 0xD8F: /* Cortex-A320 */
-					*uarch = cpuinfo_uarch_cortex_a320;
-					break;
-				case 0xD90:
-					*uarch = cpuinfo_uarch_lumex_c1_premium;
-					break;
 				default:
 					switch (midr_get_part(midr) >> 8) {
 #if CPUINFO_ARCH_ARM
@@ -371,9 +335,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 				case 0x001:
 					*uarch = cpuinfo_uarch_oryon;
 					break;
-				case 0x002:
-					*uarch = cpuinfo_uarch_oryon_v3;
-					break;
 				case 0xC00:
 					*uarch = cpuinfo_uarch_falkor;
 					break;
@@ -443,50 +404,6 @@ void cpuinfo_arm_decode_vendor_uarch(
 						midr_get_part(midr));
 			}
 			break;
-		case 'a':
-			*vendor = cpuinfo_vendor_apple;
-			switch (midr_get_part(midr)) {
-				case 0x022:
-				case 0x024:
-				case 0x028:
-					*uarch = cpuinfo_uarch_icestorm;
-					break;
-				case 0x023:
-				case 0x025:
-				case 0x029:
-					*uarch = cpuinfo_uarch_firestorm;
-					break;
-				case 0x032:
-				case 0x034:
-				case 0x038:
-					*uarch = cpuinfo_uarch_blizzard;
-					break;
-				case 0x033:
-				case 0x035:
-				case 0x039:
-					*uarch = cpuinfo_uarch_avalanche;
-					break;
-				case 0x042:
-				case 0x044:
-				case 0x048:
-					*uarch = cpuinfo_uarch_coll_sawtooth;
-					break;
-				case 0x043:
-				case 0x045:
-				case 0x049:
-					*uarch = cpuinfo_uarch_coll_everest;
-					break;
-				case 0x052:
-					*uarch = cpuinfo_uarch_donan_sawtooth;
-					break;
-				case 0x053:
-					*uarch = cpuinfo_uarch_donan_everest;
-					break;
-				default:
-					cpuinfo_log_warning(
-						"unknown Apple CPU part 0x%03" PRIx32 " ignored", midr_get_part(midr));
-			}
-			break;
 #if CPUINFO_ARCH_ARM
 		case 'V':
 			*vendor = cpuinfo_vendor_marvell;
@@ -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,
@@ -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,47 +195,20 @@ 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;
-
-	// PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE may not be available in older
-	// Windows versions. If fp16arith was not detected with
-	// IsProcessorFeaturePresent(PF_ARM_V82_FP16_INSTRUCTIONS_AVAILABLE), fall
-	// back to using the value of dotprod.
-	if (!cpuinfo_isa.fp16arith) {
-		cpuinfo_isa.fp16arith = 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. */
@@ -265,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;
-}
+}
@@ -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
@@ -231,7 +231,7 @@ uint32_t cpuinfo_linux_get_processor_min_frequency(uint32_t processor) {
 }

 bool cpuinfo_linux_get_processor_core_id(uint32_t processor, uint32_t core_id_ptr[restrict static 1]) {
-	char core_id_filename[CORE_ID_FILENAME_SIZE];
+	char core_id_filename[PACKAGE_ID_FILENAME_SIZE];
 	const int chars_formatted =
 		snprintf(core_id_filename, CORE_ID_FILENAME_SIZE, CORE_ID_FILENAME_FORMAT, processor);
 	if ((unsigned int)chars_formatted >= CORE_ID_FILENAME_SIZE) {
@@ -61,13 +61,11 @@ CPUINFO_INTERNAL void cpuinfo_riscv_linux_decode_isa_from_hwcap(struct cpuinfo_r
 * @param[processor] - The Linux ID of the target processor.
 * @param[vendor] - Reference to the cpuinfo_vendor to populate.
 * @param[uarch] - Reference to the cpuinfo_uarch to populate.
- * @param[isa] - Reference to the cpuinfo_riscv_isa to populate isa extensions.
 */
 CPUINFO_INTERNAL void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	uint32_t processor,
 	enum cpuinfo_vendor vendor[restrict static 1],
-	enum cpuinfo_uarch uarch[restrict static 1],
-	struct cpuinfo_riscv_isa isa[restrict static 1]);
+	enum cpuinfo_uarch uarch[restrict static 1]);

 /* Used to determine which uarch is associated with the current thread. */
 extern CPUINFO_INTERNAL const uint32_t* cpuinfo_linux_cpu_to_uarch_index_map;
@@ -6,7 +6,7 @@
 #include <riscv/linux/api.h>

 /* ISA structure to hold supported extensions. */
-struct cpuinfo_riscv_isa cpuinfo_isa = {0};
+struct cpuinfo_riscv_isa cpuinfo_isa;

 /* Helper function to bitmask flags and ensure operator precedence. */
 static inline bool bitmask_all(uint32_t flags, uint32_t mask) {
@@ -320,8 +320,7 @@ void cpuinfo_riscv_linux_init(void) {
 		cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 			processor,
 			&riscv_linux_processors[processor].core.vendor,
-			&riscv_linux_processors[processor].core.uarch,
-			&cpuinfo_isa);
+			&riscv_linux_processors[processor].core.uarch);

 		/* Populate frequency information of this core. */
 		uint32_t frequency = cpuinfo_linux_get_processor_cur_frequency(processor);
@@ -53,30 +53,6 @@ struct riscv_hwprobe {
 #define RISCV_HWPROBE_EXT_ZBB (1 << 4)
 #define RISCV_HWPROBE_EXT_ZBS (1 << 5)
 #define RISCV_HWPROBE_EXT_ZICBOZ (1 << 6)
-#define RISCV_HWPROBE_EXT_ZBC (1 << 7)
-#define RISCV_HWPROBE_EXT_ZBKB (1 << 8)
-#define RISCV_HWPROBE_EXT_ZBKC (1 << 9)
-#define RISCV_HWPROBE_EXT_ZBKX (1 << 10)
-#define RISCV_HWPROBE_EXT_ZKND (1 << 11)
-#define RISCV_HWPROBE_EXT_ZKNE (1 << 12)
-#define RISCV_HWPROBE_EXT_ZKNH (1 << 13)
-#define RISCV_HWPROBE_EXT_ZKSED (1 << 14)
-#define RISCV_HWPROBE_EXT_ZKSH (1 << 15)
-#define RISCV_HWPROBE_EXT_ZKT (1 << 16)
-#define RISCV_HWPROBE_EXT_ZVBB (1 << 17)
-#define RISCV_HWPROBE_EXT_ZVBC (1 << 18)
-#define RISCV_HWPROBE_EXT_ZVKB (1 << 19)
-#define RISCV_HWPROBE_EXT_ZVKG (1 << 20)
-#define RISCV_HWPROBE_EXT_ZVKNED (1 << 21)
-#define RISCV_HWPROBE_EXT_ZVKNHA (1 << 22)
-#define RISCV_HWPROBE_EXT_ZVKNHB (1 << 23)
-#define RISCV_HWPROBE_EXT_ZVKSED (1 << 24)
-#define RISCV_HWPROBE_EXT_ZVKSH (1 << 25)
-#define RISCV_HWPROBE_EXT_ZVKT (1 << 26)
-#define RISCV_HWPROBE_EXT_ZFH (1 << 27)
-#define RISCV_HWPROBE_EXT_ZFHMIN (1 << 28)
-#define RISCV_HWPROBE_EXT_ZIHINTNTL (1 << 29)
-#define RISCV_HWPROBE_EXT_ZVFH (1 << 30)
 #define RISCV_HWPROBE_KEY_CPUPERF_0 5
 #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0)
 #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0)
@@ -96,8 +72,7 @@ struct riscv_hwprobe {
 void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	uint32_t processor,
 	enum cpuinfo_vendor vendor[restrict static 1],
-	enum cpuinfo_uarch uarch[restrict static 1],
-	struct cpuinfo_riscv_isa isa[restrict static 1]) {
+	enum cpuinfo_uarch uarch[restrict static 1]) {
 	struct riscv_hwprobe pairs[] = {
 		{
 			.key = RISCV_HWPROBE_KEY_MVENDORID,
@@ -108,9 +83,6 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 		{
 			.key = RISCV_HWPROBE_KEY_MIMPID,
 		},
-		{
-			.key = RISCV_HWPROBE_KEY_IMA_EXT_0,
-		},
 	};
 	const size_t pairs_count = sizeof(pairs) / sizeof(struct riscv_hwprobe);

@@ -156,7 +128,6 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	uint32_t vendor_id = 0;
 	uint32_t arch_id = 0;
 	uint32_t imp_id = 0;
-	uint64_t ima_ext_0 = 0;
 	for (size_t pair = 0; pair < pairs_count; pair++) {
 		switch (pairs[pair].key) {
 			case RISCV_HWPROBE_KEY_MVENDORID:
@@ -168,9 +139,6 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 			case RISCV_HWPROBE_KEY_MIMPID:
 				imp_id = pairs[pair].value;
 				break;
-			case RISCV_HWPROBE_KEY_IMA_EXT_0:
-				ima_ext_0 = pairs[pair].value;
-				break;
 			default:
 				/* The key value may be -1 if unsupported. */
 				break;
@@ -178,16 +146,6 @@ void cpuinfo_riscv_linux_decode_vendor_uarch_from_hwprobe(
 	}
 	cpuinfo_riscv_decode_vendor_uarch(vendor_id, arch_id, imp_id, vendor, uarch);

-	/* Parse ISA extensions retrieved. */
-	if (ima_ext_0 != 0) {
-		if (ima_ext_0 & RISCV_HWPROBE_EXT_ZFH) {
-			isa->zfh = true;
-		}
-		if (ima_ext_0 & RISCV_HWPROBE_EXT_ZVFH) {
-			isa->zvfh = true;
-		}
-	}
-
 cleanup:
 	CPU_FREE(cpu_set);
 }
@@ -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,
@@ -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 {
@@ -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);
 	}
 }
@@ -307,15 +307,6 @@ static bool transform_token(char* token_start, char* token_end, struct parser_st
 			}
 			break;
 		case 4:
-			/*
-			 * Erase everything starting with "with" on AMD
-			 * processors, e.g. "AMD Ryzen 5 PRO 6650U with Radeon
-			 * Graphics"
-			 */
-			if (erase_matching(token_start, token_length, "with")) {
-				return false;
-			}
-
 			/* Remember to erase "Dual Core" in "AMD Athlon(tm) 64
 			 * X2 Dual Core Processor 3800+" */
 			if (memcmp(token_start, "Dual", token_length) == 0) {
@@ -621,8 +612,6 @@ uint32_t cpuinfo_x86_normalize_brand_string(const char raw_name[48], char normal
 					break;
 				case '@':
 					parser_state.frequency_separator = char_ptr;
-					*char_ptr = ' ';
-					break;
 				case '\0':
 				case '\t':
 					*char_ptr = ' ';
@@ -171,12 +171,6 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 						case 0x8C: // Tiger U
 						case 0x8D: // Tiger H
 							return cpuinfo_uarch_willow_cove;
-						case 0x8F: // Sapphire Rapids
-							return cpuinfo_uarch_golden_cove;
-						case 0xCF: // Emerald Rapids
-							return cpuinfo_uarch_raptor_cove;
-						case 0xAD: // Granite Rapids
-							return cpuinfo_uarch_redwood_cove;
 						/* Low-power cores */
 						case 0x1C: // Diamondville,
 							   // Silverthorne,
@@ -194,17 +188,10 @@ 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
+						case 0xBE: // Twin Lake
 							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
@@ -221,6 +208,8 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 							return cpuinfo_uarch_knights_landing;
 						case 0x85:
 							return cpuinfo_uarch_knights_mill;
+						case 0xDD: // Clearwater Forest
+							return cpuinfo_uarch_darkmont;
 					}
 					break;
 				case 0x0F:
@@ -270,15 +259,8 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 							return cpuinfo_uarch_prescott;
 					}
 					break;
-				case 0x12:
-					switch (model_info->model) {
-						case 0x01: // Nova Lake P-core (Coyote Cove)
-							return cpuinfo_uarch_coyote_cove;
-					}
-					break;
 			}
 			break;
-
 		case cpuinfo_vendor_amd:
 			switch (model_info->family) {
 #if CPUINFO_ARCH_X86
@@ -415,21 +397,7 @@ enum cpuinfo_uarch cpuinfo_x86_decode_uarch(
 					}
 					break;
 				case 0x1a:
-					switch (model_info->extended_model) {
-						case 0x0: // model 00h..2Fh
-						case 0x1:
-						case 0x2:
-						case 0x4: // model 40h..4Fh
-							return cpuinfo_uarch_zen5;
-
-						case 0x5: // model 50h..5Fh
-						case 0x8: // model 80h..AFh
-						case 0x9:
-						case 0xA:
-						case 0xC: // model C0h..CFh
-							return cpuinfo_uarch_zen6;
-					}
-					break;
+					return cpuinfo_uarch_zen5;
 			}
 			break;
 		case cpuinfo_vendor_hygon:
@@ -265,6 +265,8 @@ BOOL CALLBACK cpuinfo_x86_windows_init(PINIT_ONCE init_once, PVOID parameter, PV
 		 * APIC order */
 		const uint32_t core_id = cores_count++;
 		uint32_t smt_id = 0;
+		/* Reconstruct core part of APIC ID */
+		const uint32_t core_apic_id = (core_id & core_bits_mask) << x86_processor.topology.core_bits_offset;
 		/* Iterate processor groups and set the core & SMT parts of APIC
 		 * ID */
 		for (uint32_t i = 0; i < core_info->Processor.GroupCount; i++) {
@@ -585,9 +585,8 @@ cubeb_destroy(cubeb * context);
                                NULL if this stream is input only. When input
                                and output stream parameters are supplied, their
                                rate has to be the same.
-    @param latency_frames Requested stream latency in frames. Valid range is
-                          [1, 96000]. The actual latency may differ depending
-                          on the backend, platform, and hardware.
+    @param latency_frames Stream latency in frames.  Valid range
+                          is [1, 96000].
    @param data_callback Will be called to preroll data before playback is
                         started by cubeb_stream_start.
    @param state_callback A pointer to a state callback.
@@ -294,9 +294,6 @@ set_timeout(struct timeval * timeout, unsigned int ms)
 static void
 stream_buffer_decrement(cubeb_stream * stm, long count)
 {
-  if (count < 0 || (snd_pcm_uframes_t)count > stm->bufframes) {
-    count = stm->bufframes;
-  }
  char * bufremains =
      stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
  memmove(stm->buffer, bufremains,
@@ -405,15 +405,12 @@ cbjack_process(jack_nframes_t nframes, void * arg)

  for (int j = 0; j < MAX_STREAMS; j++) {
    cubeb_stream * stm = &ctx->streams[j];
+    float * bufs_out[stm->out_params.channels];
+    float * bufs_in[stm->in_params.channels];

    if (!stm->in_use)
      continue;

-    float * bufs_out[MAX_CHANNELS] = {};
-    float * bufs_in[MAX_CHANNELS] = {};
-    XASSERT(stm->out_params.channels <= MAX_CHANNELS);
-    XASSERT(stm->in_params.channels <= MAX_CHANNELS);
-
    // handle xruns by skipping audio that should have been played
    stm->position += t_jack_xruns * ctx->fragment_size * stm->ratio;

@@ -854,14 +851,6 @@ cbjack_stream_init(cubeb * context, cubeb_stream ** stream,
    return CUBEB_ERROR_INVALID_FORMAT;
  }

-  if ((output_stream_params &&
-       (output_stream_params->channels < 1 ||
-        output_stream_params->channels > MAX_CHANNELS)) ||
-      (input_stream_params && (input_stream_params->channels < 1 ||
-                               input_stream_params->channels > MAX_CHANNELS))) {
-    return CUBEB_ERROR_INVALID_FORMAT;
-  }
-
  if ((input_device && input_device != JACK_DEFAULT_IN) ||
      (output_device && output_device != JACK_DEFAULT_OUT)) {
    return CUBEB_ERROR_NOT_SUPPORTED;
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <atomic>
 #include <audioclient.h>
-#include <audiopolicy.h>
 #include <avrt.h>
 #include <cmath>
 #include <devicetopology.h>
@@ -318,7 +317,6 @@ struct cubeb {
 };

 class wasapi_endpoint_notification_client;
-class wasapi_session_notification_client;

 /* We have three possible callbacks we can use with a stream:
 * - input only
@@ -417,10 +415,6 @@ struct cubeb_stream {
     audio device changes and route the audio to the new default audio output
     device */
  com_ptr<wasapi_endpoint_notification_client> notification_client;
-  /* Session notification client, to be notified when the audio session is
-     disconnected (e.g. when an audio device is removed from the system). */
-  com_ptr<IAudioSessionControl> session_control;
-  com_ptr<wasapi_session_notification_client> session_notification_client;
  /* Main andle to the WASAPI capture stream. */
  com_ptr<IAudioClient> input_client;
  /* Interface to use the event driven capture interface */
@@ -437,10 +431,6 @@ struct cubeb_stream {
   * practice, we read from the input stream in the output callback, so
   * this is not used, but it is necessary to start getting input data. */
  HANDLE input_available_event = 0;
-  /* Signaled by stream_start/stream_stop when the active state changes,
-     so the render thread can promote/demote its MMCSS task accordingly
-     instead of remaining promoted while idle. */
-  HANDLE mmcss_event = 0;
  /* Each cubeb_stream has its own thread. */
  HANDLE thread = 0;
  /* The lock protects all members that are touched by the render thread or
@@ -844,89 +834,6 @@ private:
  DWORD last_device_change;
 };

-class wasapi_session_notification_client : public IAudioSessionEvents {
-public:
-  ULONG STDMETHODCALLTYPE AddRef() { return InterlockedIncrement(&ref_count); }
-
-  ULONG STDMETHODCALLTYPE Release()
-  {
-    ULONG ulRef = InterlockedDecrement(&ref_count);
-    if (0 == ulRef) {
-      delete this;
-    }
-    return ulRef;
-  }
-
-  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, VOID ** ppvInterface)
-  {
-    if (__uuidof(IUnknown) == riid) {
-      AddRef();
-      *ppvInterface = (IUnknown *)this;
-    } else if (__uuidof(IAudioSessionEvents) == riid) {
-      AddRef();
-      *ppvInterface = (IAudioSessionEvents *)this;
-    } else {
-      *ppvInterface = NULL;
-      return E_NOINTERFACE;
-    }
-    return S_OK;
-  }
-
-  wasapi_session_notification_client(HANDLE event)
-      : ref_count(1), reconfigure_event(event)
-  {
-  }
-
-  virtual ~wasapi_session_notification_client() {}
-
-  HRESULT STDMETHODCALLTYPE
-  OnSessionDisconnected(AudioSessionDisconnectReason reason)
-  {
-    LOG("session: Audio session disconnected, reason: %d", reason);
-    BOOL ok = SetEvent(reconfigure_event);
-    if (!ok) {
-      LOG("session: SetEvent on reconfigure_event failed: %lx", GetLastError());
-    }
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE OnDisplayNameChanged(LPCWSTR value,
-                                                 LPCGUID event_context)
-  {
-    return S_OK;
-  }
-  HRESULT STDMETHODCALLTYPE OnIconPathChanged(LPCWSTR value,
-                                              LPCGUID event_context)
-  {
-    return S_OK;
-  }
-  HRESULT STDMETHODCALLTYPE OnSimpleVolumeChanged(float volume, BOOL mute,
-                                                  LPCGUID event_context)
-  {
-    return S_OK;
-  }
-  HRESULT STDMETHODCALLTYPE OnChannelVolumeChanged(DWORD channel_count,
-                                                   float volumes[],
-                                                   DWORD changed_channel,
-                                                   LPCGUID event_context)
-  {
-    return S_OK;
-  }
-  HRESULT STDMETHODCALLTYPE OnGroupingParamChanged(LPCGUID grouping_param,
-                                                   LPCGUID event_context)
-  {
-    return S_OK;
-  }
-  HRESULT STDMETHODCALLTYPE OnStateChanged(AudioSessionState state)
-  {
-    return S_OK;
-  }
-
-private:
-  LONG ref_count;
-  HANDLE reconfigure_event;
-};
-
 namespace {

 long
@@ -1507,9 +1414,8 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
  } com;

  bool is_playing = true;
-  HANDLE wait_array[5] = {stm->shutdown_event, stm->mmcss_event,
-                          stm->reconfigure_event, stm->refill_event,
-                          stm->input_available_event};
+  HANDLE wait_array[4] = {stm->shutdown_event, stm->reconfigure_event,
+                          stm->refill_event, stm->input_available_event};
  HANDLE mmcss_handle = NULL;
  HRESULT hr = 0;
  DWORD mmcss_task_index = 0;
@@ -1522,6 +1428,15 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
    return 0;
  }

+  /* We could consider using "Pro Audio" here for WebAudio and
+     maybe WebRTC. */
+  mmcss_handle = AvSetMmThreadCharacteristicsA("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",
+        GetLastError());
+  }
+
  while (is_playing) {
    DWORD waitResult = WaitForMultipleObjects(ARRAY_LENGTH(wait_array),
                                              wait_array, FALSE, INFINITE);
@@ -1535,30 +1450,7 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      }
      continue;
    }
-    case WAIT_OBJECT_0 + 1: { /* mmcss: active state changed */
-      /* stm->active was set by wasapi_stream_start/_stop before signaling,
-         and SetEvent provides the necessary memory barrier. */
-      if (stm->active && !mmcss_handle) {
-        /* We could consider using "Pro Audio" here for WebAudio and
-           maybe WebRTC. */
-        mmcss_handle =
-            AvSetMmThreadCharacteristicsA("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",
-              GetLastError());
-        } else {
-          LOG("MMCSS render thread promoted (task index %lu)",
-              mmcss_task_index);
-        }
-      } else if (!stm->active && mmcss_handle) {
-        AvRevertMmThreadCharacteristics(mmcss_handle);
-        mmcss_handle = NULL;
-        LOG("MMCSS render thread demoted");
-      }
-      continue;
-    }
-    case WAIT_OBJECT_0 + 2: { /* reconfigure */
+    case WAIT_OBJECT_0 + 1: { /* reconfigure */
      auto_lock lock(stm->stream_reset_lock);
      if (!stm->active) {
        /* Avoid reconfiguring, stream start will handle it. */
@@ -1568,12 +1460,13 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      XASSERT(stm->output_client || stm->input_client);
      LOG("Reconfiguring the stream");
      /* Close the stream */
+      bool was_running = false;
      if (stm->output_client) {
-        stm->output_client->Stop();
+        was_running = stm->output_client->Stop() == S_OK;
        LOG("Output stopped.");
      }
      if (stm->input_client) {
-        stm->input_client->Stop();
+        was_running = stm->input_client->Stop() == S_OK;
        LOG("Input stopped.");
      }
      close_wasapi_stream(stm);
@@ -1591,7 +1484,7 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      }
      LOG("Stream setup successfuly.");
      XASSERT(stm->output_client || stm->input_client);
-      if (stm->output_client) {
+      if (was_running && stm->output_client) {
        hr = stm->output_client->Start();
        if (FAILED(hr)) {
          LOG("Error starting output after reconfigure, error: %lx", hr);
@@ -1600,7 +1493,7 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
        }
        LOG("Output started after reconfigure.");
      }
-      if (stm->input_client) {
+      if (was_running && stm->input_client) {
        hr = stm->input_client->Start();
        if (FAILED(hr)) {
          LOG("Error starting input after reconfiguring, error: %lx", hr);
@@ -1611,12 +1504,12 @@ static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
      }
      break;
    }
-    case WAIT_OBJECT_0 + 3: /* refill */
+    case WAIT_OBJECT_0 + 2: /* refill */
      XASSERT((has_input(stm) && has_output(stm)) ||
              (!has_input(stm) && has_output(stm)));
      is_playing = stm->refill_callback(stm);
      break;
-    case WAIT_OBJECT_0 + 4: { /* input available */
+    case WAIT_OBJECT_0 + 3: { /* input available */
      bool rv = get_input_buffer(stm);
      if (!rv) {
        is_playing = false;
@@ -2750,22 +2643,6 @@ setup_wasapi_stream(cubeb_stream * stm)
      return CUBEB_ERROR;
    }

-    hr = stm->output_client->GetService(__uuidof(IAudioSessionControl),
-                                        stm->session_control.receive_vpp());
-    if (SUCCEEDED(hr)) {
-      stm->session_notification_client.reset(
-          new wasapi_session_notification_client(stm->reconfigure_event));
-      hr = stm->session_control->RegisterAudioSessionNotification(
-          stm->session_notification_client.get());
-      if (FAILED(hr)) {
-        LOG("Could not register session notification client: %lx", hr);
-        stm->session_notification_client = nullptr;
-        stm->session_control = nullptr;
-      }
-    } else {
-      LOG("Could not get the IAudioSessionControl: %lx", hr);
-    }
-
 #ifdef CUBEB_WASAPI_USE_IAUDIOSTREAMVOLUME
    /* Restore the stream volume over a device change. */
    if (stream_set_volume(stm, stm->volume) != CUBEB_OK) {
@@ -2965,12 +2842,6 @@ wasapi_stream_init(cubeb * context, cubeb_stream ** stream,
    return CUBEB_ERROR;
  }

-  stm->mmcss_event = CreateEvent(NULL, 0, 0, NULL);
-  if (!stm->mmcss_event) {
-    LOG("Can't create the mmcss event, error: %lx", GetLastError());
-    return CUBEB_ERROR;
-  }
-
  stm->thread_ready_event = CreateEvent(NULL, 0, 0, NULL);
  if (!stm->thread_ready_event) {
    LOG("Can't create the thread ready event, error: %lx", GetLastError());
@@ -3035,13 +2906,6 @@ close_wasapi_stream(cubeb_stream * stm)

  stm->stream_reset_lock.assert_current_thread_owns();

-  if (stm->session_control && stm->session_notification_client) {
-    stm->session_control->UnregisterAudioSessionNotification(
-        stm->session_notification_client.get());
-    stm->session_notification_client = nullptr;
-    stm->session_control = nullptr;
-  }
-
 #ifdef CUBEB_WASAPI_USE_IAUDIOSTREAMVOLUME
  stm->audio_stream_volume = nullptr;
 #endif
@@ -3096,7 +2960,6 @@ wasapi_stream_release(cubeb_stream * stm)
    CloseHandle(stm->reconfigure_event);
    CloseHandle(stm->refill_event);
    CloseHandle(stm->input_available_event);
-    CloseHandle(stm->mmcss_event);

    CloseHandle(stm->thread);

@@ -3193,11 +3056,6 @@ wasapi_stream_start(cubeb_stream * stm)

  stm->active = true;

-  if (!SetEvent(stm->mmcss_event)) {
-    LOG("wasapi_stream_start: SetEvent(mmcss_event) failed: %lx",
-        GetLastError());
-  }
-
  stm->state_callback(stm, stm->user_ptr, CUBEB_STATE_STARTED);

  return CUBEB_OK;
@@ -3230,11 +3088,6 @@ wasapi_stream_stop(cubeb_stream * stm)

    stm->active = false;

-    if (!SetEvent(stm->mmcss_event)) {
-      LOG("wasapi_stream_stop: SetEvent(mmcss_event) failed: %lx",
-          GetLastError());
-    }
-
    wasapi_state_callback(stm, stm->user_ptr, CUBEB_STATE_STOPPED);
  }

@@ -3710,13 +3563,11 @@ wasapi_register_device_collection_changed(
  }

  if (collection_changed_callback) {
-    if (((devtype & CUBEB_DEVICE_TYPE_INPUT) &&
-         context->input_collection_changed_callback) ||
-        ((devtype & CUBEB_DEVICE_TYPE_OUTPUT) &&
-         context->output_collection_changed_callback)) {
-      LOG("register_device_collection_changed: callback already registered");
-      return CUBEB_ERROR_INVALID_PARAMETER;
-    }
+    // Make sure it has been unregistered first.
+    XASSERT(((devtype & CUBEB_DEVICE_TYPE_INPUT) &&
+             !context->input_collection_changed_callback) ||
+            ((devtype & CUBEB_DEVICE_TYPE_OUTPUT) &&
+             !context->output_collection_changed_callback));

    // Stop the notification client. Notifications arrive on
    // a separate thread. We stop them here to avoid
@@ -1,14 +1,3 @@
-# 3.1.0 (2026-02-23)
-
- Added supported for resource tight alignment (feature added in Agility SDK 1.618.1). It is used automatically when available.
-  - Added function `Allocator::IsTightAlignmentSupported`.
-  - Added `ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT`.
- Fixes and improvements in the internal function `AllocatorPimpl::GetResourceAllocationInfo` (which decides when to use small alignment or tight alignment), including:
-  - Added support for 1D and 3D textures when `D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 2` (#78, #79).
-  - Fix for cases when `D3D12_TEXTURE_LAYOUT_64KB_*_SWIZZLE` is used (#86).
- Fixes for build errors in MinGW (#77).
- Fixes and improvements in documentation and tests.
-
 # 3.0.1 (2025-05-08)

 - Fixed macros `D3D12MA_RECOMMENDED_ALLOCATOR_FLAGS`, `D3D12MA_RECOMMENDED_POOL_FLAGS` (#73).
@@ -3,8 +3,5 @@ add_library(D3D12MemAlloc
 	src/D3D12MemAlloc.cpp
 )

-target_link_libraries(D3D12MemAlloc PRIVATE Microsoft::DirectX-Headers)
-
 target_include_directories(D3D12MemAlloc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_compile_definitions(D3D12MemAlloc PRIVATE "D3D12MA_USING_DIRECTX_HEADERS")
 disable_compiler_warnings_for_target(D3D12MemAlloc)
@@ -1,4 +1,4 @@
-Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2019-2025 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
@@ -8,7 +8,7 @@ Easy to integrate memory allocation library for Direct3D 12.

 **Changelog:** See [CHANGELOG.md](CHANGELOG.md)

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

 [![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")

@@ -20,7 +20,6 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="..\DefaultProjectRootDir.props" />
    <Import Project="..\3rdparty.props" />
-    <Import Project="..\..\common\vsprops\DepsDir.props" />
    <Import Condition="$(Configuration.Contains(Debug))" Project="..\..\common\vsprops\CodeGen_Debug.props" />
    <Import Condition="$(Configuration.Contains(Devel))" Project="..\..\common\vsprops\CodeGen_Devel.props" />
    <Import Condition="$(Configuration.Contains(Release))" Project="..\..\common\vsprops\CodeGen_Release.props" />
@@ -38,9 +37,9 @@
  </ItemGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <PreprocessorDefinitions>D3D12MA_USING_DIRECTX_HEADERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <AdditionalIncludeDirectories>$(DepsIncludeDir);$(ProjectDir)include;$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2025 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
@@ -24,9 +24,9 @@

 /** \mainpage D3D12 Memory Allocator

-<b>Version 3.2.0</b> (2026-06-05)
+<b>Version 3.0.1</b> (2025-05-08)

-Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved. \n
+Copyright (c) 2019-2025 Advanced Micro Devices, Inc. All rights reserved. \n
 License: MIT

 Documentation of all members: D3D12MemAlloc.h
@@ -64,7 +64,7 @@ Documentation of all members: D3D12MemAlloc.h
        
 \section main_see_also Web links

- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/d3d12-memory-allocator/) - product page
+- [Direct3D 12 Memory Allocator at GPUOpen.com](https://gpuopen.com/gaming-product/d3d12-memory-allocator/) - product page
 - [GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator at GitHub.com](https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator) - source code repository
 */

@@ -889,17 +889,10 @@ enum POOL_FLAGS
    */
    POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED = 0x2,
    /** Every allocation made in this pool will be created as a committed resource - will have its own memory block.
-     
+    
    There is also an equivalent flag for the entire allocator: D3D12MA::ALLOCATOR_FLAG_ALWAYS_COMMITTED.
    */
    POOL_FLAG_ALWAYS_COMMITTED = 0x4,
-    /** Disables tight resource alignment for all resources created from this pool.
-    
-    When tight alignment is supported and enabled for the allocator, resources created from custom pools
-    normally use it automatically. Specify this flag to restore pre-tight-alignment behavior for this pool:
-    tight alignment won't be requested and small buffers may again be preferred as committed resources.
-    */
-    POOL_FLAG_DONT_USE_TIGHT_ALIGNMENT = 0x8,

    // Bit mask to extract only `ALGORITHM` bits from entire set of flags.
    POOL_FLAG_ALGORITHM_MASK = POOL_FLAG_ALGORITHM_LINEAR
@@ -1119,20 +1112,8 @@ enum ALLOCATOR_FLAGS
    which may take longer than creating placed resources in existing heaps.
    Passing this flag will disable this committed preference globally for the allocator.
    It can also be disabled for a single allocation by using #ALLOCATION_FLAG_STRATEGY_MIN_TIME.
-
-    If the tight resource alignment feature is used by the library (which happens automatically whenever supported,
-    unless you use flag #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT or
-    #POOL_FLAG_DONT_USE_TIGHT_ALIGNMENT on a custom pool), then small buffers are not preferred as committed.
-    Long story short, you don't need to specify any of these flags.
-    The library chooses the most optimal method automatically.
    */
    ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED = 0x10,
-    /** Disables the use of the tight alignment feature even when it is supported on the current system.
-    By default, the feature is used whenever available.
-
-    Support can be checked by D3D12MA::Allocator::IsTightAlignmentSupported() regardless of using this flag.
-    */
-    ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT = 0x20,
 };

 /// \brief Parameters of created Allocator object. To be used with CreateAllocator().
@@ -1208,12 +1189,6 @@ public:
    This flag is fetched from `D3D12_FEATURE_D3D12_OPTIONS16::GPUUploadHeapSupported`.
    */
    BOOL IsGPUUploadHeapSupported() const;
-    /** \brief Returns true if resource tight alignment is supported on the current system.
-    When supported, it is automatically used by the library, unless
-    #ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT flag was specified on allocator creation.
-    This flag is fetched from `D3D12_FEATURE_DATA_TIGHT_ALIGNMENT::SupportTier`.
-    */
-    BOOL IsTightAlignmentSupported() const;
    /** \brief Returns total amount of memory of specific segment group, in bytes.
    
    \param memorySegmentGroup use `DXGI_MEMORY_SEGMENT_GROUP_LOCAL` or `DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL`.
@@ -1825,7 +1800,7 @@ DEFINE_ENUM_FLAG_OPERATORS(D3D12MA::VIRTUAL_ALLOCATION_FLAGS);
 /// \endcond

 /**
-\page faq Frequently asked questions
+\page faq Frequenty asked questions

 <b>What is %D3D12MA?</b>

@@ -2889,24 +2864,6 @@ and D3D12MA::POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED on the creation of any cus
 With those flags, the alignment of the heaps created by %D3D12MA can be lower, but any MSAA textures are created as committed.
 You should always use these flags in your code unless you really need to create some MSAA textures as placed.

-With DirectX 12 Agility SDK 1.618.1, Microsoft added a new feature called **"tight alignment"**.
-Note this is a separate feature than the "small alignment" described earlier.
-When using this new SDK and a compatible graphics driver, the API exposes support for this new feature.
-Then, a new flag `D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT` can be added when creating a resource.
-D3D12 can then return the alignment required for the resource smaller than the default ones described above.
-This library automatically makes use of the tight alignment feature when available and adds that new resource flag.
-When the tight alignment is enabled, the heuristics that creates small buffers as committed described above is deactivated,
-as it is no longer needed.
-
-You can check if the tight alignment it is available in the current system by calling D3D12MA::Allocator::IsTightAlignmentSupported().
-You can tell the library to not use it by specifying D3D12MA::ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT.
-Custom pools can opt out independently by specifying D3D12MA::POOL_FLAG_DONT_USE_TIGHT_ALIGNMENT.
-Typically, you don't need to do any of those.
-
-The library automatically aligns all buffers to at least 256 B, even when the system supports smaller alignment.
-This is the alignment required for constant buffers, expressed by `D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT` constant.
-You can override this logic for \subpage custom_pools with a specific D3D12MA::POOL_DESC::MinAllocationAlignment.
-
 \page defragmentation Defragmentation

 Interleaved allocations and deallocations of many objects of varying size can
@@ -3601,7 +3558,7 @@ Features deliberately excluded from the scope of this library:
 - **Descriptor allocation.** Although also called "heaps", objects that represent
  descriptors are separate part of the D3D12 API from buffers and textures.
  You can still use \ref virtual_allocator to manage descriptors and their ranges inside a descriptor heap.
- **Support for reserved (tiled) resources.** We don't recommend using them. For more information, see [1].
+- **Support for reserved (tiled) resources.** We don't recommend using them.
 - Support for `ID3D12Device::Evict` and `MakeResident`. We don't recommend using them.
  You can call them on the D3D12 objects manually.
  Plese keep in mind, however, that eviction happens on the level of entire `ID3D12Heap` memory blocks
@@ -3618,6 +3575,4 @@ Features deliberately excluded from the scope of this library:
  It is recommended to disable such warnings instead.
 - This is a C++ library. **Bindings or ports to any other programming languages** are welcome as external projects but
  are not going to be included into this repository.
-
-[1] Antoine Richermoz, Fabrice Neyret. The Sad State of Hardware Virtual Textures. UGA - Universite Grenoble Alpes; INRIA Grenoble - Rhone-Alpes. 2025, pp.13. hal-05138369
 */
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2026 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2019-2025 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,24 +33,11 @@
    #include <shared_mutex>
 #endif

-// On older mingw versions, using the Agility SDK will cause linker errors unless dxguids.h is included.
-// But on newer mingw versions, the includes aren't necessary thus no need to grab DirectX-Headers.
-// Release cycles are slow for LTS distros on Linux, so this codeblock will need to stay for a few years.
-#if defined(__MINGW64_VERSION_MAJOR) && defined(__MINGW64_VERSION_MINOR) && \
-	defined(__MINGW64_VERSION_BUGFIX) && defined(__ID3D12Device8_INTERFACE_DEFINED__)
-    #define D3D12MA_MAKE_MINGW_VERSION(x, y, z) ((x << 20u) | (y << 10u) | (z))
-    #if D3D12MA_MAKE_MINGW_VERSION(__MINGW64_VERSION_MAJOR, __MINGW64_VERSION_MINOR, \
-								  __MINGW64_VERSION_BUGFIX) <= D3D12MA_MAKE_MINGW_VERSION(11, 0, 1)
-        #if defined(__has_include)
-            #if !__has_include(<dxguids.h>)
-                #error "mingw or gcc detected. dxguids.h is needed. You can grab it from https://github.com/microsoft/DirectX-Headers or if you're on Ubuntu just run sudo apt install directx-headers-dev"
-            #endif
-        #endif
-        #include <guiddef.h>
-        // // guiddef.h must be included first.
-        #include <dxguids.h>
-    #endif
-    #undef D3D12MA_MAKE_MINGW_VERSION
+// Includes needed for MinGW - see #71.
+#ifndef _MSC_VER
+    #include <guiddef.h>
+    // guiddef.h must be included first.
+    #include <dxguids.h>
 #endif

 ////////////////////////////////////////////////////////////////////////////////
@@ -106,14 +93,6 @@
    #endif
 #endif

-#ifndef D3D12MA_DEFAULT_ALIGNMENT
-    /*
-    Default alignment of allocations in default pools and custom pools with MinAllocationAlignment == 0.
-    Can be lowered for custom pools by specifying custom MinAllocationAlignment > 0.
-    */
-    #define D3D12MA_DEFAULT_ALIGNMENT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT
-#endif
-
 #ifndef D3D12MA_DEBUG_ALIGNMENT
    /*
    Minimum alignment of all allocations, in bytes.
@@ -147,14 +126,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_TIGHT_ALIGNMENT_SUPPORTED
-    #if D3D12_SDK_VERSION >= 618
-        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 1
-    #else
-        #define D3D12MA_TIGHT_ALIGNMENT_SUPPORTED 0
-    #endif
-#endif
-
 #ifndef D3D12MA_OPTIONS16_SUPPORTED
    #if D3D12_SDK_VERSION >= 610
        #define D3D12MA_OPTIONS16_SUPPORTED 1
@@ -163,14 +134,6 @@ especially to test compatibility with D3D12_RESOURCE_HEAP_TIER_1 on modern GPUs.
    #endif
 #endif

-#ifndef D3D12MA_OPTIONS4_SUPPORTED
-    #ifdef __ID3D12Device5_INTERFACE_DEFINED__
-        #define D3D12MA_OPTIONS4_SUPPORTED 1
-    #else
-        #define D3D12MA_OPTIONS4_SUPPORTED 0
-    #endif
-#endif
-
 #ifndef D3D12MA_DEBUG_LOG
   #define D3D12MA_DEBUG_LOG(format, ...)
   /*
@@ -223,7 +186,6 @@ static const D3D12_HEAP_FLAGS RESOURCE_CLASS_HEAP_FLAGS =
 static const D3D12_RESIDENCY_PRIORITY D3D12_RESIDENCY_PRIORITY_NONE = D3D12_RESIDENCY_PRIORITY(0);

 static const D3D12_HEAP_TYPE D3D12_HEAP_TYPE_GPU_UPLOAD_COPY = (D3D12_HEAP_TYPE)5;
-static const D3D12_RESOURCE_FLAGS D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY = (D3D12_RESOURCE_FLAGS)0x400;

 #ifndef _D3D12MA_ENUM_DECLARATIONS

@@ -711,13 +673,6 @@ static UINT GetBitsPerPixel(DXGI_FORMAT format)
    case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
    case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
        return 32;
-    case DXGI_FORMAT_B8G8R8A8_UNORM:
-    case DXGI_FORMAT_B8G8R8X8_UNORM:
-    case DXGI_FORMAT_B8G8R8A8_TYPELESS:
-    case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
-    case DXGI_FORMAT_B8G8R8X8_TYPELESS:
-    case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB:
-        return 32;
    case DXGI_FORMAT_R8G8_TYPELESS:
    case DXGI_FORMAT_R8G8_UNORM:
    case DXGI_FORMAT_R8G8_UINT:
@@ -732,9 +687,6 @@ static UINT GetBitsPerPixel(DXGI_FORMAT format)
    case DXGI_FORMAT_R16_SNORM:
    case DXGI_FORMAT_R16_SINT:
        return 16;
-    case DXGI_FORMAT_B5G6R5_UNORM:
-    case DXGI_FORMAT_B5G5R5A1_UNORM:
-        return 16;
    case DXGI_FORMAT_R8_TYPELESS:
    case DXGI_FORMAT_R8_UNORM:
    case DXGI_FORMAT_R8_UINT:
@@ -785,175 +737,46 @@ static ResourceClass ResourceDescToResourceClass(const D3D12_RESOURCE_DESC_T& re
        (resDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) != 0;
    return isRenderTargetOrDepthStencil ? ResourceClass::RT_DS_Texture : ResourceClass::Non_RT_DS_Texture;
 }
-
-static bool ResourceDimensionIsTexture(D3D12_RESOURCE_DIMENSION dimension)
-{
-    return dimension == D3D12_RESOURCE_DIMENSION_TEXTURE1D ||
-        dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D ||
-        dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D;
-}
-
-static bool ResourceFlagsContainRenderTargetOrDepthStencil(D3D12_RESOURCE_FLAGS flags)
-{
-    return (flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) != 0;
-}
    
-struct SmallAlignmentTileShape
-{
-    UINT Width;
-    UINT Height;
-    UINT Depth;
-};
-
-static bool GetSmallAlignmentTileShape(
-    D3D12_RESOURCE_DIMENSION dimension,
-    bool isMsaa,
-    UINT bitsPerUnit,
-    SmallAlignmentTileShape& outTileShape)
-{
-    if (isMsaa)
-    {
-        if (dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D)
-            return false;
-
-        switch (bitsPerUnit)
-        {
-        case    8: outTileShape = { 256, 256, 1 }; return true;
-        case   16: outTileShape = { 256, 128, 1 }; return true;
-        case   32: outTileShape = { 128, 128, 1 }; return true;
-        case   64: outTileShape = { 128,  64, 1 }; return true;
-        case  128: outTileShape = {  64,  64, 1 }; return true;
-        case  256: outTileShape = {  64,  32, 1 }; return true;
-        case  512: outTileShape = {  32,  32, 1 }; return true;
-        case 1024: outTileShape = {  32,  16, 1 }; return true;
-        case 2048: outTileShape = {  16,  16, 1 }; return true;
-        default: return false;
-        }
-    }
-
-    switch (dimension)
-    {
-    case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
-        switch (bitsPerUnit)
-        {
-        case   8: outTileShape = { 4096, 1, 1 }; return true;
-        case  16: outTileShape = { 2048, 1, 1 }; return true;
-        case  32: outTileShape = { 1024, 1, 1 }; return true;
-        case  64: outTileShape = {  512, 1, 1 }; return true;
-        case 128: outTileShape = {  256, 1, 1 }; return true;
-        default: return false;
-        }
-
-    case D3D12_RESOURCE_DIMENSION_TEXTURE2D:
-        switch (bitsPerUnit)
-        {
-        case   8: outTileShape = { 64, 64, 1 }; return true;
-        case  16: outTileShape = { 64, 32, 1 }; return true;
-        case  32: outTileShape = { 32, 32, 1 }; return true;
-        case  64: outTileShape = { 32, 16, 1 }; return true;
-        case 128: outTileShape = { 16, 16, 1 }; return true;
-        default: return false;
-        }
-
-    case D3D12_RESOURCE_DIMENSION_TEXTURE3D:
-        // 4 KB counterparts of the documented 64 KB volume-tile shapes.
-        switch (bitsPerUnit)
-        {
-        case   8: outTileShape = { 16, 16, 16 }; return true;
-        case  16: outTileShape = { 16, 16,  8 }; return true;
-        case  32: outTileShape = { 16,  8,  8 }; return true;
-        case  64: outTileShape = {  8,  8,  8 }; return true;
-        case 128: outTileShape = {  8,  8,  4 }; return true;
-        default: return false;
-        }
-
-    default:
-        return false;
-    }
-}
-
-// This algorithm is overly conservative and applies only to the legacy small-alignment heuristic path.
+// This algorithm is overly conservative.
 template<typename D3D12_RESOURCE_DESC_T>
 static bool CanUseSmallAlignment(const D3D12_RESOURCE_DESC_T& resourceDesc)
 {
-    if (resourceDesc.SampleDesc.Count == 0 ||
-        resourceDesc.Layout != D3D12_TEXTURE_LAYOUT_UNKNOWN ||
-        resourceDesc.Width > UINT_MAX)
-    {
+    if (resourceDesc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D)
        return false;
-    }
-
-    const bool isMsaa = resourceDesc.SampleDesc.Count > 1;
-    const bool isRtDs = ResourceFlagsContainRenderTargetOrDepthStencil(resourceDesc.Flags);
-    if (isMsaa && !isRtDs)
-    {
+    if ((resourceDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) != 0)
        return false;
-    }
-    if (!isMsaa &&
-        isRtDs)
-    {
+    if (resourceDesc.SampleDesc.Count > 1)
+        return false;
+    if (resourceDesc.DepthOrArraySize != 1)
        return false;
-    }

    UINT sizeX = (UINT)resourceDesc.Width;
-    UINT sizeY = 1;
-    UINT sizeZ = 1;
-    UINT bitsPerUnit = GetBitsPerPixel(resourceDesc.Format);
-    if (bitsPerUnit == 0)
+    UINT sizeY = resourceDesc.Height;
+    UINT bitsPerPixel = GetBitsPerPixel(resourceDesc.Format);
+    if (bitsPerPixel == 0)
        return false;

-    switch (resourceDesc.Dimension)
+    if (IsFormatCompressed(resourceDesc.Format))
    {
-    case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
-        if (isMsaa)
-            return false;
-        // For 1D arrays, small-alignment eligibility depends on the mip0 slice size, not array size.
-        if (IsFormatCompressed(resourceDesc.Format))
-            return false;
-        break;
-
-    case D3D12_RESOURCE_DIMENSION_TEXTURE2D:
-        // For 2D arrays, small-alignment eligibility depends on mip0 width/height, not array size.
-        sizeY = resourceDesc.Height;
-        if (isMsaa && IsFormatCompressed(resourceDesc.Format))
-            return false;
-        if (IsFormatCompressed(resourceDesc.Format))
-        {
-            sizeX = DivideRoundingUp(sizeX, 4u);
-            sizeY = DivideRoundingUp(sizeY, 4u);
-            bitsPerUnit *= 16;
-        }
-        break;
-
-    case D3D12_RESOURCE_DIMENSION_TEXTURE3D:
-        if (isMsaa)
-            return false;
-        sizeY = resourceDesc.Height;
-        sizeZ = resourceDesc.DepthOrArraySize;
-        if (IsFormatCompressed(resourceDesc.Format))
-        {
-            sizeX = DivideRoundingUp(sizeX, 4u);
-            sizeY = DivideRoundingUp(sizeY, 4u);
-            bitsPerUnit *= 16;
-        }
-        break;
-
-    default:
-        return false;
+        sizeX = DivideRoundingUp(sizeX, 4u);
+        sizeY = DivideRoundingUp(sizeY, 4u);
+        bitsPerPixel *= 16;
    }

-    bitsPerUnit *= resourceDesc.SampleDesc.Count;
+    UINT tileSizeX = 0, tileSizeY = 0;
+    switch (bitsPerPixel)
+    {
+    case   8: tileSizeX = 64; tileSizeY = 64; break;
+    case  16: tileSizeX = 64; tileSizeY = 32; break;
+    case  32: tileSizeX = 32; tileSizeY = 32; break;
+    case  64: tileSizeX = 32; tileSizeY = 16; break;
+    case 128: tileSizeX = 16; tileSizeY = 16; break;
+    default: return false;
+    }

-    SmallAlignmentTileShape tileShape = {};
-    if (!GetSmallAlignmentTileShape(resourceDesc.Dimension, isMsaa, bitsPerUnit, tileShape))
-        return false;
-
-    const UINT64 tileCount =
-        UINT64(DivideRoundingUp(sizeX, tileShape.Width)) *
-        UINT64(DivideRoundingUp(sizeY, tileShape.Height)) *
-        UINT64(DivideRoundingUp(sizeZ, tileShape.Depth));
-    // Non-MSAA compares 64 KB against 4 KB tiles => 16 pages. MSAA compares 4 MB against 64 KB tiles => 64 pages.
-    return tileCount <= (isMsaa ? 64 : 16);
+    const UINT tileCount = DivideRoundingUp(sizeX, tileSizeX) * DivideRoundingUp(sizeY, tileSizeY);
+    return tileCount <= 16;
 }
    
 static bool ValidateAllocateMemoryParameters(
@@ -964,9 +787,11 @@ static bool ValidateAllocateMemoryParameters(
    return pAllocDesc &&
        pAllocInfo &&
        ppAllocation &&
-        IsPow2(pAllocInfo->Alignment) &&
-        pAllocInfo->SizeInBytes > 0 &&
-        pAllocInfo->SizeInBytes % 4 == 0;
+        (pAllocInfo->Alignment == 0 ||
+            pAllocInfo->Alignment == D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT ||
+            pAllocInfo->Alignment == D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) &&
+        pAllocInfo->SizeInBytes != 0 &&
+        pAllocInfo->SizeInBytes % (64ull * 1024) == 0;
 }

 #endif // _D3D12MA_FUNCTIONS
@@ -6135,9 +5960,6 @@ public:
    BOOL IsCacheCoherentUMA() const { return m_D3D12Architecture.CacheCoherentUMA; }
    bool SupportsResourceHeapTier2() const { return m_D3D12Options.ResourceHeapTier >= D3D12_RESOURCE_HEAP_TIER_2; }
    bool IsGPUUploadHeapSupported() const { return m_GPUUploadHeapSupported != FALSE; }
-    bool IsMsaa64KBAlignedTextureSupported() const { return m_MSAA64KBAlignedTextureSupported != FALSE; }
-    bool IsTightAlignmentSupported() const { return m_TightAlignmentSupported != FALSE; }
-    bool IsTightAlignmentEnabled() const { return IsTightAlignmentSupported() && m_UseTightAlignment; }
    bool UseMutex() const { return m_UseMutex; }
    AllocationObjectAllocator& GetAllocationObjectAllocator() { return m_AllocationObjectAllocator; }
    UINT GetCurrentFrameIndex() const { return m_CurrentFrameIndex.load(); }
@@ -6225,7 +6047,6 @@ private:
    const bool m_AlwaysCommitted;
    const bool m_MsaaAlwaysCommitted;
    const bool m_PreferSmallBuffersCommitted;
-    const bool m_UseTightAlignment;
    bool m_DefaultPoolsNotZeroed = false;
    ID3D12Device* m_Device; // AddRef
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
@@ -6253,8 +6074,6 @@ private:
    DXGI_ADAPTER_DESC m_AdapterDesc;
    D3D12_FEATURE_DATA_D3D12_OPTIONS m_D3D12Options;
    BOOL m_GPUUploadHeapSupported = FALSE;
-    BOOL m_MSAA64KBAlignedTextureSupported = FALSE;
-    BOOL m_TightAlignmentSupported = FALSE;
    D3D12_FEATURE_DATA_ARCHITECTURE m_D3D12Architecture;
    AllocationObjectAllocator m_AllocationObjectAllocator;

@@ -6270,7 +6089,7 @@ private:
    */
    template<typename D3D12_RESOURCE_DESC_T>
    bool PrefersCommittedAllocation(const D3D12_RESOURCE_DESC_T& resourceDesc,
-        ALLOCATION_FLAGS strategy, bool useTightAlignment) const;
+        ALLOCATION_FLAGS strategy);

    // Allocates and registers new committed resource with implicit heap, as dedicated allocation.
    // Creates and returns Allocation object and optionally D3D12 resource.
@@ -6290,7 +6109,6 @@ private:
    template<typename D3D12_RESOURCE_DESC_T>
    HRESULT CalcAllocationParams(const ALLOCATION_DESC& allocDesc, UINT64 allocSize,
        const D3D12_RESOURCE_DESC_T* resDesc, // Optional
-        bool useTightAlignment,
        BlockVector*& outBlockVector, CommittedAllocationParameters& outCommittedAllocationParams, bool& outPreferCommitted);

    // Returns UINT32_MAX if index cannot be calculcated.
@@ -6324,10 +6142,7 @@ private:
    template<typename D3D12_RESOURCE_DESC_T>
    HRESULT GetResourceAllocationInfo(D3D12_RESOURCE_DESC_T& inOutResourceDesc,
        UINT32 NumCastableFormats, const DXGI_FORMAT* pCastableFormats,
-        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo,
-        bool useTightAlignment) const;
-
-    bool IsTightAlignmentEnabled(const ALLOCATION_DESC& allocDesc) const;
+        D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const;

    bool NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size);

@@ -6340,8 +6155,7 @@ AllocatorPimpl::AllocatorPimpl(const ALLOCATION_CALLBACKS& allocationCallbacks,
    : m_UseMutex((desc.Flags & ALLOCATOR_FLAG_SINGLETHREADED) == 0),
    m_AlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_ALWAYS_COMMITTED) != 0),
    m_MsaaAlwaysCommitted((desc.Flags & ALLOCATOR_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0),
-    m_PreferSmallBuffersCommitted((desc.Flags& ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
-    m_UseTightAlignment((desc.Flags & ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT) == 0),
+    m_PreferSmallBuffersCommitted((desc.Flags & ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED) == 0),
    m_Device(desc.pDevice),
    m_Adapter(desc.pAdapter),
    m_PreferredBlockSize(desc.PreferredBlockSize != 0 ? desc.PreferredBlockSize : D3D12MA_DEFAULT_BLOCK_SIZE),
@@ -6430,29 +6244,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
    }
 #endif // #if D3D12MA_OPTIONS16_SUPPORTED

-#if D3D12MA_OPTIONS4_SUPPORTED
-    {
-        D3D12_FEATURE_DATA_D3D12_OPTIONS4 options4 = {};
-        hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS4, &options4, sizeof(options4));
-        if (SUCCEEDED(hr))
-        {
-            m_MSAA64KBAlignedTextureSupported = options4.MSAA64KBAlignedTextureSupported;
-        }
-    }
-#endif // #if D3D12MA_OPTIONS4_SUPPORTED
-
-#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    {
-        D3D12_FEATURE_DATA_TIGHT_ALIGNMENT tightAlignment = {};
-        hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_D3D12_TIGHT_ALIGNMENT, &tightAlignment, sizeof(tightAlignment));
-        if (SUCCEEDED(hr))
-        {
-            m_TightAlignmentSupported = tightAlignment.SupportTier >= D3D12_TIGHT_ALIGNMENT_TIER_1;
-            
-        }
-    }
-#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-
    hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &m_D3D12Architecture, sizeof(m_D3D12Architecture));
    if (FAILED(hr))
    {
@@ -6482,7 +6273,7 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
            0, // minBlockCount
            SIZE_MAX, // maxBlockCount
            false, // explicitBlockSize
-            (UINT64)D3D12MA_DEFAULT_ALIGNMENT, // minAllocationAlignment
+            D3D12MA_DEBUG_ALIGNMENT, // minAllocationAlignment
            0, // Default algorithm,
            m_MsaaAlwaysCommitted,
            NULL, // pProtectedSession
@@ -6647,7 +6438,6 @@ HRESULT AllocatorPimpl::CreateResource(
    }

    HRESULT hr = E_NOINTERFACE;
-    const bool useTightAlignment = IsTightAlignmentEnabled(*pAllocDesc);
    CREATE_RESOURCE_PARAMS finalCreateParams = createParams;
    D3D12_RESOURCE_DESC finalResourceDesc;
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
@@ -6658,7 +6448,7 @@ HRESULT AllocatorPimpl::CreateResource(
    {
        finalResourceDesc = *createParams.GetResourceDesc();
        finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo, useTightAlignment);
+        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
    }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
@@ -6667,7 +6457,7 @@ HRESULT AllocatorPimpl::CreateResource(
        {
            finalResourceDesc1 = *createParams.GetResourceDesc1();
            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo, useTightAlignment);
+            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
        }
    }
 #endif
@@ -6679,7 +6469,7 @@ HRESULT AllocatorPimpl::CreateResource(
            finalResourceDesc1 = *createParams.GetResourceDesc1();
            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo, useTightAlignment);
+                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
        }
    }
 #endif
@@ -6705,14 +6495,14 @@ HRESULT AllocatorPimpl::CreateResource(
    if (createParams.Variant >= CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
    {
        hr = CalcAllocationParams<D3D12_RESOURCE_DESC1>(*pAllocDesc, resAllocInfo.SizeInBytes,
-            createParams.GetResourceDesc1(), useTightAlignment,
+            createParams.GetResourceDesc1(),
            blockVector, committedAllocationParams, preferCommitted);
    }
    else
 #endif
    {
        hr = CalcAllocationParams<D3D12_RESOURCE_DESC>(*pAllocDesc, resAllocInfo.SizeInBytes,
-            createParams.GetResourceDesc(), useTightAlignment,
+            createParams.GetResourceDesc(),
            blockVector, committedAllocationParams, preferCommitted);
    }
    if (FAILED(hr))
@@ -6759,7 +6549,6 @@ HRESULT AllocatorPimpl::AllocateMemory(
    bool preferCommitted = false;
    HRESULT hr = CalcAllocationParams<D3D12_RESOURCE_DESC>(*pAllocDesc, pAllocInfo->SizeInBytes,
        NULL, // pResDesc
-        false, // useTightAlignment - irrelevant for AllocateMemory
        blockVector, committedAllocationParams, preferCommitted);
    if (FAILED(hr))
        return hr;
@@ -6808,7 +6597,7 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
    {
        finalResourceDesc = *createParams.GetResourceDesc();
        finalCreateParams.AccessResourceDesc() = &finalResourceDesc;
-        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo, IsTightAlignmentEnabled());
+        hr = GetResourceAllocationInfo(finalResourceDesc, 0, NULL, resAllocInfo);
    }
 #ifdef __ID3D12Device8_INTERFACE_DEFINED__
    else if (createParams.Variant == CREATE_RESOURCE_PARAMS::VARIANT_WITH_STATE_AND_DESC1)
@@ -6817,7 +6606,7 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
        {
            finalResourceDesc1 = *createParams.GetResourceDesc1();
            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
-            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo, IsTightAlignmentEnabled());
+            hr = GetResourceAllocationInfo(finalResourceDesc1, 0, NULL, resAllocInfo);
        }
    }
 #endif
@@ -6829,7 +6618,7 @@ HRESULT AllocatorPimpl::CreateAliasingResource(
            finalResourceDesc1 = *createParams.GetResourceDesc1();
            finalCreateParams.AccessResourceDesc1() = &finalResourceDesc1;
            hr = GetResourceAllocationInfo(finalResourceDesc1,
-                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo, IsTightAlignmentEnabled());
+                createParams.GetNumCastableFormats(), createParams.GetCastableFormats(), resAllocInfo);
        }
    }
 #endif
@@ -7151,9 +6940,6 @@ void AllocatorPimpl::BuildStatsString(WCHAR** ppStatsString, BOOL detailedMap)

                json.WriteString(L"GPUUploadHeapSupported");
                json.WriteBool(m_GPUUploadHeapSupported != FALSE);
-
-                json.WriteString(L"TightAlignmentSupported");
-                json.WriteBool(m_TightAlignmentSupported != FALSE);
            }
            json.EndObject();
        }
@@ -7464,14 +7250,13 @@ void AllocatorPimpl::FreeStatsString(WCHAR* pStatsString)

 template<typename D3D12_RESOURCE_DESC_T>
 bool AllocatorPimpl::PrefersCommittedAllocation(const D3D12_RESOURCE_DESC_T& resourceDesc,
-    ALLOCATION_FLAGS strategy, bool useTightAlignment) const
+    ALLOCATION_FLAGS strategy)
 {
    // Prefer creating small buffers <= 32 KB as committed, because drivers pack them better,
    // while placed buffers require 64 KB alignment.
    if(resourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
        resourceDesc.Width <= D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT / 2 &&
        strategy != ALLOCATION_FLAG_STRATEGY_MIN_TIME &&  // Creating as committed would be slower.
-        !useTightAlignment &&
        m_PreferSmallBuffersCommitted)
    {
        return true;
@@ -7686,7 +7471,7 @@ HRESULT AllocatorPimpl::AllocateHeap(

 template<typename D3D12_RESOURCE_DESC_T>
 HRESULT AllocatorPimpl::CalcAllocationParams(const ALLOCATION_DESC& allocDesc, UINT64 allocSize,
-    const D3D12_RESOURCE_DESC_T* resDesc, bool useTightAlignment,
+    const D3D12_RESOURCE_DESC_T* resDesc,
    BlockVector*& outBlockVector, CommittedAllocationParameters& outCommittedAllocationParams, bool& outPreferCommitted)
 {
    outBlockVector = NULL;
@@ -7759,7 +7544,7 @@ HRESULT AllocatorPimpl::CalcAllocationParams(const ALLOCATION_DESC& allocDesc, U
    {
        if (resDesc->SampleDesc.Count > 1 && msaaAlwaysCommitted)
            outBlockVector = NULL;
-        if (!outPreferCommitted && PrefersCommittedAllocation(*resDesc, allocDesc.Flags & ALLOCATION_FLAG_STRATEGY_MASK, useTightAlignment))
+        if (!outPreferCommitted && PrefersCommittedAllocation(*resDesc, allocDesc.Flags & ALLOCATION_FLAG_STRATEGY_MASK))
            outPreferCommitted = true;
    }

@@ -7970,28 +7755,11 @@ 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,
-    bool useTightAlignment) const
+    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
 {
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
-
-#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    if (useTightAlignment)
-    {
-        // Don't allow USE_TIGHT_ALIGNMENT together with ALLOW_CROSS_ADAPTER as there is a D3D Debug Layer error:
-        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT will be ignored since D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER is set. [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
-        // Also don't allow it together with D3D12_TEXTURE_LAYOUT_64KB_*_SWIZZLE, as there is this error (see issue #86):
-        // D3D12 ERROR: ID3D12Device::GetResourceAllocationInfo: D3D12_RESOURCE_DESC::Flag D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT is not valid when the layout is either D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE or D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE (...). [ STATE_CREATION ERROR #599: CREATERESOURCE_INVALIDMISCFLAGS]
-        if((inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER) == 0
-            && (inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE && inOutResourceDesc.Layout != D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE))
-        {
-            inOutResourceDesc.Flags |= D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT;
-        }
-    }
-#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-
-    /* Optional optimization: Microsoft documentation of the ID3D12Device::
-    GetResourceAllocationInfo function says:
+    /* Optional optimization: Microsoft documentation says:
+    https://docs.microsoft.com/en-us/windows/win32/api/d3d12/nf-d3d12-id3d12device-getresourceallocationinfo

    Your application can forgo using GetResourceAllocationInfo for buffer resources
    (D3D12_RESOURCE_DIMENSION_BUFFER). Buffers have the same size on all adapters,
@@ -7999,47 +7767,25 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    D3D12_RESOURCE_DESC::Width.
    */
    if (inOutResourceDesc.Alignment == 0 &&
-        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
-        !useTightAlignment)
+        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER)
    {
        outAllocInfo = {
            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
-    bool trySmallAlignment = false;
-
-    if (inOutResourceDesc.Alignment == 0
-        && (inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY) == 0
-        && inOutResourceDesc.Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN
-        && ResourceDimensionIsTexture(inOutResourceDesc.Dimension))
-    {
-        // MSAA texture.
-        if(inOutResourceDesc.SampleDesc.Count > 1)
-        {
-            trySmallAlignment = IsMsaa64KBAlignedTextureSupported()
-                && ResourceFlagsContainRenderTargetOrDepthStencil(inOutResourceDesc.Flags)
-                && inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D;
-        }
-        // Non-MSAA texture.
-        else
-        {
-            trySmallAlignment = !ResourceFlagsContainRenderTargetOrDepthStencil(inOutResourceDesc.Flags);
-        }
-    }
-
+    if (inOutResourceDesc.Alignment == 0 &&
+        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D &&
+        (inOutResourceDesc.Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)) == 0
 #if D3D12MA_USE_SMALL_RESOURCE_PLACEMENT_ALIGNMENT == 1
-    if(trySmallAlignment)
-        trySmallAlignment = CanUseSmallAlignment(inOutResourceDesc);
+        && CanUseSmallAlignment(inOutResourceDesc)
 #endif
-    
-    if (trySmallAlignment)
+        )
    {
        /*
        The algorithm here is based on Microsoft sample: "Small Resources Sample"
@@ -8064,20 +7810,6 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
        inOutResourceDesc, NumCastableFormats, pCastableFormats, outAllocInfo);
 }

-bool AllocatorPimpl::IsTightAlignmentEnabled(const ALLOCATION_DESC& allocDesc) const
-{
-    if (!IsTightAlignmentEnabled())
-        return false;
-
-    if (allocDesc.CustomPool != NULL &&
-        (allocDesc.CustomPool->m_Pimpl->GetDesc().Flags & POOL_FLAG_DONT_USE_TIGHT_ALIGNMENT) != 0)
-    {
-        return false;
-    }
-
-    return true;
-}
-
 bool AllocatorPimpl::NewAllocationWithinBudget(D3D12_HEAP_TYPE heapType, UINT64 size)
 {
    Budget budget = {};
@@ -8356,7 +8088,7 @@ BlockVector::BlockVector(
    m_MinBlockCount(minBlockCount),
    m_MaxBlockCount(maxBlockCount),
    m_ExplicitBlockSize(explicitBlockSize),
-    m_MinAllocationAlignment(D3D12MA_MAX(minAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT)),
+    m_MinAllocationAlignment(minAllocationAlignment),
    m_Algorithm(algorithm),
    m_DenyMsaaTextures(denyMsaaTextures),
    m_ProtectedSession(pProtectedSession),
@@ -9509,14 +9241,12 @@ PoolPimpl::PoolPimpl(AllocatorPimpl* allocator, const POOL_DESC& desc)
    D3D12MA_ASSERT(m_Desc.pProtectedSession == NULL);
 #endif

-    const UINT64 minAlignment = desc.MinAllocationAlignment > 0 ? desc.MinAllocationAlignment : D3D12MA_DEFAULT_ALIGNMENT;
-
    m_BlockVector = D3D12MA_NEW(allocator->GetAllocs(), BlockVector)(
        allocator, desc.HeapProperties, desc.HeapFlags,
        preferredBlockSize,
        desc.MinBlockCount, maxBlockCount,
        explicitBlockSize,
-        minAlignment,
+        D3D12MA_MAX(desc.MinAllocationAlignment, (UINT64)D3D12MA_DEBUG_ALIGNMENT),
        (desc.Flags & POOL_FLAG_ALGORITHM_MASK) != 0,
        (desc.Flags & POOL_FLAG_MSAA_TEXTURES_ALWAYS_COMMITTED) != 0,
        desc.pProtectedSession,
@@ -9979,11 +9709,6 @@ BOOL Allocator::IsGPUUploadHeapSupported() const
    return m_Pimpl->IsGPUUploadHeapSupported();
 }

-BOOL Allocator::IsTightAlignmentSupported() const
-{
-    return m_Pimpl->IsTightAlignmentSupported();
-}
-
 UINT64 Allocator::GetMemoryCapacity(UINT memorySegmentGroup) const
 {
    return m_Pimpl->GetMemoryCapacity(memorySegmentGroup);
@@ -10075,7 +9800,7 @@ HRESULT Allocator::AllocateMemory(
        return E_INVALIDARG;
    }
    D3D12MA_DEBUG_GLOBAL_MUTEX_LOCK
-    return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
+        return m_Pimpl->AllocateMemory(pAllocDesc, pAllocInfo, ppAllocation);
 }

 HRESULT Allocator::CreateAliasingResource(
@@ -4,6 +4,8 @@ add_library(demanglegnu STATIC
 	src/cplus-dem.c
 	src/d-demangle.c
 	src/dyn-string.c
+	src/getopt1.c
+	src/getopt.c
 	src/rust-demangle.c
 	src/safe-ctype.c
 	src/xexit.c
@@ -17,11 +19,9 @@ set(GNU_DEMANGLER_FLAGS -DHAVE_DECL_BASENAME=1 -DHAVE_LIMITS_H=1 -DHAVE_STDLIB_H
 target_include_directories(demanglegnu PUBLIC include)
 target_compile_definitions(demanglegnu PUBLIC ${GNU_DEMANGLER_FLAGS})

-if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-	add_executable(demangler_fuzzer testsuite/demangler-fuzzer.c)
-	target_link_libraries(demangler_fuzzer demanglegnu)
-	target_compile_definitions(demangler_fuzzer PUBLIC ${GNU_DEMANGLER_FLAGS})
-endif()
+add_executable(demangler_fuzzer testsuite/demangler-fuzzer.c)
 add_executable(demangler_test testsuite/test-demangle.c)
+target_link_libraries(demangler_fuzzer demanglegnu)
 target_link_libraries(demangler_test demanglegnu)
+target_compile_definitions(demangler_fuzzer PUBLIC ${GNU_DEMANGLER_FLAGS})
 target_compile_definitions(demangler_test PUBLIC ${GNU_DEMANGLER_FLAGS})
@@ -17,6 +17,7 @@ cp "$GCC_DIR/include/ansidecl.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/demangle.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/dyn-string.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/environ.h" "$OUT_DIR/include/"
+cp "$GCC_DIR/include/getopt.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/libiberty.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/include/safe-ctype.h" "$OUT_DIR/include/"
 cp "$GCC_DIR/libiberty/alloca.c" "$OUT_DIR/src/"
@@ -26,6 +27,8 @@ cp "$GCC_DIR/libiberty/cp-demangle.h" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/cplus-dem.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/d-demangle.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/dyn-string.c" "$OUT_DIR/src/"
+cp "$GCC_DIR/libiberty/getopt.c" "$OUT_DIR/src/"
+cp "$GCC_DIR/libiberty/getopt1.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/rust-demangle.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/safe-ctype.c" "$OUT_DIR/src/"
 cp "$GCC_DIR/libiberty/xexit.c" "$OUT_DIR/src/"
@@ -35,6 +35,7 @@
    <ClInclude Include="include\demangle.h" />
    <ClInclude Include="include\dyn-string.h" />
    <ClInclude Include="include\environ.h" />
+    <ClInclude Include="include\getopt.h" />
    <ClInclude Include="include\libiberty.h" />
    <ClInclude Include="include\safe-ctype.h" />
  </ItemGroup>
@@ -45,6 +46,8 @@
    <ClCompile Include="src\cplus-dem.c" />
    <ClCompile Include="src\d-demangle.c" />
    <ClCompile Include="src\dyn-string.c" />
+    <ClCompile Include="src\getopt.c" />
+    <ClCompile Include="src\getopt1.c" />
    <ClCompile Include="src\rust-demangle.c" />
    <ClCompile Include="src\safe-ctype.c" />
    <ClCompile Include="src\xexit.c" />
@@ -30,6 +30,9 @@
    <ClInclude Include="include\environ.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="include\getopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="include\libiberty.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -56,6 +59,12 @@
    <ClCompile Include="src\dyn-string.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="src\getopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\getopt1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="src\rust-demangle.c">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -0,0 +1,143 @@
+/* Declarations for getopt.
+   Copyright (C) 1989-2023 Free Software Foundation, Inc.
+
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+#if defined (__STDC__) && __STDC__
+  const char *name;
+#else
+  char *name;
+#endif
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define	no_argument		0
+#define required_argument	1
+#define optional_argument	2
+
+#if defined (__STDC__) && __STDC__
+/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+   undefined, we haven't run the autoconf check so provide the
+   declaration without arguments.  If it is 0, we checked and failed
+   to find the declaration so provide a fully prototyped one.  If it
+   is 1, we found it so don't provide any declaration at all.  */
+#if !HAVE_DECL_GETOPT
+#if defined (__GNU_LIBRARY__) || defined (HAVE_DECL_GETOPT)
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in unistd.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int argc, char *const *argv, const char *shortopts);
+#else
+#ifndef __cplusplus
+extern int getopt ();
+#endif /* __cplusplus */
+#endif
+#endif /* !HAVE_DECL_GETOPT */
+
+extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+		        const struct option *longopts, int *longind);
+extern int getopt_long_only (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind);
+
+/* Internal only.  Users should not call this directly.  */
+extern int _getopt_internal (int argc, char *const *argv,
+			     const char *shortopts,
+		             const struct option *longopts, int *longind,
+			     int long_only);
+#else /* not __STDC__ */
+extern int getopt ();
+extern int getopt_long ();
+extern int getopt_long_only ();
+
+extern int _getopt_internal ();
+#endif /* __STDC__ */
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* getopt.h */
@@ -0,0 +1,179 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987-2023 Free Software Foundation, Inc.
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if !defined __STDC__ || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+#include "getopt.h"
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef	NULL
+#define NULL 0
+#endif
+
+int
+getopt_long (int argc,  char *const *argv,  const char *options,
+             const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+   If an option that starts with '-' (not '--') doesn't match a long option,
+   but does match a short option, it is parsed as a short option
+   instead.  */
+
+int
+getopt_long_only (int argc, char *const *argv, const char *options,
+                  const struct option *long_options, int *opt_index)
+{
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+}
+
+
+#endif	/* Not ELIDE_CODE.  */
+
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+main (int argc, char **argv)
+{
+  int c;
+  int digit_optind = 0;
+
+  while (1)
+    {
+      int this_option_optind = optind ? optind : 1;
+      int option_index = 0;
+      static struct option long_options[] =
+      {
+	{"add", 1, 0, 0},
+	{"append", 0, 0, 0},
+	{"delete", 1, 0, 0},
+	{"verbose", 0, 0, 0},
+	{"create", 0, 0, 0},
+	{"file", 1, 0, 0},
+	{0, 0, 0, 0}
+      };
+
+      c = getopt_long (argc, argv, "abc:d:0123456789",
+		       long_options, &option_index);
+      if (c == -1)
+	break;
+
+      switch (c)
+	{
+	case 0:
+	  printf ("option %s", long_options[option_index].name);
+	  if (optarg)
+	    printf (" with arg %s", optarg);
+	  printf ("\n");
+	  break;
+
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	  if (digit_optind != 0 && digit_optind != this_option_optind)
+	    printf ("digits occur in two different argv-elements.\n");
+	  digit_optind = this_option_optind;
+	  printf ("option %c\n", c);
+	  break;
+
+	case 'a':
+	  printf ("option a\n");
+	  break;
+
+	case 'b':
+	  printf ("option b\n");
+	  break;
+
+	case 'c':
+	  printf ("option c with value `%s'\n", optarg);
+	  break;
+
+	case 'd':
+	  printf ("option d with value `%s'\n", optarg);
+	  break;
+
+	case '?':
+	  break;
+
+	default:
+	  printf ("?? getopt returned character code 0%o ??\n", c);
+	}
+    }
+
+  if (optind < argc)
+    {
+      printf ("non-option ARGV-elements: ");
+      while (optind < argc)
+	printf ("%s ", argv[optind++]);
+      printf ("\n");
+    }
+
+  exit (0);
+}
+
+#endif /* TEST */
@@ -3,9 +3,6 @@

 [![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)

-*Note: This library is for C++ users. C programmers should consider [ffc.h](https://github.com/kolemannix/ffc.h). It is a high-performance port of fast_float to C.*
-
-
 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.,
@@ -13,7 +10,6 @@ These functions convert ASCII strings representing decimal values (e.g.,
 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):
@@ -22,9 +18,9 @@ requires C++11):
 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, ...);
 ```
-If they are available on your system, we also support fixed-width floating-point types such as `std::float64_t`, `std::float32_t`, `std::float16_t`, and `std::bfloat16_t`.

-You can also parse integer types such as `char`, `short`, `long`, `long long`,  `unsigned char`, `unsigned short`, `unsigned long`, `unsigned long long`, `bool` (0/1),  `int8_t`, `int16_t`, `int32_t`, `int64_t`, `uint8_t`, `uint16_t`, `uint32_t`, `uint64_t`.
+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, ...);
@@ -61,7 +57,6 @@ Example:
 ```C++
 #include "fast_float/fast_float.h"
 #include <iostream>
-#include <string>

 int main() {
  std::string input = "3.1416 xyz ";
@@ -73,25 +68,6 @@ int main() {
 }
 ```

-Prior to C++26, checking for a successful `std::from_chars` conversion requires comparing the `from_chars_result::ec` member to `std::errc()`. As an extension `fast_float::from_chars` supports the improved C++26 API that allows checking the result by converting it to `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)) {
-    std::cout << "parsed the number " << result << std::endl;
-    return EXIT_SUCCESS;
-  }
-  std::cerr << "failed to parse " << input << std::endl;
-  return EXIT_FAILURE;
-}
-```
-
 You can parse delimited numbers:

 ```C++
@@ -145,12 +121,9 @@ Furthermore, we have the following restrictions:
  fixed-width floating-point types such as `std::float64_t`, `std::float32_t`,
  `std::float16_t`, and `std::bfloat16_t`.
 * We only support the decimal format: we do not support hexadecimal strings.
-* For values that are very large positives or negatives (e.g., `1e9999`), we
-  represent them using a positive or negative infinity and the returned
+* 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 very close to zero (e.g., `1e-9999`), we represent them
-  using a positive or negative zero 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.
@@ -384,51 +357,6 @@ int main() {
 }
 ```

-## 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.
-
-You can use template overloads to get the result converted to different
-supported floating-point types: `float`, `double`, etc.
-For example, to get result as `float` use
-`fast_float::integer_times_pow10<float>()` specialization:
-```C++
-const uint64_t W = 12345678;
-const int Q = 23;
-const float result = fast_float::integer_times_pow10<float>(W, Q);
-std::cout.precision(9);
-std::cout << "float: " << W << " * 10^" << Q << " = " << result << " ("
-          << (result == 12345678e23f ? "==" : "!=") << "expected)\n";
-```
-outputs
-```
-float: 12345678 * 10^23 = 1.23456782e+30 (==expected)
-```
-
-Overloads of `fast_float::integer_times_pow10()` are provided for
-signed and unsigned integer types: `int64_t`, `uint64_t`, etc.
-
-
 ## Users and Related Work

 The fast_float library is part of:
@@ -436,8 +364,6 @@ 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),
@@ -450,10 +376,7 @@ The fast_float library is part of:
 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).
+AdaCore](https://github.com/AdaCore/VSS).

 The fast_float library provides a performance similar to that of the
 [fast_double_parser](https://github.com/lemire/fast_double_parser) library but
@@ -462,14 +385,6 @@ 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).

-
-
-Packages
------
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/fast-float.svg)](https://repology.org/project/fast-float/versions)
-
-
 ## References

 * Daniel Lemire, [Number Parsing at a Gigabyte per
@@ -492,7 +407,6 @@ Packages
  [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 a plain C port of the fast_float library](https://github.com/kolemannix/ffc.h) called ffc.h

 ## How fast is it?

@@ -541,7 +455,7 @@ sufficiently recent version of CMake (3.11 or better at least):
 FetchContent_Declare(
  fast_float
  GIT_REPOSITORY https://github.com/fastfloat/fast_float.git
-  GIT_TAG tags/v8.2.5
+  GIT_TAG tags/v8.0.2
  GIT_SHALLOW TRUE)

 FetchContent_MakeAvailable(fast_float)
@@ -557,7 +471,7 @@ You may also use [CPM](https://github.com/cpm-cmake/CPM.cmake), like so:
 CPMAddPackage(
  NAME fast_float
  GITHUB_REPOSITORY "fastfloat/fast_float"
-  GIT_TAG v8.2.5)
+  GIT_TAG v8.0.2)
 ```

 ## Using as single header
@@ -569,7 +483,7 @@ 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.2.5/fast_float.h>
+<https://github.com/fastfloat/fast_float/releases/download/v8.0.2/fast_float.h>

 ## Benchmarking

@@ -608,7 +522,6 @@ cmake --build build
  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`).

@@ -623,11 +536,6 @@ long digits.
 The library includes code adapted from Google Wuffs (written by Nigel Tao) which
 was originally published under the Apache 2.0 license.

-## Stars
-
-
-[![Star History Chart](https://api.star-history.com/svg?repos=fastfloat/fast_float&type=Date)](https://www.star-history.com/#fastfloat/fast_float&Date)
-
 ## License

 <sup>
@@ -32,7 +32,7 @@ template <typename UC> fastfloat_really_inline constexpr bool has_simd_opt() {
 // able to optimize it well.
 template <typename UC>
 fastfloat_really_inline constexpr bool is_integer(UC c) noexcept {
-  return (unsigned)(c - UC('0')) <= 9u;
+  return !(c > UC('9') || c < UC('0'));
 }

 fastfloat_really_inline constexpr uint64_t byteswap(uint64_t val) {
@@ -42,11 +42,6 @@ fastfloat_really_inline constexpr uint64_t byteswap(uint64_t val) {
         (val & 0x000000000000FF00) << 40 | (val & 0x00000000000000FF) << 56;
 }

-fastfloat_really_inline constexpr uint32_t byteswap_32(uint32_t val) {
-  return (val >> 24) | ((val >> 8) & 0x0000FF00u) | ((val << 8) & 0x00FF0000u) |
-         (val << 24);
-}
-
 // Read 8 UC into a u64. Truncates UC if not char.
 template <typename UC>
 fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint64_t
@@ -68,25 +63,6 @@ read8_to_u64(UC const *chars) {
  return val;
 }

-// Read 4 UC into a u32. Truncates UC if not char.
-template <typename UC>
-fastfloat_really_inline FASTFLOAT_CONSTEXPR20 uint32_t
-read4_to_u32(UC const *chars) {
-  if (cpp20_and_in_constexpr() || !std::is_same<UC, char>::value) {
-    uint32_t val = 0;
-    for (int i = 0; i < 4; ++i) {
-      val |= uint32_t(uint8_t(*chars)) << (i * 8);
-      ++chars;
-    }
-    return val;
-  }
-  uint32_t val;
-  ::memcpy(&val, chars, sizeof(uint32_t));
-#if FASTFLOAT_IS_BIG_ENDIAN == 1
-  val = byteswap_32(val);
-#endif
-  return val;
-}
 #ifdef FASTFLOAT_SSE2

 fastfloat_really_inline uint64_t simd_read8_to_u64(__m128i const data) {
@@ -168,18 +144,6 @@ is_made_of_eight_digits_fast(uint64_t val) noexcept {
            0x8080808080808080));
 }

-fastfloat_really_inline constexpr bool
-is_made_of_four_digits_fast(uint32_t val) noexcept {
-  return !((((val + 0x46464646) | (val - 0x30303030)) & 0x80808080));
-}
-
-fastfloat_really_inline FASTFLOAT_CONSTEXPR14 uint32_t
-parse_four_digits_unrolled(uint32_t val) noexcept {
-  val -= 0x30303030;
-  val = (val * 10) + (val >> 8);
-  return (((val & 0x00FF00FF) * 0x00640001) >> 16) & 0xFFFF;
-}
-
 #ifdef FASTFLOAT_HAS_SIMD

 // Call this if chars might not be 8 digits.
@@ -477,7 +441,7 @@ parse_number_string(UC const *p, UC const *pend,
    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;
@@ -487,7 +451,7 @@ parse_number_string(UC const *p, UC const *pend,
        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.
        p = answer.fraction.ptr;
@@ -545,148 +509,6 @@ parse_int_string(UC const *p, UC const *pend, T &value,

  UC const *const start_digits = p;

-  FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint8_t>::value)) {
-    if (base == 10) {
-      const size_t len = (size_t)(pend - p);
-      if (len == 0) {
-        if (has_leading_zeros) {
-          value = 0;
-          answer.ec = std::errc();
-          answer.ptr = p;
-        } else {
-          answer.ec = std::errc::invalid_argument;
-          answer.ptr = first;
-        }
-        return answer;
-      }
-
-      uint32_t digits;
-
-#if FASTFLOAT_HAS_IS_CONSTANT_EVALUATED && FASTFLOAT_HAS_BIT_CAST
-      if (std::is_constant_evaluated()) {
-        uint8_t str[4]{};
-        for (size_t j = 0; j < 4 && j < len; ++j) {
-          str[j] = static_cast<uint8_t>(p[j]);
-        }
-        digits = std::bit_cast<uint32_t>(str);
-#if FASTFLOAT_IS_BIG_ENDIAN
-        digits = byteswap_32(digits);
-#endif
-      }
-#else
-      if (false) {
-      }
-#endif
-      else if (len >= 4) {
-        ::memcpy(&digits, p, 4);
-#if FASTFLOAT_IS_BIG_ENDIAN
-        digits = byteswap_32(digits);
-#endif
-      } else {
-        uint32_t b0 = static_cast<uint8_t>(p[0]);
-        uint32_t b1 = (len > 1) ? static_cast<uint8_t>(p[1]) : 0xFFu;
-        uint32_t b2 = (len > 2) ? static_cast<uint8_t>(p[2]) : 0xFFu;
-        uint32_t b3 = 0xFFu;
-        digits = b0 | (b1 << 8) | (b2 << 16) | (b3 << 24);
-      }
-
-      uint32_t magic =
-          ((digits + 0x46464646u) | (digits - 0x30303030u)) & 0x80808080u;
-      uint32_t tz = (uint32_t)countr_zero_32(magic); // 7, 15, 23, 31, or 32
-      uint32_t nd = (tz == 32) ? 4 : (tz >> 3);
-      nd = (uint32_t)(nd < len ? nd : len);
-      if (nd == 0) {
-        if (has_leading_zeros) {
-          value = 0;
-          answer.ec = std::errc();
-          answer.ptr = p;
-          return answer;
-        }
-        answer.ec = std::errc::invalid_argument;
-        answer.ptr = first;
-        return answer;
-      }
-      if (nd > 3) {
-        const UC *q = p + nd;
-        size_t rem = len - nd;
-        while (rem) {
-          if (*q < UC('0') || *q > UC('9'))
-            break;
-          ++q;
-          --rem;
-        }
-        answer.ec = std::errc::result_out_of_range;
-        answer.ptr = q;
-        return answer;
-      }
-
-      digits ^= 0x30303030u;
-      digits <<= ((4 - nd) * 8);
-
-      uint32_t check = ((digits >> 24) & 0xff) | ((digits >> 8) & 0xff00) |
-                       ((digits << 8) & 0xff0000);
-      if (check > 0x00020505) {
-        answer.ec = std::errc::result_out_of_range;
-        answer.ptr = p + nd;
-        return answer;
-      }
-      value = (uint8_t)((0x640a01 * digits) >> 24);
-      answer.ec = std::errc();
-      answer.ptr = p + nd;
-      return answer;
-    }
-  }
-
-  FASTFLOAT_IF_CONSTEXPR17((std::is_same<T, std::uint16_t>::value)) {
-    if (base == 10) {
-      const size_t len = size_t(pend - p);
-      if (len == 0) {
-        if (has_leading_zeros) {
-          value = 0;
-          answer.ec = std::errc();
-          answer.ptr = p;
-        } else {
-          answer.ec = std::errc::invalid_argument;
-          answer.ptr = first;
-        }
-        return answer;
-      }
-
-      if (len >= 4) {
-        uint32_t digits = read4_to_u32(p);
-        if (is_made_of_four_digits_fast(digits)) {
-          uint32_t v = parse_four_digits_unrolled(digits);
-          if (len >= 5 && is_integer(p[4])) {
-            v = v * 10 + uint32_t(p[4] - '0');
-            if (len >= 6 && is_integer(p[5])) {
-              answer.ec = std::errc::result_out_of_range;
-              const UC *q = p + 5;
-              while (q != pend && is_integer(*q)) {
-                q++;
-              }
-              answer.ptr = q;
-              return answer;
-            }
-            if (v > 65535) {
-              answer.ec = std::errc::result_out_of_range;
-              answer.ptr = p + 5;
-              return answer;
-            }
-            value = uint16_t(v);
-            answer.ec = std::errc();
-            answer.ptr = p + 5;
-            return answer;
-          }
-          // 4 digits
-          value = uint16_t(v);
-          answer.ec = std::errc();
-          answer.ptr = p + 4;
-          return answer;
-        }
-      }
-    }
-  }
-
  uint64_t i = 0;
  if (base == 10) {
    loop_parse_if_eight_digits(p, pend, i); // use SIMD if possible
@@ -1,6 +1,7 @@
 #ifndef FASTFLOAT_DIGIT_COMPARISON_H
 #define FASTFLOAT_DIGIT_COMPARISON_H

+#include <algorithm>
 #include <cstdint>
 #include <cstring>
 #include <iterator>
@@ -37,8 +38,11 @@ constexpr static uint64_t powers_of_ten_uint64[] = {1UL,
 // 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(uint64_t mantissa, int32_t exponent) noexcept {
+scientific_exponent(parsed_number_string_t<UC> &num) noexcept {
+  uint64_t mantissa = num.mantissa;
+  int32_t exponent = int32_t(num.exponent);
  while (mantissa >= 10000) {
    mantissa /= 10000;
    exponent += 4;
@@ -108,7 +112,7 @@ fastfloat_really_inline FASTFLOAT_CONSTEXPR14 void round(adjusted_mantissa &am,
  if (-am.power2 >= mantissa_shift) {
    // have a denormal float
    int32_t shift = -am.power2 + 1;
-    cb(am, (shift < 64 ? shift : 64));
+    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()))
@@ -394,7 +398,7 @@ inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa negative_digit_comp(
    FASTFLOAT_ASSERT(real_digits.pow2(uint32_t(-pow2_exp)));
  }

-  // compare digits, and use it to direct rounding
+  // 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) {
@@ -415,7 +419,7 @@ inline FASTFLOAT_CONSTEXPR20 adjusted_mantissa negative_digit_comp(
  return answer;
 }

-// parse the significant digits as a big integer to unambiguously round
+// parse the significant digits as a big integer to unambiguously round the
 // the significant digits. here, we are trying to determine how to round
 // an extended float representation close to `b+h`, halfway between `b`
 // (the float rounded-down) and `b+u`, the next positive float. this
@@ -434,8 +438,7 @@ digit_comp(parsed_number_string_t<UC> &num, adjusted_mantissa am) noexcept {
  // remove the invalid exponent bias
  am.power2 -= invalid_am_bias;

-  int32_t sci_exp =
-      scientific_exponent(num.mantissa, static_cast<int32_t>(num.exponent));
+  int32_t sci_exp = scientific_exponent(num);
  size_t max_digits = binary_format<T>::max_digits();
  size_t digits = 0;
  bigint bigmant;
@@ -45,38 +45,6 @@ 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;
-
-/**
- * This function is a template overload of `integer_times_pow10()`
- * that returns a floating-point value of type `T` that is one of
- * supported floating-point types (e.g. `double`, `float`).
- */
-template <typename T>
-FASTFLOAT_CONSTEXPR20
-    typename std::enable_if<is_supported_float_type<T>::value, T>::type
-    integer_times_pow10(uint64_t mantissa, int decimal_exponent) noexcept;
-template <typename T>
-FASTFLOAT_CONSTEXPR20
-    typename std::enable_if<is_supported_float_type<T>::value, T>::type
-    integer_times_pow10(int64_t mantissa, int decimal_exponent) noexcept;
-
 /**
 * from_chars for integer types.
 */
--- a/Show More
+++ b/Show More