Qt/Fullscreenui/GS: Add Automatic blending option.

Automatic blending option will behave like basic level with the exception of gamedb if it forces a blend level then it will take that in to consideration, any other option will override the gamedb.
2026-07-12 02:04:17 +02:00 · 2025-09-02 14:47:44 +02:00
1710 changed files with 320266 additions and 478978 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. -->
@@ -22,10 +22,6 @@
      - '3rdparty/**/*'
      - '**/3rdpartyDeps.props'
      - '.gitmodules'
-'requires-win-deps-build':
-  - changed-files:
-    - any-glob-to-any-file:
-      - '.github/workflows/scripts/windows/*'
 'Documentation':
  - changed-files:
    - any-glob-to-any-file:
@@ -40,13 +36,6 @@
      - 'pcsx2-qt/**/*'
      - '3rdparty/Qt/*'
      - '3rdparty/Qt/**/*'
-'OSD / ImGui':
-  - changed-files:
-    - any-glob-to-any-file:
-      - 'pcsx2/ImGui/*'
-      - 'pcsx2/ImGui/**/*'
-      - '3rdparty/imgui/*'
-      - '3rdparty/imgui/**/*'
 'GameDB':
  - changed-files:
    - any-glob-to-any-file:
@@ -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@v6
+      - 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@v6
+      - 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@v6
+        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@v6
+        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@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        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@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        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@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        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@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: stable
@@ -153,7 +153,7 @@ 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@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
@@ -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:
@@ -55,11 +55,11 @@ jobs:
      CCACHE_DIR: ${{ github.workspace }}/.ccache
      CCACHE_COMPRESS: true
      CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M

    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@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@v5
+        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@v5
+        uses: actions/cache@v4
        with:
          path: ~/deps
          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/linux/build-dependencies-qt.sh', '.github/workflows/scripts/common/*.patch') }}

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

      - name: Download patches
        run: |
@@ -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@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}
          path: ci-artifacts
@@ -12,11 +12,7 @@ on:
      os:
        required: false
        type: string
-        default: macos-26
-      arch:
-        required: false
-        type: string
-        default: x86-64
+        default: macos-15
      patchesUrl:
        required: false
        type: string
@@ -46,13 +42,13 @@ jobs:
      CCACHE_DIR: ${{ github.workspace }}/.ccache
      CCACHE_COMPRESS: true
      CCACHE_COMPRESSLEVEL: 9
-      CCACHE_MAXSIZE: 100M
+      CCACHE_MAXSIZE: 500M
      # Only way to use a secret in an if statement
      SIGN_KEY: ${{ secrets.APPLE_SIGN_P12_B64 }}

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

      # actions/checkout elides tags, fetch them primarily for releases
      - name: Fetch Tags
@@ -66,15 +62,8 @@ 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: Install Metal Toolchain
-        run: |
-          for i in {1..5}; do
-            if xcrun metal -v; then break; fi
-            xcodebuild -downloadComponent MetalToolchain
-          done
+      - name: Use Xcode 16.4
+        run: sudo xcode-select -s /Applications/Xcode_16.4.app

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

      - name: Cache Dependencies
        id: cache-deps
-        uses: actions/cache@v5
+        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/build-dependencies.sh', '.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 +109,19 @@ jobs:
        run: echo "timestamp=$(date -u "+%Y-%m-%d-%H;%M;%S")" >> $GITHUB_OUTPUT

      - name: Cache ccache cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: .ccache
-          key: ${{ inputs.os }} ${{ 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 +144,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
@@ -197,7 +181,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 +194,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@v4
        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@v6
+      - 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@72f2c25fcb47643c292f7107632f7a47c1df5cd8
        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@72f2c25fcb47643c292f7107632f7a47c1df5cd8
        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@v6
+      - uses: actions/checkout@v5

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

-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v5
        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@v6
+      - uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -0,0 +1,13 @@
+diff --git a/src/core/indicators/ClassicDropIndicatorOverlay.h b/src/core/indicators/ClassicDropIndicatorOverlay.h
+index 2dfb9718a..9b01f002e 100644
+--- a/src/core/indicators/ClassicDropIndicatorOverlay.h
+++ b/src/core/indicators/ClassicDropIndicatorOverlay.h
+@@ -11,7 +11,7 @@
+ 
+ #pragma once
+ 
+-#include "core/DropIndicatorOverlay.h"
+#include <kddockwidgets/core/DropIndicatorOverlay.h>
+ 
+ namespace KDDockWidgets {
+ 
@@ -1,60 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bace076..bfb1c66 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,10 @@ endif ()
- 
- find_package(Qt${APNG_QT_VERSION} REQUIRED COMPONENTS Core Gui)
- 
-+set(CMAKE_FIND_FRAMEWORK NEVER)
-+find_package(PNG 1.6.40 REQUIRED)
-+find_package(ZLIB REQUIRED)
-+
- add_subdirectory(src)
- 
- if(APNG_TESTS)
-diff --git a/cmake/FindZLib.cmake b/cmake/FindZLib.cmake
-deleted file mode 100644
-index f8e9220..0000000
--- a/cmake/FindZLib.cmake
-+++ /dev/null
-@@ -1 +0,0 @@
-add_library(ZLIB::ZLIB ALIAS zlibstatic) # use our zlib
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 697df95..0e89371 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,2 +1 @@
-add_subdirectory(3rdparty EXCLUDE_FROM_ALL)
- add_subdirectory(plugins)
-diff --git a/src/plugins/imageformats/apng/CMakeLists.txt b/src/plugins/imageformats/apng/CMakeLists.txt
-index e1b3fd9..72164fb 100644
--- a/src/plugins/imageformats/apng/CMakeLists.txt
-+++ b/src/plugins/imageformats/apng/CMakeLists.txt
-@@ -14,13 +14,10 @@ target_sources(ApngImagePlugin PRIVATE ${APNG_SOURCES})
- target_link_libraries(ApngImagePlugin PRIVATE 
-   Qt${APNG_QT_VERSION}::Core
-   Qt${APNG_QT_VERSION}::Gui
-  png_static
-  zlibstatic
-+  PNG::PNG
-+  ZLIB::ZLIB
- )
- 
-get_target_property(_png_include png_static INCLUDE_DIRECTORIES)
-target_include_directories(ApngImagePlugin PRIVATE ${_png_include})
-
- target_compile_definitions(ApngImagePlugin PRIVATE
-   QT_DEPRECATED_WARNINGS
-   QT_ASCII_CAST_WARNINGS
-@@ -31,3 +28,10 @@ set_target_properties(ApngImagePlugin PROPERTIES
-   LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins/imageformats"
-   LIBRARY_OUTPUT_NAME qapng
- )
-+
-+install(TARGETS ApngImagePlugin DESTINATION "plugins/imageformats")
-+
-+if(WIN32 AND MSVC)
-+  set_target_properties(ApngImagePlugin PROPERTIES DEBUG_POSTFIX d)
-+  install(FILES $<TARGET_PDB_FILE:ApngImagePlugin> DESTINATION "plugins/imageformats" OPTIONAL)
-+endif()
@@ -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,19 @@ 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"
+)
+
+declare -a REMOVE_LIBS=(
+	'libwayland-client.so*'
+	'libwayland-cursor.so*'
+	'libwayland-egl.so*'
 )

 set -e
@@ -69,6 +80,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
@@ -107,7 +130,7 @@ echo "Running linuxdeploy to create AppDir..."
 # Interestingly, specifying the module doesn't copy the module, only the required plugins for it
 # https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/160#issuecomment-2655543893
 EXTRA_QT_MODULES="core;gui;svg;waylandclient;waylandcompositor;widgets;xcbqpa" \
-EXTRA_PLATFORM_PLUGINS="libqwayland.so" \
+EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so" \
 DEPLOY_PLATFORM_THEMES="1" \
 QMAKE="$DEPSDIR/bin/qmake" \
 NO_STRIP="1" \
@@ -117,6 +140,16 @@ $LINUXDEPLOY --plugin qt --appdir="$OUTDIR" --executable="$BUILDDIR/bin/pcsx2-qt
 echo "Copying resources into AppDir..."
 cp -a "$BUILDDIR/bin/resources" "$OUTDIR/usr/bin"

+# Why do we have to manually remove these libs? Because the linuxdeploy Qt plugin
+# copies them, not the "main" linuxdeploy binary, and plugins don't inherit the
+# include list...
+for lib in "${REMOVE_LIBS[@]}"; do
+	for libpath in $(find "$OUTDIR/usr/lib" -name "$lib"); do
+		echo "    Removing problematic library ${libpath}."
+		rm -f "$libpath"
+	done
+done
+
 # Restore unstripped deps (for cache).
 rm -fr "$DEPSDIR"
 mv "$DEPSDIR.bak" "$DEPSDIR"
@@ -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,84 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.11.1
-QTAPNG=1.3.0
-
-FFMPEG=8.1
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
 LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBJPEGTURBO=3.1.4.1
-LIBPNG=1.6.58
+LIBJPEGTURBO=3.1.1
+LIBPNG=1.6.50
 LIBWEBP=1.6.0
-NVENC=13.0.19.0
-SDL=SDL3-3.4.8
+SDL=SDL3-3.2.20
+QT=6.9.2
 LZ4=1.10.0
-VULKAN=1.4.328.1
 ZSTD=1.5.7
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=1.3.0
 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
-ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775  libpng-$LIBPNG.tar.xz
+cat > SHASUMS <<EOF
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
+fd6f417fe9e3a071cf1424a5152d926a34c4a3c5070745470be6cf12a404ed79  $LIBBACKTRACE.zip
+aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307  libpng-$LIBPNG.tar.xz
 e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
-eee7dea22ed502868017971c86c63c4ed1e6085de0baebfdcc3d3322f00f3eb0  libpng-$LIBPNG-apng.patch.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $SDL.tar.gz
 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee  nv-codec-headers-$NVENC.tar.gz
-c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c  vulkan-sdk-$VULKAN.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+44be9c9ecfe04129c4dea0a7e1b36ad476c9cc07c292016ac98e7b41514f2440  qtbase-everywhere-src-$QT.tar.xz
+8a023f7e2f57dedc02e2ab10c975f7cb3cccac9b8f0823c12fd6824834549139  qtimageformats-everywhere-src-$QT.tar.xz
+d984cab8f26334aa1c15e5b8f0cd9f1b7c0c1289fe0b68c1c84ab469b75605a5  qtsvg-everywhere-src-$QT.tar.xz
+d8b7f7e8e970cc0b975205fd6d5832ea917ef3e751df69b97439c1cddd67a489  qttools-everywhere-src-$QT.tar.xz
+c73bb6281ed365c0f954f4b1b6e1b13e1b3fefd94854f46fcd9a412f641f7ed6  qttranslations-everywhere-src-$QT.tar.xz
+cad79806565568f12f9983fed69219416abcee9d5deef4abdfcf94aa2eef7781  qtwayland-everywhere-src-$QT.tar.xz
+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
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  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://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 "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,9 +99,7 @@ cd ..
 echo "Building libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
@@ -164,9 +109,7 @@ echo "Building libjpegturbo..."
 rm -fr "libjpeg-turbo-$LIBJPEGTURBO"
 tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
 cd "libjpeg-turbo-$LIBJPEGTURBO"
-# On non debian or debian based Linux systems, libjpeg-turbo will set CMAKE_INSTALL_DEFAULT_LIBDIR "lib64" (or libx32)
-# That will prevent CMake from finding the deps libjpeg later on. if we set CMAKE_INSTALL_DEFAULT_LIBDIR, libjpeg-turbo will leave it as is, so set it to "lib"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DCMAKE_INSTALL_DEFAULT_LIBDIR="lib" -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -200,11 +143,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 +190,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 ../../
@@ -280,20 +250,11 @@ cmake --build . --parallel
 ninja install
 cd ../../

-echo "Building Qt APNG..."
-rm -fr "QtApng-$QTAPNG"
-tar xf "QtApng-$QTAPNG.tar.gz"
-cd "QtApng-$QTAPNG"
-patch -p1 < "$SCRIPTDIR/../common/qtapng-cmake.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
 echo "Building KDDockWidgets..."
 rm -fr "KDDockWidgets-$KDDOCKWIDGETS"
 tar xf "KDDockWidgets-$KDDOCKWIDGETS.tar.gz"
 cd "KDDockWidgets-$KDDOCKWIDGETS"
+patch -p1 < "$SCRIPTDIR/../common/kddockwidgets-dodgy-include.patch"
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
@@ -312,16 +273,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 ..
@@ -1,210 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ "$#" -ne 1 ]; then
-    echo "Syntax: $0 <output directory>"
-    exit 1
-fi
-
-SCRIPTDIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-NPROCS="$(getconf _NPROCESSORS_ONLN)"
-INSTALLDIR="$1"
-if [ "${INSTALLDIR:0:1}" != "/" ]; then
-        INSTALLDIR="$PWD/$INSTALLDIR"
-fi
-
-FREETYPE=2.14.1
-HARFBUZZ=12.2.0
-LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075
-LIBPNG=1.6.51
-LIBWEBP=1.6.0
-SDL=SDL3-3.2.26
-LZ4=1.10.0
-ZSTD=1.5.7
-PLUTOVG=1.3.2
-PLUTOSVG=0.0.7
-RAPIDYAML=0.12.1
-
-SHADERC=2025.4
-SHADERC_GLSLANG=7a47e2531cb334982b2a2dd8513dca0a3de4373d
-SHADERC_SPIRVHEADERS=b824a462d4256d720bebb40e78b9eb8f78bbb305
-SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5
-
-mkdir -p deps-build
-cd deps-build
-
-grep . > SHASUMS <<EOF
-32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
-f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
-96e5c2d7f2c482a60d5804da48a2eb9a0db0719b2c65dcc169fbfdcf37f3a45d  libbacktrace-$LIBBACKTRACE.tar.gz
-a050a892d3b4a7bb010c3a95c7301e49656d72a64f1fc709a90b8aded192bed2  libpng-$LIBPNG.tar.xz
-e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWEBP.tar.gz
-dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2  $SDL.tar.gz
-9c16ec5654be709f062a705d0c6f529193f1c2123fe7f102fda6733913689023  libpng-$LIBPNG-apng.patch.gz
-537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b  lz4-$LZ4.tar.gz
-eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
-272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
-c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
-06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-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
-
-shasum -a 256 --check --strict SHASUMS
-
-echo "Building libbacktrace..."
-rm -fr "libbacktrace-$LIBBACKTRACE"
-tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
-cd "libbacktrace-$LIBBACKTRACE"
-./configure --prefix="$INSTALLDIR"
-make
-make install
-cd ..
-
-echo "Building libpng..."
-rm -fr "libpng-$LIBPNG"
-tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
-cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_STATIC=OFF -DPNG_SHARED=ON -DPNG_TOOLS=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building LZ4..."
-rm -fr "lz4-$LZ4"
-tar xf "lz4-$LZ4.tar.gz"
-cd "lz4-$LZ4"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF -B build-dir -G Ninja build/cmake
-cmake --build build-dir --parallel
-ninja -C build-dir install
-cd ..
-
-echo "Building Zstandard..."
-rm -fr "zstd-$ZSTD"
-tar xf "zstd-$ZSTD.tar.gz"
-cd "zstd-$ZSTD"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZSTD_BUILD_SHARED=ON -DZSTD_BUILD_STATIC=OFF -DZSTD_BUILD_PROGRAMS=OFF -B build -G Ninja build/cmake
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType without HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_DISABLE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building HarfBuzz..."
-rm -fr "harfbuzz-$HARFBUZZ"
-tar xf "harfbuzz-$HARFBUZZ.tar.gz"
-cd "harfbuzz-$HARFBUZZ"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building WebP..."
-rm -fr "libwebp-$LIBWEBP"
-tar xf "libwebp-$LIBWEBP.tar.gz"
-cd "libwebp-$LIBWEBP"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -B build -G Ninja \
-  -DWEBP_BUILD_ANIM_UTILS=OFF -DWEBP_BUILD_CWEBP=OFF -DWEBP_BUILD_DWEBP=OFF -DWEBP_BUILD_GIF2WEBP=OFF -DWEBP_BUILD_IMG2WEBP=OFF \
-  -DWEBP_BUILD_VWEBP=OFF -DWEBP_BUILD_WEBPINFO=OFF -DWEBP_BUILD_WEBPMUX=OFF -DWEBP_BUILD_EXTRAS=OFF -DBUILD_SHARED_LIBS=ON
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building FreeType with HarfBuzz..."
-rm -fr "freetype-$FREETYPE"
-tar xf "freetype-$FREETYPE.tar.xz"
-cd "freetype-$FREETYPE"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DFT_REQUIRE_ZLIB=ON -DFT_REQUIRE_PNG=ON -DFT_DISABLE_BZIP2=TRUE -DFT_DISABLE_BROTLI=TRUE -DFT_REQUIRE_HARFBUZZ=TRUE -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building SDL..."
-rm -fr "$SDL"
-tar xf "$SDL.tar.gz"
-cd "$SDL"
-cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -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 --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building PlutoVG..."
-rm -fr "plutovg-$PLUTOVG"
-tar xf "plutovg-$PLUTOVG.tar.gz"
-cd "plutovg-$PLUTOVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOVG_BUILD_EXAMPLES=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building PlutoSVG..."
-rm -fr "plutosvg-$PLUTOSVG"
-tar xf "plutosvg-$PLUTOSVG.tar.gz"
-cd "plutosvg-$PLUTOSVG"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DPLUTOSVG_ENABLE_FREETYPE=ON -DPLUTOSVG_BUILD_EXAMPLES=OFF -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Building 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"
-cd "shaderc-$SHADERC"
-cd third_party
-tar xf "../../shaderc-glslang-$SHADERC_GLSLANG.tar.gz"
-mv "glslang-$SHADERC_GLSLANG" "glslang"
-tar xf "../../shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz"
-mv "SPIRV-Headers-$SHADERC_SPIRVHEADERS" "spirv-headers"
-tar xf "../../shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz"
-mv "SPIRV-Tools-$SHADERC_SPIRVTOOLS" "spirv-tools"
-cd ..
-patch -p1 < "$SCRIPTDIR/../common/shaderc-changes.patch"
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja
-cmake --build build --parallel
-ninja -C build install
-cd ..
-
-echo "Cleaning up..."
-cd ..
-rm -r deps-build
@@ -14,8 +14,8 @@
  "sources": [
    {
      "type": "archive",
-      "url": "https://libsdl.org/release/SDL3-3.4.8.tar.gz",
-      "sha256": "e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba"
+      "url": "https://libsdl.org/release/SDL3-3.2.20.tar.gz",
+      "sha256": "467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67"
    }
  ],
  "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,9 +14,13 @@
    {
      "type": "git",
      "url": "https://github.com/KDAB/KDDockWidgets.git",
-      "tag": "v2.3.0",
-      "commit": "c38711026e17e34916dd82c6fcbdcc0d2342f541",
+      "tag": "v2.2.3",
+      "commit": "28d16d0431d7cdc9f36cb619d22621146fdfab44",
      "disable-submodules": true
+    },
+    {
+      "type": "patch",
+      "path": "../../../common/kddockwidgets-dodgy-include.patch"
    }
  ],
  "cleanup": [
@@ -13,8 +13,8 @@
    {
      "type": "git",
      "url": "https://github.com/sammycage/plutovg.git",
-      "tag": "v1.3.2",
-      "commit": "5695a711dd1cff1f01fa6542f3fe6a15de082c63"
+      "tag": "v1.3.0",
+      "commit": "1596f459d6796b37f3f6d610ce598de2403350b5"
    }
  ],
  "cleanup": [
@@ -1,46 +0,0 @@
-{
-  "name": "libpng",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-    "-DPNG_TESTS=OFF",
-    "-DPNG_STATIC=OFF",
-    "-DPNG_SHARED=ON",
-    "-DPNG_TOOLS=OFF"
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.58/libpng-1.6.58.tar.xz",
-      "sha256": "28eb403f51f0f7405249132cecfe82ea5c0ef97f1b32c5a65828814ae0d34775"
-    },
-    {
-      "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"
-    },
-    {
-      "type": "shell",
-      "commands":
-      [
-          "gunzip -f libpng-1.6.58-apng.patch.gz",
-          "patch -p1  < \"libpng-1.6.58-apng.patch\""
-      ]
-    }
-  ],
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/*.a",
-    "/lib/*.la",
-    "/lib/cmake",
-    "/lib/libpng",
-    "/lib/pkgconfig",
-    "/share/man"
-  ]
-}
-
@@ -1,29 +0,0 @@
-{
-  "name": "qtapng",
-  "buildsystem": "cmake-ninja",
-  "builddir": true,
-  "config-opts": [
-    "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\""
-  ],
-  "build-options": {
-    "strip": true
-  },
-  "sources": [
-    {
-      "type": "git",
-      "url": "https://github.com/jurplel/QtApng.git",
-      "tag": "1.3.0",
-      "commit": "bd15516b281204e90ecd5b80b00d1274b062f5fc"
-    },
-    {
-        "type": "patch",
-        "path": "../../../common/qtapng-cmake.patch"
-    }
-  ],
-  "cleanup": [
-    "/plugins"
-  ],
-  "post-install": [
-    "mv ${FLATPAK_DEST}/plugins/* ${FLATPAK_DEST}/bin/"
-  ]
-}
@@ -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",
@@ -33,9 +32,6 @@
    "modules/23-kddockwidgets.json",
    "modules/24-plutovg.json",
    "modules/25-plutosvg.json",
-    "modules/26-libpng.json",
-    "modules/27-qtapng.json",
-    "modules/28-rapidyaml.json",
    {
      "name": "pcsx2",
      "buildsystem": "cmake-ninja",
@@ -49,11 +45,10 @@
        "cxxflags": "",
        "cxxflags-override": true,
        "config-opts": [
-          "-DCMAKE_PREFIX_PATH=\"${FLATPAK_DEST}\"",
          "-DCMAKE_BUILD_TYPE=Release",
          "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON",
-          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm20/bin/clang",
-          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm20/bin/clang++",
+          "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang",
+          "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++",
          "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld",
          "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld",
          "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld",
@@ -80,3 +75,4 @@
    }
  ]
 }
+
@@ -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,25 @@ 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.8
-HARFBUZZ=14.2.0
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
+SDL=SDL3-3.2.20
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.58
-LIBJPEGTURBO=3.1.4.1
+LIBPNG=1.6.50
+LIBJPEGTURBO=3.1.1
 LIBWEBP=1.6.0
-FFMPEG=8.1
-MOLTENVK=1.4.1
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.3
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=1.3.0
 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 +76,62 @@ 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
-e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
-c652d5d94971031654ab3989891a490a895d3e3f2b71171c62692b28e94b1b93  harfbuzz-$HARFBUZZ.tar.gz
+cat > SHASUMS <<EOF
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $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
-ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  MoltenVK-$MOLTENVK.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+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
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  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://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 "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 +145,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,9 +200,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
 make -C build "-j$NPROCS"
 cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -DPNG_ARM_NEON=on -B build-arm64
@@ -270,7 +250,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 +267,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 ..

@@ -298,12 +278,6 @@ echo "Installing Qt Base..."
 rm -fr "qtbase-everywhere-src-$QT"
 tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
-
-# Patch Qt to support macOS 11
-patch -p1 < "$SCRIPTDIR/qt-macos11compat.patch"
-# 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.
 # We could run macdeployqt twice, but that's even more janky than patching it.
@@ -339,7 +313,7 @@ tar xf "qtsvg-everywhere-src-$QT.tar.xz"
 cd "qtsvg-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
 make "-j$NPROCS"
 make install
 cd ../..
@@ -350,7 +324,7 @@ tar xf "qtimageformats-everywhere-src-$QT.tar.xz"
 cd "qtimageformats-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_system_webp=ON
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_system_webp=ON
 make "-j$NPROCS"
 make install
 cd ../..
@@ -361,7 +335,7 @@ tar xf "qttools-everywhere-src-$QT.tar.xz"
 cd "qttools-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DFEATURE_assistant=OFF -DFEATURE_clang=OFF -DFEATURE_designer=OFF -DFEATURE_kmap2qmap=OFF -DFEATURE_pixeltool=OFF -DFEATURE_pkg_config=OFF -DFEATURE_qev=OFF -DFEATURE_qtattributionsscanner=OFF -DFEATURE_qtdiag=OFF -DFEATURE_qtplugininfo=OFF
 make "-j$NPROCS"
 make install
 cd ../..
@@ -390,28 +364,19 @@ tar xf "qttranslations-everywhere-src-$QT.tar.xz"
 cd "qttranslations-everywhere-src-$QT"
 mkdir build
 cd build
-"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DQT_GENERATE_SBOM=OFF
+"$INSTALLDIR/bin/qt-configure-module" .. -- "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL"
 make "-j$NPROCS"
 make install
 cd ../..

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

 echo "Building PlutoVG..."
@@ -432,15 +397,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,25 @@ 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.8
-HARFBUZZ=14.2.0
+FREETYPE=2.13.3
+HARFBUZZ=11.2.0
+SDL=SDL3-3.2.20
 ZSTD=1.5.7
 LZ4=1.10.0
-LIBPNG=1.6.58
-LIBJPEGTURBO=3.1.4.1
+LIBPNG=1.6.50
+LIBJPEGTURBO=3.1.1
 LIBWEBP=1.6.0
-FFMPEG=8.1
-MOLTENVK=1.4.1
-KDDOCKWIDGETS=2.4.0
-PLUTOVG=1.3.2
+FFMPEG=6.0
+MOLTENVK=1.2.9
+QT=6.7.3
+KDDOCKWIDGETS=2.2.3
+PLUTOVG=1.3.0
 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
@@ -56,76 +53,65 @@ CMAKE_COMMON=(
 	-DCMAKE_PREFIX_PATH="$INSTALLDIR"
 	-DCMAKE_INSTALL_PREFIX="$INSTALLDIR"
 	-DCMAKE_OSX_ARCHITECTURES="x86_64"
-	-DCMAKE_APPLE_SILICON_PROCESSOR="x86_64"
 	-DCMAKE_INSTALL_NAME_DIR='$<INSTALL_PREFIX>/lib'
 )

-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
-e9fff7467fb60f037e6708da18b25560649e4c63edc2a69bb871b960d9cbfbba  $SDL.tar.gz
-c652d5d94971031654ab3989891a490a895d3e3f2b71171c62692b28e94b1b93  harfbuzz-$HARFBUZZ.tar.gz
+cat > SHASUMS <<EOF
+0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289  freetype-$FREETYPE.tar.xz
+16c0204704f3ebeed057aba100fe7db18d71035505cb10e595ea33d346457fc8  harfbuzz-$HARFBUZZ.tar.gz
+467600ae090dd28616fa37369faf4e3143198ff1da37729b552137e47f751a67  $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
-ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
-b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a  ffmpeg-$FFMPEG.tar.xz
-9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
+57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082  ffmpeg-$FFMPEG.tar.xz
+f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e  v$MOLTENVK.tar.gz
+8ccbb9ab055205ac76632c9eeddd1ed6fc66936fc56afc2ed0fd5d9e23da3097  qtbase-everywhere-src-$QT.tar.xz
+9fd58144081654c3373768dd96ead294023830927b14fe3d3c1ef641fb324753  qtimageformats-everywhere-src-$QT.tar.xz
+40142cb71fb1e07ad612bc361b67f5d54cd9367f9979ae6b86124a064deda06b  qtsvg-everywhere-src-$QT.tar.xz
+f03bb7df619cd9ac9dba110e30b7bcab5dd88eb8bdc9cc752563b4367233203f  qttools-everywhere-src-$QT.tar.xz
+dcc762acac043b9bb5e4d369b6d6f53e0ecfcf76a408fe0db5f7ef071c9d6dc8  qttranslations-everywhere-src-$QT.tar.xz
+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
+b8529755b2d54205341766ae168e83177c6120660539f9afba71af6bca4b81ec  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+4b08587d782f6858e6cb815b455fd7238f45190a57094857a3123883ecb595eb  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://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 "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,9 +156,7 @@ cd ..
 echo "Installing libpng..."
 rm -fr "libpng-$LIBPNG"
 tar xf "libpng-$LIBPNG.tar.xz"
-gzip -kd -f "libpng-$LIBPNG-apng.patch.gz"
 cd "libpng-$LIBPNG"
-patch -p1 < "../libpng-$LIBPNG-apng.patch"
 cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DPNG_TESTS=OFF -DPNG_FRAMEWORK=OFF -B build
 make -C build "-j$NPROCS"
 make -C build install
@@ -211,7 +195,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 +217,7 @@ cd "MoltenVK-${MOLTENVK}"
 sed -i '' 's/xcodebuild "$@"/xcodebuild $XCODEBUILD_EXTRA_ARGS "$@"/g' fetchDependencies
 sed -i '' 's/XCODEBUILD :=/XCODEBUILD ?=/g' Makefile
 XCODEBUILD_EXTRA_ARGS="VALID_ARCHS=x86_64" ./fetchDependencies --macos
-XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=0 MVK_CONFIG_USE_METAL_PRIVATE_API=1
+XCODEBUILD="set -o pipefail && xcodebuild VALID_ARCHS=x86_64" make macos
 cp Package/Latest/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib "$INSTALLDIR/lib/"
 cd ..

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

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

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

 cd "%BUILDDIR%"

-set QT=6.11.1
-set QTMINOR=6.11
-set QTAPNG=1.3.0
-
-set FREETYPE=2.14.3
-set HARFBUZZ=14.2.0
-set SDL=SDL3-3.4.8
-set LIBJPEGTURBO=3.1.4.1
-set LIBPNG=1658
-set LIBPNGLONG=1.6.58
+set FREETYPE=2.13.3
+set HARFBUZZ=11.2.0
+set LIBJPEGTURBO=3.1.1
+set LIBPNG=1650
+set SDL=SDL3-3.2.20
+set QT=6.9.2
+set QTMINOR=6.9
 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.0
-set PLUTOVG=1.3.2
+set KDDOCKWIDGETS=2.2.3
+set PLUTOVG=1.3.0
 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" ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 || goto error
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || 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" 506206e02f90c1f37e048eacaf9e8a3a7dc682fd27783eb0ff15a7d2dcc9c2af || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" d76454913ea6f5f38856fbf00578d8e39daf842887f3396c95608414680250f7 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 97d59c78e40b4ddd018738d285a12afc320b57f8265a3f760353739a3619ccdb || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" f2fc6ff382c6f3af79493d0709dbd64847d0356313518f094f9096315f2fdb30 || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" af80bb671ea0f66c0036ce7041a56b0e550fc94fb88d2c77b5b6a3e33e42139b || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" d2f4c7a4a12630e879702353f944f96a5d8e764771b5a5f04163334ad61b39db || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 3e168d1b081ee3a2175fe1bd97ad03bb40fe7ce38a37e99923a19f0e7ec4d81c || 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" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || 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" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 5153e6b3603a253e6f86dc0b1eb5b80d1dce849ceef628369942587e86582cbb || 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...
@@ -115,7 +92,7 @@ if %DEBUG%==1 (
  echo Building release libraries...
 )

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

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

 echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-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
@@ -272,22 +246,6 @@ cmake --build . --parallel || goto error
 ninja install || goto error
 cd ..\.. || goto error

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

 cd "%BUILDDIR%"

-set QT=6.11.1
-set QTMINOR=6.11
-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.8
-set LIBJPEGTURBO=3.1.4.1
-set LIBPNG=1658
-set LIBPNGLONG=1.6.58
+set FREETYPE=2.13.3
+set HARFBUZZ=11.2.0
+set LIBJPEGTURBO=3.1.1
+set LIBPNG=1650
+set SDL=SDL3-3.2.20
+set QT=6.9.2
+set QTMINOR=6.9
 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.0
-set PLUTOVG=1.3.2
+set KDDOCKWIDGETS=2.2.3
+set PLUTOVG=1.3.0
 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 "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" ecae8008e2cc9ade2f2c1bb9d5e6d4fb73e7c433866a056bd82980741571a022 || goto error
+call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
+call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 850cb5e38e21106c0abba86c5b73f8f74b9a32d7725505901d081080b0d3f0b3 || goto error
+call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1650.zip 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
+call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || 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" 506206e02f90c1f37e048eacaf9e8a3a7dc682fd27783eb0ff15a7d2dcc9c2af || goto error
+call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" d76454913ea6f5f38856fbf00578d8e39daf842887f3396c95608414680250f7 || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 97d59c78e40b4ddd018738d285a12afc320b57f8265a3f760353739a3619ccdb || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" f2fc6ff382c6f3af79493d0709dbd64847d0356313518f094f9096315f2fdb30 || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" af80bb671ea0f66c0036ce7041a56b0e550fc94fb88d2c77b5b6a3e33e42139b || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" d2f4c7a4a12630e879702353f944f96a5d8e764771b5a5f04163334ad61b39db || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 3e168d1b081ee3a2175fe1bd97ad03bb40fe7ce38a37e99923a19f0e7ec4d81c || 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" 47ddb48197872055f0adf8e90a7235f8a3b795ca1ee3a28ac2c504c673ae3806 || 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" 1ba8e5b48f3b4d47d2de7121529d448532200fa36d9ed21f93909f6eb03f61cb || goto error
+call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg/archive/v%PLUTOVG%.zip" 5153e6b3603a253e6f86dc0b1eb5b80d1dce849ceef628369942587e86582cbb || 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...
@@ -142,140 +90,7 @@ if %DEBUG%==1 (
  echo Building release libraries...
 )

-set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_SHARED_LINKER_FLAGS_MINSIZEREL="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_MINSIZEREL="/DEBUG"
-
-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!"
-)
+set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG" -DCMAKE_MODULE_LINKER_FLAGS_RELEASE="/DEBUG"

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

 echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-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
@@ -410,7 +226,7 @@ ninja install || goto error
 cd ..\.. || goto error

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

-if %DEBUG%==1 (
-  set QTAPNGBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
-) else (
-  set QTAPNGBUILDSPEC=-DCMAKE_BUILD_TYPE=Release -G Ninja
-)
-
-echo Building Qt APNG...
-rmdir /S /Q "QtApng-%QTAPNG%"
-%SEVENZIP% x "QtApng-%QTAPNG%.zip" || goto error
-cd "QtApng-%QTAPNG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\..\common\qtapng-cmake.patch" || goto error
-cmake -B build -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% %QTAPNGBUILDSPEC% || goto error
-cmake --build build --parallel || goto error
-ninja -C build install || goto error
-cd .. || goto error
-
 if %DEBUG%==1 (
  set KDDOCKWIDGETSBUILDSPEC=-DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DCMAKE_CROSS_CONFIGS=all -DCMAKE_DEFAULT_BUILD_TYPE=Release -DCMAKE_DEFAULT_CONFIGS=all -G "Ninja Multi-Config"
 ) else (
@@ -460,6 +260,7 @@ echo "Building KDDockWidgets..."
 rmdir /S /Q "KDDockWidgets-%KDDOCKWIDGETS%"
 %SEVENZIP% x "KDDockWidgets-%KDDOCKWIDGETS%.zip" || goto error
 cd "KDDockWidgets-%KDDOCKWIDGETS%" || goto error
+%PATCH% -p1 < "%SCRIPTDIR%\..\common\kddockwidgets-dodgy-include.patch" || goto error
 cmake -B build -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DKDDockWidgets_QT6=true -DKDDockWidgets_EXAMPLES=false -DKDDockWidgets_FRONTENDS=qtwidgets %KDDOCKWIDGETSBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -469,7 +270,6 @@ echo "Building PlutoVG..."
 rmdir /S /Q "plutovg-%PLUTOVG%"
 %SEVENZIP% x "plutovg-%PLUTOVG%.zip" || goto error
 cd "plutovg-%PLUTOVG%" || goto error
-%PATCH% -p1 < "%SCRIPTDIR%\plutovg-workaround-msvc-ice.patch" || goto error
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DPLUTOVG_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error
@@ -484,29 +284,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
-
 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
-
@@ -1,52 +0,0 @@
-diff --git a/source/plutovg-font.c b/source/plutovg-font.c
-index 0ad89b1..110de7f 100644
--- a/source/plutovg-font.c
-+++ b/source/plutovg-font.c
-@@ -836,7 +836,8 @@ int plutovg_font_face_cache_load_file(plutovg_font_face_cache_t* cache, const ch
-         size_t family_index = 0;
-         if(unicode_family_name) {
-             const stbtt_uint8* family_name = unicode_family_name;
-            while(family_length) {
-+            //while(family_length) {
-+            for (int i = family_length; i > 0; i -= 2) {
-                 stbtt_uint16 ch = family_name[0] * 256 + family_name[1];
-                 if(ch < 0x80) {
-                     entry->family[family_index++] = ch;
-@@ -853,7 +854,8 @@ int plutovg_font_face_cache_load_file(plutovg_font_face_cache_t* cache, const ch
-                     entry->family[family_index++] = (0x80 + ((c) & 0x3f));
- 
-                     family_name += 2;
-                    family_length -= 2;
-+                    //family_length -= 2;
-+                    i -= 2;
-                 } else {
-                     entry->family[family_index++] = (0xe0 + (ch >> 12));
-                     entry->family[family_index++] = (0x80 + ((ch >> 6) & 0x3f));
-@@ -861,7 +863,7 @@ int plutovg_font_face_cache_load_file(plutovg_font_face_cache_t* cache, const ch
-                 }
- 
-                 family_name += 2;
-                family_length -= 2;
-+                //family_length -= 2;
-             }
- 
-             entry->family[family_index] = '\0';
-@@ -902,7 +904,8 @@ int plutovg_font_face_cache_load_file(plutovg_font_face_cache_t* cache, const ch
-             };
- 
-             const stbtt_uint8* family_name = roman_family_name;
-            while(family_length) {
-+            //while(family_length) {
-+            for (int i2 = family_length; i2 > 0; i2--) {
-                 stbtt_uint16 ch = MAC_ROMAN_TABLE[family_name[0]];
-                 if(ch < 0x80) {
-                     entry->family[family_index++] = ch;
-@@ -916,7 +919,7 @@ int plutovg_font_face_cache_load_file(plutovg_font_face_cache_t* cache, const ch
-                 }
- 
-                 family_name += 1;
-                family_length -= 1;
-+                //family_length -= 1;
-             }
- 
-             entry->family[family_index] = '\0';
@@ -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@v6
+    - uses: actions/labeler@v5
      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@v6
+        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@v6
+        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@v5
+        uses: actions/cache@v4
        with:
          path: deps
          key: ${{ inputs.os }} ${{ inputs.platform }} deps ${{ hashFiles('.github/workflows/scripts/windows/build-dependencies.bat', '.github/workflows/scripts/common/*.patch') }}
@@ -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@v4
        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@v4
        with:
          name: ${{ steps.artifact-metadata.outputs.artifact-name }}-symbols
          path: |
@@ -1,17 +0,0 @@
-name: 🖥️ 📦 Dispatch Windows Deps Build
-
-on:
-  pull_request_target:
-    types: [closed]
-
-jobs:
-  trigger:
-    if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'requires-win-deps-build')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch to windows-dependencies repo
-        uses: peter-evans/repository-dispatch@v4
-        with:
-          token: ${{ secrets.DEPS_REPO_DISPATCH_ACCESS_TOKEN }}
-          repository: pcsx2/pcsx2-windows-dependencies
-          event-type: deps-update
@@ -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,12 +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,

 	/** Pentium 4 with Willamette, Northwood, or Foster cores. */
 	cpuinfo_uarch_willamette = 0x00100300,
@@ -379,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,
@@ -398,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,
@@ -437,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,
@@ -518,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,
@@ -557,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,
@@ -633,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). */
@@ -767,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 */
@@ -2234,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;
@@ -2315,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);
@@ -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);
 }
@@ -45,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,
@@ -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 ro_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,36 +3430,6 @@ struct cpuinfo_arm_chipset cpuinfo_arm_android_decode_chipset_from_ro_chipname(
 		.series = cpuinfo_arm_chipset_series_unknown,
 	};
 }
-
-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;
-	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;
-	}
-
-	return (struct cpuinfo_arm_chipset){
-		.vendor = cpuinfo_arm_chipset_vendor_unknown,
-		.series = cpuinfo_arm_chipset_series_unknown,
-	};
-}
 #endif /* __ANDROID__ */

 /*
@@ -3529,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],
@@ -3867,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",
@@ -4041,20 +3949,6 @@ static inline struct cpuinfo_arm_chipset disambiguate_spreadtrum_chipset(
 	return *ro_board_platform_chipset;
 }

-static enum cpuinfo_arm_chipset_vendor disambiguate_chipset_vendor(
-	enum cpuinfo_arm_chipset_vendor vendor_a,
-	enum cpuinfo_arm_chipset_vendor vendor_b) {
-	/* Some UNISOC-based platforms reporting conflicting vendor names depending
-	 * on the source. For phones that report both UNISOC and Spreadtrum, treat it
-	 * as UNISOC. */
-	if ((vendor_a == cpuinfo_arm_chipset_vendor_unisoc && vendor_b == cpuinfo_arm_chipset_vendor_spreadtrum) ||
-	    (vendor_a == cpuinfo_arm_chipset_vendor_spreadtrum && vendor_b == cpuinfo_arm_chipset_vendor_unisoc)) {
-		return cpuinfo_arm_chipset_vendor_unisoc;
-	}
-
-	return cpuinfo_arm_chipset_vendor_unknown;
-}
-
 /*
 * Decodes chipset name from Android system properties:
 * - /proc/cpuinfo Hardware string
@@ -4069,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.
@@ -4105,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++) {
@@ -4117,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;
 			}
 		}
 	}
@@ -4324,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}};
@@ -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;
@@ -94,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 */
@@ -126,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
@@ -366,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;
@@ -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);
 	}
 }
@@ -612,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:
@@ -408,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:
@@ -1,117 +1,7 @@
-# libcubeb - Cross-platform Audio I/O Library
-
 [![Build Status](https://github.com/mozilla/cubeb/actions/workflows/build.yml/badge.svg)](https://github.com/mozilla/cubeb/actions/workflows/build.yml)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 int
@@ -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,
@@ -213,19 +213,12 @@ struct cubeb_stream {
  cubeb_device_changed_callback device_changed_callback = nullptr;
  owned_critical_section device_changed_callback_lock;
  /* Stream creation parameters */
-  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE,
-                                             0,
-                                             0,
+  cubeb_stream_params input_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
                                             CUBEB_LAYOUT_UNDEFINED,
-                                             CUBEB_STREAM_PREF_NONE,
-                                             CUBEB_INPUT_PROCESSING_PARAM_NONE};
-  cubeb_stream_params output_stream_params = {
-      CUBEB_SAMPLE_FLOAT32NE,
-      0,
-      0,
-      CUBEB_LAYOUT_UNDEFINED,
-      CUBEB_STREAM_PREF_NONE,
-      CUBEB_INPUT_PROCESSING_PARAM_NONE};
+                                             CUBEB_STREAM_PREF_NONE};
+  cubeb_stream_params output_stream_params = {CUBEB_SAMPLE_FLOAT32NE, 0, 0,
+                                              CUBEB_LAYOUT_UNDEFINED,
+                                              CUBEB_STREAM_PREF_NONE};
  device_info input_device;
  device_info output_device;
  /* Format descriptions */
@@ -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;
@@ -16,8 +16,8 @@
 #include <time.h>
 #endif

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

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

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

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

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

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

 #endif // CUBEB_LOG
@@ -371,9 +371,3 @@ cubeb_resampler_latency(cubeb_resampler * resampler)
 {
  return resampler->latency();
 }
-
-cubeb_resampler_stats
-cubeb_resampler_stats_get(cubeb_resampler * resampler)
-{
-  return resampler->stats();
-}
@@ -84,20 +84,6 @@ cubeb_resampler_destroy(cubeb_resampler * resampler);
 long
 cubeb_resampler_latency(cubeb_resampler * resampler);

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

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

  virtual long latency() { return 0; }

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

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

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

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

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

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

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

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

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

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

  /* All the streams we have have a sample rate that matches the target
-     sample rate, use a no-op resampler, that simply forwards the buffers to
-     the callback. */
+     sample rate, use a no-op resampler, that simply forwards the buffers to the
+     callback. */
  if (((input_params && input_params->rate == target_rate) &&
       (output_params && output_params->rate == target_rate)) ||
      (input_params && !output_params && (input_params->rate == target_rate)) ||
@@ -41,10 +41,10 @@
 #ifdef FLOATING_POINT
 #error You cannot compile as floating point and fixed point at the same time
 #endif
-#ifdef USE_SSE
+#ifdef _USE_SSE
 #error SSE is only for floating-point
 #endif
-#if defined(ARM4_ASM) + defined(ARM5E_ASM) + defined(BFIN_ASM) > 1
+#if ((defined (ARM4_ASM)||defined (ARM4_ASM)) && defined(BFIN_ASM)) || (defined (ARM4_ASM)&&defined(ARM5E_ASM))
 #error Make up your mind. What CPU do you have?
 #endif
 #ifdef VORBIS_PSYCHO
@@ -56,10 +56,10 @@
 #ifndef FLOATING_POINT
 #error You now need to define either FIXED_POINT or FLOATING_POINT
 #endif
-#if defined(ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
+#if defined (ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM)
 #error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions?
 #endif
-#ifdef FIXED_DEBUG
+#ifdef FIXED_POINT_DEBUG
 #error "Don't you think enabling fixed-point is a good thing to do if you want to debug that?"
 #endif

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

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

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

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

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

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


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

 /* 2 on TI C5x DSP */
 #define BYTES_PER_CHAR 2
@@ -69,18 +69,22 @@


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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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).
@@ -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")

@@ -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.1.0</b> (2026-02-23)
+<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
 */

@@ -1112,19 +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), 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().
@@ -1200,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`.
@@ -1817,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>

@@ -2881,23 +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.
-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
@@ -3592,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
@@ -3609,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
@@ -215,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

@@ -817,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
@@ -5988,8 +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 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(); }
@@ -6076,8 +6046,7 @@ private:
    const bool m_UseMutex;
    const bool m_AlwaysCommitted;
    const bool m_MsaaAlwaysCommitted;
-    bool m_PreferSmallBuffersCommitted;
-    const bool m_UseTightAlignment;
+    const bool m_PreferSmallBuffersCommitted;
    bool m_DefaultPoolsNotZeroed = false;
    ID3D12Device* m_Device; // AddRef
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
@@ -6105,7 +6074,6 @@ private:
    DXGI_ADAPTER_DESC m_AdapterDesc;
    D3D12_FEATURE_DATA_D3D12_OPTIONS m_D3D12Options;
    BOOL m_GPUUploadHeapSupported = FALSE;
-    BOOL m_TightAlignmentSupported = FALSE;
    D3D12_FEATURE_DATA_ARCHITECTURE m_D3D12Architecture;
    AllocationObjectAllocator m_AllocationObjectAllocator;

@@ -6187,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),
@@ -6277,25 +6244,6 @@ HRESULT AllocatorPimpl::Init(const ALLOCATOR_DESC& desc)
    }
 #endif // #if D3D12MA_OPTIONS16_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;
-            
-            // If tight alignment is supported (checked by the code above) and wasn't disabled by the developer
-            // (with ALLOCATOR_FLAG_DONT_USE_TIGHT_ALIGNMENT), disable the preference for creating small buffers as committed,
-            // as if ALLOCATOR_FLAG_DONT_PREFER_SMALL_BUFFERS_COMMITTED was specified.
-            if (IsTightAlignmentEnabled())
-            {
-                m_PreferSmallBuffersCommitted = false;
-            }
-        }
-    }
-#endif // #if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-
    hr = m_Device->CheckFeatureSupport(D3D12_FEATURE_ARCHITECTURE, &m_D3D12Architecture, sizeof(m_D3D12Architecture));
    if (FAILED(hr))
    {
@@ -6325,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
@@ -6992,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();
        }
@@ -7813,24 +7758,8 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    D3D12_RESOURCE_ALLOCATION_INFO& outAllocInfo) const
 {
 #ifdef __ID3D12Device1_INTERFACE_DEFINED__
-
-#if D3D12MA_TIGHT_ALIGNMENT_SUPPORTED
-    if (IsTightAlignmentEnabled())
-    {
-        // 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,
@@ -7838,25 +7767,20 @@ HRESULT AllocatorPimpl::GetResourceAllocationInfo(
    D3D12_RESOURCE_DESC::Width.
    */
    if (inOutResourceDesc.Alignment == 0 &&
-        inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER &&
-        !IsTightAlignmentEnabled())
+        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
    if (inOutResourceDesc.Alignment == 0 &&
-        (inOutResourceDesc.Flags & D3D12_RESOURCE_FLAG_USE_TIGHT_ALIGNMENT_COPY) == 0 &&
-        (inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE1D ||
-            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D ||
-            inOutResourceDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) &&
+        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
        && CanUseSmallAlignment(inOutResourceDesc)
@@ -8164,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),
@@ -9317,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,
@@ -9787,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);
@@ -9883,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})
--- a/Show More
+++ b/Show More