typo

Signed-off-by: lizzie <lizzie@eden-emu.dev>

CMakeLists.txt

@@ -63,7 +63,6 @@ if (YUZU_STATIC_ROOM)
     set(Boost_USE_STATIC_LIBS ON)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
     set(OPENSSL_USE_STATIC_LIBS ON)
-    set(OpenSSL_FORCE_SYSTEM ON)
 
     set(zstd_FORCE_BUNDLED ON)
     set(fmt_FORCE_BUNDLED ON)

CMakeModules/CPMUtil.cmake

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-cmake_minimum_required(VERSION 3.31)
+set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
 
 if(MSVC OR ANDROID OR IOS)
     set(BUNDLED_DEFAULT ON)
@@ -9,40 +9,15 @@ else()
     set(BUNDLED_DEFAULT OFF)
 endif()
 
-set(CPM_SOURCE_CACHE "${PROJECT_SOURCE_DIR}/.cache/cpm" CACHE STRING "" FORCE)
-
 option(CPMUTIL_FORCE_BUNDLED
     "Force bundled packages for all CPM depdendencies" ${BUNDLED_DEFAULT})
 
 option(CPMUTIL_FORCE_SYSTEM
-    "Force system packages for all CPM dependencies" OFF)
-
-set(CPMUTIL_PATCH_DIR "${PROJECT_SOURCE_DIR}/.patch" CACHE STRING
-    "Directory containing patches for packages")
+    "Force system packages for all CPM dependencies (NOT RECOMMENDED)" OFF)
 
+cmake_minimum_required(VERSION 3.22)
 include(CPM)
 
-# Rudimentary target architecture detection
-if (NOT DEFINED ARCHITECTURE)
-    string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor)
-    if (processor MATCHES "x86|amd64")
-        set(CPMUTIL_AMD64 ON)
-    elseif(processor MATCHES "^aarch64|^arm64|^armv8\.*")
-        set(CPMUTIL_ARM64 ON)
-    elseif(processor MATCHES "riscv")
-        set(CPMUTIL_RISCV64 ON)
-    endif()
-else()
-    # This block exists for compatibility with my own DetectArchitecture.cmake.
-    if (ARCHITECTURE_x86_64)
-        set(CPMUTIL_AMD64 ON)
-    elseif(ARCHITECTURE_arm64)
-        set(CPMUTIL_ARM64 ON)
-    elseif(ARCHITECTURE_riscv64)
-        set(CPMUTIL_RISCV64 ON)
-    endif()
-endif()
-
 # cpmfile parsing
 set(CPMUTIL_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpmfile.json")
 
@@ -95,6 +70,7 @@ function(get_json_element object out member default)
 
     if(out_type STREQUAL "ARRAY")
         string(JSON _len LENGTH "${object}" ${member})
+        # array_to_list("${outvar}" ${_len} outvar)
         set("${out}_LENGTH" "${_len}" PARENT_SCOPE)
     endif()
 
@@ -172,12 +148,11 @@ macro(parse_object object)
     get_json_element("${object}" repo repo "")
     get_json_element("${object}" ci ci OFF)
     get_json_element("${object}" version version "")
-    get_json_element("${object}" min_version min_version "")
-    get_json_element("${object}" git_host git_host "github.com")
 
     if(ci)
         get_json_element("${object}" name name "${JSON_NAME}")
         get_json_element("${object}" extension extension "tar.zst")
+        get_json_element("${object}" min_version min_version "")
         get_json_element("${object}" raw_disabled disabled_platforms "")
 
         if(raw_disabled)
@@ -188,10 +163,14 @@ macro(parse_object object)
         endif()
     else()
         get_json_element("${object}" hash hash "")
+        get_json_element("${object}" hash_suffix hash_suffix "")
         get_json_element("${object}" sha sha "")
         get_json_element("${object}" url url "")
+        get_json_element("${object}" key key "")
         get_json_element("${object}" tag tag "")
         get_json_element("${object}" artifact artifact "")
+        get_json_element("${object}" git_version git_version "")
+        get_json_element("${object}" git_host git_host "")
         get_json_element("${object}" source_subdir source_subdir "")
         get_json_element("${object}" bundled bundled "unset")
         get_json_element("${object}" find_args find_args "")
@@ -199,17 +178,23 @@ macro(parse_object object)
 
         # okay here comes the fun part: REPLACEMENTS!
         # first: tag gets %VERSION% replaced if applicable,
-        #   with version
+        #   with either git_version (preferred) or version
         # second: artifact gets %VERSION% and %TAG% replaced
         #   accordingly (same rules for VERSION)
 
+        if(git_version)
+            set(version_replace ${git_version})
+        else()
+            set(version_replace ${version})
+        endif()
+
         # TODO(crueter): fmt module for cmake
         if(tag)
-            string(REPLACE "%VERSION%" "${version}" tag ${tag})
+            string(REPLACE "%VERSION%" "${version_replace}" tag ${tag})
         endif()
 
         if(artifact)
-            string(REPLACE "%VERSION%" "${version}"
+            string(REPLACE "%VERSION%" "${version_replace}"
                 artifact ${artifact})
             string(REPLACE "%TAG%" "${tag}" artifact ${artifact})
         endif()
@@ -222,7 +207,7 @@ macro(parse_object object)
                 string(JSON _patch GET "${raw_patches}" "${IDX}")
 
                 set(full_patch
-                    "${CPMUTIL_PATCH_DIR}/${JSON_NAME}/${_patch}")
+                    "${PROJECT_SOURCE_DIR}/.patch/${JSON_NAME}/${_patch}")
                 if(NOT EXISTS ${full_patch})
                     cpm_utils_message(FATAL_ERROR ${JSON_NAME}
                         "specifies patch ${full_patch} which does not exist")
@@ -257,16 +242,14 @@ function(AddJsonPackage)
 
         # these are overrides that can be generated at runtime,
         # so can be defined separately from the json
+        BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE)
 
     set(multiValueArgs OPTIONS)
 
     set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
 
-    cmake_parse_arguments(JSON
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
+    cmake_parse_arguments(JSON "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}"
         "${ARGN}")
 
     list(LENGTH ARGN argnLength)
@@ -277,8 +260,8 @@ function(AddJsonPackage)
     endif()
 
     if(NOT DEFINED CPMFILE_CONTENT)
-        cpm_utils_message(FATAL_ERROR ${name}
-            "No cpmfile present")
+        cpm_utils_message(WARNING ${name}
+            "No cpmfile, AddJsonPackage is a no-op")
         return()
     endif()
 
@@ -305,16 +288,13 @@ function(AddJsonPackage)
 
     if(ci)
         AddCIPackage(
-            VERSION "${version}"
-            NAME "${name}"
-            REPO "${repo}"
-            PACKAGE "${package}"
-            EXTENSION "${extension}"
-            MIN_VERSION "${min_version}"
-            DISABLED_PLATFORMS "${disabled_platforms}"
-
-            GIT_HOST "${git_host}"
-
+            VERSION ${version}
+            NAME ${name}
+            REPO ${repo}
+            PACKAGE ${package}
+            EXTENSION ${extension}
+            MIN_VERSION ${min_version}
+            DISABLED_PLATFORMS ${disabled_platforms}
             ${EXTRA_ARGS})
     else()
         if (NOT DEFINED JSON_FORCE_BUNDLED_PACKAGE)
@@ -324,11 +304,12 @@ function(AddJsonPackage)
         AddPackage(
             NAME "${package}"
             VERSION "${version}"
-            MIN_VERSION "${min_version}"
             URL "${url}"
             HASH "${hash}"
+            HASH_SUFFIX "${hash_suffix}"
             SHA "${sha}"
             REPO "${repo}"
+            KEY "${key}"
             PATCHES "${patches}"
             OPTIONS "${options}"
             FIND_PACKAGE_ARGUMENTS "${find_args}"
@@ -336,11 +317,11 @@ function(AddJsonPackage)
             FORCE_BUNDLED_PACKAGE "${JSON_FORCE_BUNDLED_PACKAGE}"
             SOURCE_SUBDIR "${source_subdir}"
 
+            GIT_VERSION "${git_version}"
             GIT_HOST "${git_host}"
 
             ARTIFACT "${artifact}"
             TAG "${tag}"
-
             ${EXTRA_ARGS})
     endif()
 
@@ -358,19 +339,25 @@ function(AddPackage)
     set(oneValueArgs
         NAME
         VERSION
-        MIN_VERSION
+        GIT_VERSION
         GIT_HOST
 
         REPO
         TAG
         ARTIFACT
         SHA
+        BRANCH
 
         HASH
+        HASH_SUFFIX
+        HASH_URL
+        HASH_ALGO
 
         URL
-
+        GIT_URL
         SOURCE_SUBDIR
+
+        KEY
         BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE
         FIND_PACKAGE_ARGUMENTS)
@@ -379,10 +366,7 @@ function(AddPackage)
 
     set(optionArgs MODULE_PATH DOWNLOAD_ONLY)
 
-    cmake_parse_arguments(PKG_ARGS
-        "${optionArgs}"
-        "${oneValueArgs}"
-        "${multiValueArgs}"
+    cmake_parse_arguments(PKG_ARGS "${optionArgs}" "${oneValueArgs}" "${multiValueArgs}"
         "${ARGN}")
 
     if(NOT DEFINED PKG_ARGS_NAME)
@@ -401,7 +385,6 @@ function(AddPackage)
         set(CPM_${PKG_ARGS_NAME}_SOURCE ${${PKG_ARGS_NAME}_CUSTOM_DIR})
     endif()
 
-    # TODO: See if this can be delegated to subshells
     if(NOT DEFINED PKG_ARGS_GIT_HOST)
         set(git_host github.com)
     else()
@@ -410,22 +393,42 @@ function(AddPackage)
 
     if(DEFINED PKG_ARGS_URL)
         set(pkg_url ${PKG_ARGS_URL})
-        set(pkg_git_url ${pkg_url})
+
+        if(DEFINED PKG_ARGS_REPO)
+            set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
+        else()
+            if(DEFINED PKG_ARGS_GIT_URL)
+                set(pkg_git_url ${PKG_ARGS_GIT_URL})
+            else()
+                set(pkg_git_url ${pkg_url})
+            endif()
+        endif()
     elseif(DEFINED PKG_ARGS_REPO)
         set(pkg_git_url https://${git_host}/${PKG_ARGS_REPO})
 
-        if(DEFINED PKG_ARGS_SHA)
-            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
-        elseif(DEFINED PKG_ARGS_TAG)
-            set(tag "${PKG_ARGS_TAG}")
+        if(DEFINED PKG_ARGS_TAG)
+            set(pkg_key ${PKG_ARGS_TAG})
+
             if(DEFINED PKG_ARGS_ARTIFACT)
-                set(artifact "${PKG_ARGS_ARTIFACT}")
                 set(pkg_url
-                    "${pkg_git_url}/releases/download/${tag}/${artifact}")
+                    "${pkg_git_url}/releases/download/${PKG_ARGS_TAG}/${PKG_ARGS_ARTIFACT}")
             else()
                 set(pkg_url
-                    "${pkg_git_url}/archive/refs/tags/${tag}.tar.gz")
+                    ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz)
             endif()
+        elseif(DEFINED PKG_ARGS_SHA)
+            set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz")
+        else()
+            if(DEFINED PKG_ARGS_BRANCH)
+                set(PKG_BRANCH ${PKG_ARGS_BRANCH})
+            else()
+                cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+                    "REPO defined but no TAG, SHA, BRANCH, or URL"
+                    "specified, defaulting to master")
+                set(PKG_BRANCH master)
+            endif()
+
+            set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz)
         endif()
     else()
         cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
@@ -434,24 +437,75 @@ function(AddPackage)
 
     cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
 
-    if(DEFINED PKG_ARGS_SHA)
-        string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
-    elseif(DEFINED PKG_ARGS_VERSION)
-        set(pkg_key ${PKG_ARGS_VERSION})
-    elseif(DEFINED PKG_ARGS_TAG)
-        set(pkg_key ${PKG_ARGS_TAG})
-    elseif(DEFINED PKG_ARGS_MIN_VERSION)
-        set(pkg_key ${PKG_ARGS_MIN_VERSION})
+    if(NOT DEFINED PKG_ARGS_KEY)
+        if(DEFINED PKG_ARGS_SHA)
+            string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key} from sha")
+        elseif(DEFINED PKG_ARGS_GIT_VERSION)
+            set(pkg_key ${PKG_ARGS_GIT_VERSION})
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key}")
+        elseif(DEFINED PKG_ARGS_TAG)
+            set(pkg_key ${PKG_ARGS_TAG})
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key}")
+        elseif(DEFINED PKG_ARGS_VERSION)
+            set(pkg_key ${PKG_ARGS_VERSION})
+            cpm_utils_message(DEBUG ${PKG_ARGS_NAME}
+                "No custom key defined, using ${pkg_key}")
+        else()
+            cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+                "Could not determine cache key, using CPM defaults")
+        endif()
     else()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "Could not determine cache key")
+        set(pkg_key ${PKG_ARGS_KEY})
+    endif()
+
+    if(DEFINED PKG_ARGS_HASH_ALGO)
+        set(hash_algo ${PKG_ARGS_HASH_ALGO})
+    else()
+        set(hash_algo SHA512)
     endif()
 
     if(DEFINED PKG_ARGS_HASH)
-        set(pkg_hash "SHA512=${PKG_ARGS_HASH}")
+        set(pkg_hash "${hash_algo}=${PKG_ARGS_HASH}")
+    elseif(DEFINED PKG_ARGS_HASH_SUFFIX)
+        # funny sanity check
+        string(TOLOWER ${hash_algo} hash_algo_lower)
+        string(TOLOWER ${PKG_ARGS_HASH_SUFFIX} suffix_lower)
+        if(NOT ${suffix_lower} MATCHES ${hash_algo_lower})
+            cpm_utils_message(WARNING
+                "Hash algorithm and hash suffix do not match, errors may occur")
+        endif()
+
+        set(hash_url ${pkg_url}.${PKG_ARGS_HASH_SUFFIX})
+    elseif(DEFINED PKG_ARGS_HASH_URL)
+        set(hash_url ${PKG_ARGS_HASH_URL})
     else()
-        cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME}
-            "No hash defined")
+        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
+            "No hash or hash URL found")
+    endif()
+
+    if(DEFINED hash_url)
+        set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${PKG_ARGS_NAME}.hash)
+
+        # TODO(crueter): This is kind of a bad solution
+        # because "technically" the hash is invalidated each week
+        # but it works for now kjsdnfkjdnfjksdn
+        string(TOLOWER ${PKG_ARGS_NAME} lowername)
+        if(NOT EXISTS ${outfile} AND NOT EXISTS
+            ${CPM_SOURCE_CACHE}/${lowername}/${pkg_key})
+            file(DOWNLOAD ${hash_url} ${outfile})
+        endif()
+
+        if(EXISTS ${outfile})
+            file(READ ${outfile} pkg_hash_tmp)
+        endif()
+
+        if(DEFINED ${pkg_hash_tmp})
+            set(pkg_hash "${hash_algo}=${pkg_hash_tmp}")
+        endif()
     endif()
 
     macro(set_precedence local force)
@@ -491,9 +545,9 @@ function(AddPackage)
         set_precedence(ON OFF)
     endif()
 
-    if(DEFINED PKG_ARGS_MIN_VERSION)
+    if(DEFINED PKG_ARGS_VERSION)
         list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_MIN_VERSION})
+            VERSION ${PKG_ARGS_VERSION})
     endif()
 
     if (PKG_ARGS_FIND_PACKAGE_ARGUMENTS)
@@ -521,10 +575,10 @@ function(AddPackage)
     endif()
 
     CPMAddPackage(
-        NAME ${PKG_ARGS_NAME}
-        URL ${pkg_url}
-        URL_HASH ${pkg_hash}
-        CUSTOM_CACHE_KEY ${pkg_key}
+        NAME "${PKG_ARGS_NAME}"
+        URL "${pkg_url}"
+        URL_HASH "${pkg_hash}"
+        CUSTOM_CACHE_KEY "${pkg_key}"
 
         EXCLUDE_FROM_ALL ON
 
@@ -539,15 +593,15 @@ function(AddPackage)
         if(DEFINED PKG_ARGS_SHA)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                 ${PKG_ARGS_SHA})
-        elseif(DEFINED PKG_ARGS_VERSION)
+        elseif(DEFINED PKG_ARGS_GIT_VERSION)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_VERSION})
+                ${PKG_ARGS_GIT_VERSION})
         elseif(DEFINED PKG_ARGS_TAG)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
                 ${PKG_ARGS_TAG})
-        elseif(DEFINED PKG_ARGS_MIN_VERSION)
+        elseif(DEFINED PKG_ARGS_VERSION)
             set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS
-                ${PKG_ARGS_MIN_VERSION})
+                ${PKG_ARGS_VERSION})
         else()
             cpm_utils_message(WARNING ${PKG_ARGS_NAME}
                 "Package has no specified sha, tag, or version")
@@ -584,8 +638,7 @@ function(AddCIPackage)
         REPO
         PACKAGE
         EXTENSION
-        MIN_VERSION
-        GIT_HOST)
+        MIN_VERSION)
 
     set(multiValueArgs DISABLED_PLATFORMS)
 
@@ -597,7 +650,6 @@ function(AddCIPackage)
         "${multiValueArgs}"
         ${ARGN})
 
-    # TODO: use cpm_utils_message
     if(NOT DEFINED PKG_ARGS_VERSION)
         message(FATAL_ERROR "[CPMUtil] VERSION is required")
     endif()
@@ -623,12 +675,6 @@ function(AddCIPackage)
         set(ARTIFACT_EXT ${PKG_ARGS_EXTENSION})
     endif()
 
-    if (NOT DEFINED PKG_ARGS_GIT_HOST)
-        set(ARTIFACT_GIT_HOST "github.com")
-    else()
-        set(ARTIFACT_GIT_HOST "${PKG_ARGS_GIT_HOST}")
-    endif()
-
     if(DEFINED PKG_ARGS_MIN_VERSION)
         set(ARTIFACT_MIN_VERSION ${PKG_ARGS_MIN_VERSION})
     endif()
@@ -643,81 +689,49 @@ function(AddCIPackage)
     set(ARTIFACT_REPO ${PKG_ARGS_REPO})
     set(ARTIFACT_PACKAGE ${PKG_ARGS_PACKAGE})
 
-    # TODO: Use amd64/aarch64 naming for everything.
-    # Also drop macos universal
-
-    if (MSVC)
-        set(platname windows)
-    elseif(MINGW)
-        set(platname mingw)
-    elseif(ANDROID)
-        set(platname android)
-    elseif(LINUX)
-        set(platname linux)
-    elseif(IOS)
-        set(platname ios)
-    elseif(APPLE)
-        set(platname macos)
-    else()
-        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-            "Unsupported platform ${CMAKE_SYSTEM_NAME} for CI packages")
+    if(MSVC AND ARCHITECTURE_x86_64)
+        set(pkgname windows-amd64)
+    elseif(MSVC AND ARCHITECTURE_arm64)
+        set(pkgname windows-arm64)
+    elseif(MINGW AND ARCHITECTURE_x86_64)
+        set(pkgname mingw-amd64)
+    elseif(MINGW AND ARCHITECTURE_arm64)
+        set(pkgname mingw-arm64)
+    elseif(ANDROID AND ARCHITECTURE_x86_64)
+        set(pkgname android-x86_64)
+    elseif(ANDROID AND ARCHITECTURE_arm64)
+        set(pkgname android-aarch64)
+    elseif(PLATFORM_SUN)
+        set(pkgname solaris-amd64)
+    elseif(PLATFORM_FREEBSD)
+        set(pkgname freebsd-amd64)
+    elseif(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
+        set(pkgname linux-amd64)
+    elseif(PLATFORM_LINUX AND ARCHITECTURE_arm64)
+        set(pkgname linux-aarch64)
+    elseif(APPLE AND NOT IOS)
+        set(pkgname macos-universal)
+    elseif(IOS AND ARCHITECTURE_arm64)
+        set(pkgname ios-aarch64)
     endif()
 
-    if (APPLE AND NOT IOS)
-        set(archname universal)
-    elseif((WIN32 OR LINUX) AND CPMUTIL_AMD64)
-        set(archname amd64)
-    elseif(WIN32 AND CPMUTIL_ARM64)
-        set(archname arm64)
-    elseif((IOS OR LINUX OR ANDROID) AND CPMUTIL_ARM64)
-        set(archname aarch64)
-    elseif(ANDROID AND CPMUTIL_AMD64)
-        set(archname x86_64)
-    else()
-        cpm_utils_message(WARNING ${PKG_ARGS_NAME}
-            "Unsupported platform/arch combo for CI packages")
-    endif()
-
-    if (DEFINED platname AND DEFINED archname)
-        set(pkgname ${platname}-${archname})
-    endif()
-
-    if (DEFINED pkgname
-        AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
+    if (DEFINED pkgname AND NOT "${pkgname}" IN_LIST DISABLED_PLATFORMS)
         set(ARTIFACT
             "${ARTIFACT_NAME}-${pkgname}-${ARTIFACT_VERSION}.${ARTIFACT_EXT}")
 
         if (PKG_ARGS_MODULE_PATH)
-            set(EXTRA_ARGS MODULE_PATH)
+            list(APPEND EXTRA_ARGS MODULE_PATH)
         endif()
 
-        # download sha512sum file
-        # TODO:
-        set(sha512sum_url
-            "https://${ARTIFACT_GIT_HOST}/${ARTIFACT_REPO}/releases/download/v${ARTIFACT_VERSION}/${ARTIFACT}.sha512sum")
-        set(sha512sum_file
-            "${CMAKE_CURRENT_BINARY_DIR}/.cpmutil_${ARTIFACT}_sha512sum")
-
-        file(DOWNLOAD "${sha512sum_url}" "${sha512sum_file}"
-            STATUS sha512sum_status)
-        list(GET sha512sum_status 0 sha512sum_error)
-
-        if(sha512sum_error)
-            message(FATAL_ERROR "[CPMUtil] Failed to download sha512sum "
-                "for ${ARTIFACT_NAME} from ${sha512sum_url}")
-        endif()
-
-        file(READ "${sha512sum_file}" sha512sum_hash)
-        string(STRIP "${sha512sum_hash}" sha512sum_hash)
-        file(REMOVE "${sha512sum_file}")
-
         AddPackage(
             NAME ${ARTIFACT_PACKAGE}
             REPO ${ARTIFACT_REPO}
             TAG "v${ARTIFACT_VERSION}"
-            MIN_VERSION ${ARTIFACT_VERSION}
+            GIT_VERSION ${ARTIFACT_VERSION}
             ARTIFACT ${ARTIFACT}
-            HASH ${sha512sum_hash}
+
+            KEY "${pkgname}-${ARTIFACT_VERSION}"
+            HASH_SUFFIX sha512sum
             FORCE_BUNDLED_PACKAGE ON
             ${EXTRA_ARGS})
 
@@ -747,6 +761,7 @@ function(AddQt repo version)
         REPO ${repo}
         DISABLED_PLATFORMS
             android-x86_64 android-aarch64
+            freebsd-amd64 solaris-amd64 openbsd-amd64
         MODULE_PATH)
 
     find_package(Qt6 REQUIRED PATHS ${Qt6_SOURCE_DIR} NO_DEFAULT_PATH)

cpmfile.json

@@ -1,229 +1,18 @@
 {
-    "biscuit": {
-        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
-        "min_version": "0.9.1",
-        "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "version": "0.19.0"
-    },
-    "boost": {
-        "artifact": "%TAG%-cmake.tar.xz",
-        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
-        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
-        "min_version": "1.57",
-        "package": "Boost",
-        "patches": [
-            "0001-clang-cl.patch"
-        ],
-        "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
-        "version": "1.90.0"
-    },
-    "boost_headers": {
-        "bundled": true,
-        "hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507",
-        "repo": "boostorg/headers",
-        "tag": "boost-%VERSION%",
-        "version": "1.90.0"
-    },
-    "catch2": {
-        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
-        "min_version": "3.0.1",
-        "package": "Catch2",
-        "patches": [
-            "0001-solaris-isnan-fix.patch"
-        ],
-        "repo": "catchorg/Catch2",
-        "tag": "v%VERSION%",
-        "version": "3.13.0"
-    },
-    "cpp-jwt": {
-        "find_args": "CONFIG",
-        "hash": "d11cbd5ddb3197b4c5ca15679bcd76a49963e7b530b7dd132db91e042925efa20dfb2c24ccfbe7ef82a7012af80deff0f72ee25851312ae80381a462df8534b8",
-        "min_version": "1.4",
-        "options": [
-            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
-        ],
-        "patches": [
-            "0001-fix-missing-decl.patch"
-        ],
-        "repo": "arun11299/cpp-jwt",
-        "sha": "7f24eb4c32",
-        "version": "1.5.1"
-    },
-    "cubeb": {
-        "find_args": "CONFIG",
-        "hash": "8a4bcb2f83ba590f52c66626e895304a73eb61928dbc57777e1822e55378e3568366f17f9da4b80036cc2ef4ea9723c32abf6e7d9bbe00fb03654f0991596ab0",
-        "options": [
-            "USE_SANITIZERS OFF",
-            "BUILD_TESTS OFF",
-            "BUILD_TOOLS OFF",
-            "BUNDLE_SPEEX ON"
-        ],
-        "repo": "mozilla/cubeb",
-        "sha": "fa02160712",
-        "version": "0.0.0"
-    },
-    "discord-rpc": {
-        "find_args": "MODULE",
-        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
-        "package": "DiscordRPC",
-        "repo": "eden-emulator/discord-rpc",
-        "sha": "0d8b2d6a37",
-        "version": "3.4.1"
-    },
-    "enet": {
-        "find_args": "MODULE",
-        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
-        "min_version": "1.3",
-        "repo": "lsalzman/enet",
-        "tag": "v%VERSION%",
-        "version": "1.3.18"
-    },
-    "ffmpeg": {
-        "bundled": true,
-        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
-        "repo": "FFmpeg/FFmpeg",
-        "sha": "c7b5f1537d",
-        "version": "8.0.1"
-    },
-    "ffmpeg-ci": {
-        "ci": true,
-        "min_version": "4.1",
-        "name": "ffmpeg",
-        "package": "FFmpeg",
-        "repo": "crueter-ci/FFmpeg",
-        "version": "8.0.1-c7b5f1537d"
-    },
-    "fmt": {
-        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
-        "min_version": "8",
-        "repo": "fmtlib/fmt",
-        "tag": "%VERSION%",
-        "version": "12.1.0"
-    },
-    "frozen": {
-        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c",
-        "package": "frozen",
-        "repo": "serge-sans-paille/frozen",
-        "sha": "61dce5ae18",
-        "version": "1.2.0"
-    },
-    "gamemode": {
-        "find_args": "MODULE",
-        "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
-        "min_version": "1.7",
-        "repo": "FeralInteractive/gamemode",
-        "sha": "ce6fe122f3",
-        "version": "1.8.2"
-    },
-    "httplib": {
-        "find_args": "MODULE GLOBAL",
-        "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9",
-        "options": [
-            "HTTPLIB_REQUIRE_OPENSSL ON",
-            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
-        ],
-        "patches": [
-            "0001-mingw.patch"
-        ],
-        "repo": "yhirose/cpp-httplib",
-        "tag": "v%VERSION%",
-        "version": "0.46.0"
-    },
-    "lagoon": {
-        "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e",
-        "repo": "loongson-community/lagoon",
-        "tag": "%VERSION%",
-        "version": "1.0.0"
-    },
-    "libadrenotools": {
-        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
-        "patches": [
-            "0001-linkerns-cpm.patch"
-        ],
-        "repo": "eden-emulator/libadrenotools",
-        "sha": "8ba23b42d7",
-        "version": "1.0.0"
-    },
-    "libusb": {
-        "find_args": "MODULE",
-        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
-        "patches": [
-            "0001-netbsd-gettime.patch"
-        ],
-        "repo": "libusb/libusb",
-        "tag": "v%VERSION%",
-        "version": "1.0.29"
-    },
-    "llvm-mingw": {
-        "artifact": "clang-rt-builtins.tar.zst",
-        "git_host": "git.eden-emu.dev",
-        "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181",
-        "repo": "eden-emu/llvm-mingw",
-        "tag": "%VERSION%",
-        "version": "20250828"
-    },
-    "lz4": {
-        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
-        "name": "lz4",
-        "repo": "lz4/lz4",
-        "sha": "ebb370ca83",
-        "source_subdir": "build/cmake",
-        "version": "1.10.0"
-    },
-    "moltenvk": {
-        "artifact": "MoltenVK-macOS.tar",
-        "bundled": true,
-        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
-        "repo": "V380-Ori/Ryujinx.MoltenVK",
-        "tag": "v%VERSION%-ryujinx",
-        "version": "1.4.1"
-    },
-    "nlohmann": {
-        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
-        "min_version": "3.8",
-        "package": "nlohmann_json",
-        "repo": "nlohmann/json",
-        "tag": "v%VERSION%",
-        "version": "3.12.0"
-    },
-    "oaknut": {
-        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856",
-        "min_version": "2.0.1",
-        "repo": "eden-emulator/oaknut",
-        "tag": "v%VERSION%",
-        "version": "2.0.3"
-    },
-    "oboe": {
-        "bundled": true,
-        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
-        "repo": "google/oboe",
-        "tag": "%VERSION%",
-        "version": "1.10.0"
-    },
-    "openssl": {
-        "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
-        "min_version": "3.0.0",
-        "package": "OpenSSL",
-        "patches": [
-            "0001-add-bundled-cert.patch"
-        ],
-        "repo": "openssl/openssl",
-        "tag": "openssl-%VERSION%",
-        "version": "3.6.2"
-    },
     "openssl-ci": {
         "ci": true,
-        "min_version": "3.0.0",
-        "name": "openssl",
         "package": "OpenSSL",
+        "name": "openssl",
         "repo": "crueter-ci/OpenSSL",
-        "version": "4.0.0-11b7b6ea3b"
+        "version": "4.0.0-11b7b6ea3b",
+        "min_version": "3"
     },
     "openssl-cmake": {
-        "bundled": true,
+        "repo": "jimmy-park/openssl-cmake",
         "hash": "2cc185c924fd70e7d886257ca0caa42b3b8f7f712f2052b4f94dde74759e27022de76178460e18c9bdfc57c366583999e198fbb6052d4e7d91c099d15a0ca63e",
+        "git_version": "3.6.2",
+        "tag": "%VERSION%",
+        "bundled": true,
         "options": [
             "OPENSSL_CONFIGURE_OPTIONS threads"
         ],
@@ -232,173 +21,127 @@
             "0002-use-ccache.patch",
             "0003-use-cmake-compiler-flags.patch",
             "0004-use-shell-wrapper.patch"
-        ],
-        "repo": "jimmy-park/openssl-cmake",
+        ]
+    },
+    "openssl": {
+        "repo": "openssl/openssl",
+        "package": "OpenSSL",
+        "min_version": "3",
+        "version": "3",
+        "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
+        "git_version": "3.6.2",
+        "tag": "openssl-%VERSION%",
+        "patches": [
+            "0001-add-bundled-cert.patch"
+        ]
+    },
+    "boost": {
+        "package": "Boost",
+        "repo": "boostorg/boost",
+        "tag": "boost-%VERSION%",
+        "artifact": "%TAG%-cmake.tar.xz",
+        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
+        "git_version": "1.90.0",
+        "version": "1.57",
+        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
+        "patches": [
+            "0001-clang-cl.patch"
+        ]
+    },
+    "fmt": {
+        "repo": "fmtlib/fmt",
         "tag": "%VERSION%",
-        "version": "3.6.2"
+        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+        "version": "8",
+        "git_version": "12.1.0"
+    },
+    "lz4": {
+        "name": "lz4",
+        "repo": "lz4/lz4",
+        "sha": "ebb370ca83",
+        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
+        "source_subdir": "build/cmake"
+    },
+    "nlohmann": {
+        "package": "nlohmann_json",
+        "repo": "nlohmann/json",
+        "tag": "v%VERSION%",
+        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "version": "3.8",
+        "git_version": "3.12.0"
+    },
+    "zlib": {
+        "package": "ZLIB",
+        "repo": "madler/zlib",
+        "tag": "v%VERSION%",
+        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
+        "version": "1.2",
+        "git_version": "1.3.2",
+        "options": [
+            "ZLIB_BUILD_SHARED OFF",
+            "ZLIB_INSTALL OFF"
+        ]
+    },
+    "zstd": {
+        "repo": "facebook/zstd",
+        "sha": "b8d6101fba",
+        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
+        "version": "1.5",
+        "source_subdir": "build/cmake",
+        "find_args": "MODULE",
+        "options": [
+            "ZSTD_BUILD_SHARED OFF"
+        ]
     },
     "opus": {
-        "find_args": "MODULE",
+        "package": "Opus",
+        "repo": "xiph/opus",
+        "sha": "a3f0ec02b3",
         "hash": "9506147b0de35befda8633ff272981cc2575c860874791bd455b752f797fd7dbd1079f0ba42ccdd7bb1fe6773fa5e84b3d75667c2883dd1fb2d0e4a5fa4f8387",
-        "min_version": "1.3",
+        "version": "1.3",
+        "find_args": "MODULE",
         "options": [
             "OPUS_PRESUME_NEON ON"
         ],
-        "package": "Opus",
         "patches": [
             "0001-disable-clang-runtime-neon.patch",
             "0002-no-install.patch"
-        ],
-        "repo": "xiph/opus",
-        "sha": "a3f0ec02b3",
-        "version": "1.5.2"
+        ]
+    },
+    "boost_headers": {
+        "repo": "boostorg/headers",
+        "sha": "95930ca8f5",
+        "hash": "8a07d7a6f0065587d3005a83481a794704ae22e773b9f336fbd89ed230aaa7b4c86c03edcbae30bba8b3e20839c3131eaa2dceac037ef811533ef4eadc53b15b",
+        "bundled": true
+    },
+    "llvm-mingw": {
+        "repo": "eden-emu/llvm-mingw",
+        "git_host": "git.eden-emu.dev",
+        "tag": "%VERSION%",
+        "version": "20250828",
+        "artifact": "clang-rt-builtins.tar.zst",
+        "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181"
+    },
+    "vulkan-validation-layers": {
+        "package": "VVL",
+        "repo": "KhronosGroup/Vulkan-ValidationLayers",
+        "tag": "vulkan-sdk-%VERSION%",
+        "git_version": "1.4.341.0",
+        "artifact": "android-binaries-%VERSION%.zip",
+        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753"
     },
     "quazip": {
+        "package": "QuaZip-Qt6",
+        "repo": "stachenov/quazip",
+        "sha": "2e95c9001b",
         "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
-        "min_version": "1.3",
+        "version": "1.3",
+        "git_version": "1.5",
         "options": [
             "QUAZIP_QT_MAJOR_VERSION 6",
             "QUAZIP_INSTALL OFF",
             "QUAZIP_ENABLE_QTEXTCODEC OFF",
             "QUAZIP_BZIP2 OFF"
-        ],
-        "package": "QuaZip-Qt6",
-        "repo": "stachenov/quazip",
-        "sha": "2e95c9001b",
-        "version": "1.5"
-    },
-    "sdl3": {
-        "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
-        "min_version": "3.2.10",
-        "package": "SDL3",
-        "repo": "libsdl-org/SDL",
-        "tag": "release-%VERSION%",
-        "version": "3.4.8"
-    },
-    "sdl3-ci": {
-        "ci": true,
-        "min_version": "3.2.10",
-        "name": "SDL3",
-        "package": "SDL3",
-        "repo": "crueter-ci/SDL3",
-        "version": "3.4.8-d57c3b685c"
-    },
-    "simpleini": {
-        "find_args": "MODULE",
-        "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
-        "package": "SimpleIni",
-        "repo": "brofield/simpleini",
-        "tag": "v%VERSION%",
-        "version": "4.25"
-    },
-    "sirit": {
-        "artifact": "sirit-source-%VERSION%.tar.zst",
-        "find_args": "CONFIG",
-        "options": [
-            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
-        ],
-        "repo": "eden-emulator/sirit",
-        "tag": "v%VERSION%",
-        "version": "1.0.5",
-        "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293"
-    },
-    "sirit-ci": {
-        "ci": true,
-        "name": "sirit",
-        "package": "sirit",
-        "repo": "eden-emulator/sirit",
-        "version": "1.0.5"
-    },
-    "spirv-headers": {
-        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
-        "options": [
-            "SPIRV_WERROR OFF"
-        ],
-        "package": "SPIRV-Headers",
-        "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "04f10f650d"
-    },
-    "tzdb": {
-        "artifact": "%VERSION%.tar.gz",
-        "git_host": "git.eden-emu.dev",
-        "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
-        "package": "nx_tzdb",
-        "repo": "eden-emu/tzdb_to_nx",
-        "tag": "%VERSION%",
-        "version": "230326"
-    },
-    "unordered-dense": {
-        "bundled": true,
-        "find_args": "CONFIG",
-        "hash": "d2106f6640f6bfb81755e4b8bfb64982e46ec4a507cacdb38f940123212ccf35a20b43c70c6f01d7bfb8c246d1a16f7845d8052971949cea9def1475e3fa02c8",
-        "package": "unordered_dense",
-        "patches": [
-            "0001-avoid-memset-when-clearing-an-empty-table.patch"
-        ],
-        "repo": "martinus/unordered_dense",
-        "sha": "7b55cab841",
-        "version": "4.8.1"
-    },
-    "vulkan-headers": {
-        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
-        "min_version": "1.4.317",
-        "package": "VulkanHeaders",
-        "repo": "KhronosGroup/Vulkan-Headers",
-        "tag": "v%VERSION%",
-        "version": "1.4.345"
-    },
-    "vulkan-memory-allocator": {
-        "find_args": "CONFIG",
-        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
-        "package": "VulkanMemoryAllocator",
-        "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
-        "tag": "v%VERSION%",
-        "version": "3.3.0"
-    },
-    "vulkan-utility-libraries": {
-        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
-        "package": "VulkanUtilityLibraries",
-        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "tag": "v%VERSION%",
-        "version": "1.4.345"
-    },
-    "vulkan-validation-layers": {
-        "artifact": "android-binaries-%VERSION%.zip",
-        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753",
-        "package": "VVL",
-        "repo": "KhronosGroup/Vulkan-ValidationLayers",
-        "tag": "vulkan-sdk-%VERSION%",
-        "version": "1.4.341.0"
-    },
-    "xbyak": {
-        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
-        "package": "xbyak",
-        "repo": "herumi/xbyak",
-        "tag": "v%VERSION%",
-        "version": "7.35.2"
-    },
-    "zlib": {
-        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
-        "min_version": "1.2",
-        "options": [
-            "ZLIB_BUILD_SHARED OFF",
-            "ZLIB_INSTALL OFF"
-        ],
-        "package": "ZLIB",
-        "repo": "madler/zlib",
-        "tag": "v%VERSION%",
-        "version": "1.3.2"
-    },
-    "zstd": {
-        "find_args": "MODULE",
-        "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029",
-        "min_version": "1.5",
-        "options": [
-            "ZSTD_BUILD_SHARED OFF"
-        ],
-        "repo": "facebook/zstd",
-        "sha": "b8d6101fba",
-        "source_subdir": "build/cmake",
-        "version": "1.5.7"
+        ]
     }
 }

docs/CPMUtil.md

@@ -1,320 +0,0 @@
-# CPMUtil
-
-CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful utility functions to make dependency management a piece of cake.
-
-- [CPMUtil](#cpmutil)
-  - [Global Options](#global-options)
-  - [About](#about)
-  - [Common Properties](#common-properties)
-  - [Standard Packages](#standard-packages)
-    - [Versioning](#versioning)
-    - [Patches](#patches)
-  - [Pre-built CI Packages](#pre-built-ci-packages)
-  - [Usage](#usage)
-  - [Addendum: Cache Storage](#addendum-cache-storage)
-  - [Addendum: Making Patches](#addendum-making-patches)
-  - [Addendum: Package Identification Lists](#addendum-package-identification-lists)
-  - [Addendum: Notes for Packagers](#addendum-notes-for-packagers)
-    - [Network Sandbox](#network-sandbox)
-    - [Unsandboxed](#unsandboxed)
-  - [Addendum: Dependent Packages](#addendum-dependent-packages)
-    - [Example: Vulkan](#example-vulkan)
-  - [Addendum: Module Path Packages](#addendum-module-path-packages)
-    - [Example: OpenSSL](#example-openssl)
-  - [Addendum: Adding Qt](#addendum-adding-qt)
-
-## Global Options
-
-- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
-  - You may optionally override this (section)
-- `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
-- `CPMUTIL_PATCH_DIR` (default `${PROJECT_SOURCE_DIR}/.patch`): Path to patches used in packages. Stored as `<PATCH DIR>/json-package-name/0001-patch-name.patch`, etc.
-- `CPM_SOURCE_CACHE` (default `${PROJECT_SOURCE_DIR}/.cache/cpm`): Where downloaded dependencies get stored.
-
-## About
-
-CPMUtil works by defining dependencies in a JSON file, `cpmfile.json`, and calling `AddJsonPackage`. These dependencies generally must define, at minimum:
-
-- The repository and Git host
-- A release artifact, commit, or tag archive to download
-- A SHA512 sum for the downloaded artifact
-
-And may optionally define other properties like:
-
-- The minimum version for system packages
-- The package name used for system packages (this defaults to the json key if undefined)
-- In-tree source patches
-- Options passed to CMake
-- Options passed to find_package
-
-For instance:
-
-```json
-"fmt": {
-    "repo": "fmtlib/fmt",
-    "tag": "12.1.0",
-    "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
-    "min_version": "8",
-    "options": [
-      "FMT_TEST ON"
-    ],
-    "patches": [
-      "0001-disable-reference-copy.patch"
-    ]
-}
-```
-
-Calling `AddJsonPackage(fmt)`:
-
-- Searches for a system package named `fmt` of version 8 or higher
-- If found, uses the system package and caches it for future use
-- If not found:
-  - Downloads fmt 12.1.0 from the GitHub Archive into `.cache/cpm/fmt/12.1.0`
-  - Verifies the hash
-  - Applies the `0001-disable-reference-copy.patch` patch to the source tree
-  - Sets `FMT_TEST` to `ON`
-  - Adds the downloaded directory to CMake
-  - Now, future `find_package(fmt)` calls will use the downloaded package
-
-There are two types of packages CPMUtil can define: standard and prebuilt CI packages. Some properties are common to both types, however.
-
-## Common Properties
-
-These JSON properties are used by standard and CI packages alike.
-
-- `package`: The package name used by `find_package` to check for the existence of a system package.
-  - If unset, defaults to the JSON key
-- `repo`: The Git repository the package is stored in, if applicable.
-- `version`: The version of the package to download. This is required.
-- `min_version`: The minimum required version of the package, if a system package is desired.
-- `git_host`: The Git host the package is stored in, if applicable. Defaults to `github.com`.
-
-## Standard Packages
-
-Normal packages, like the prior `fmt` example, *must* also define:
-
-- `hash`: The SHA512 hash of the downloaded artifact. CPMUtil generally computes this for you.
-- A valid version/URL identifier:
-  - `url`: Download from a raw URL.
-  - `sha`: A short or fully-qualified Git commit sha. CPMUtil recommends using 10-character wide shas.
-  - `tag`: A Git tag. See [Versioning](#versioning) for its relation to `version`.
-  - `artifact`: A GitHub/Forgejo/Gitea release artifact (requires `tag`). See [Versioning](#versioning) for its relation to `tag` and `version`.
-
-The following are optional to define:
-
-- `source_subdir`: A subdirectory containing the `CMakeLists.txt` to configure a project. Useful for projects like `zstd`.
-- `bundled`: Force the usage of a bundled package. Useful for packages where the system package is broken or nonexistent; e.g. including external fragment shaders.
-- `find_args`: Additional arguments passed to `find_package`, e.g. `MODULE`
-- `patches`: Array of in-tree patches to apply to the downloaded source code. See [#Patches](TODO).
-- `options`: Array of CMake options to apply before configuring the package, e.g. `"FMT_TEST ON"`.
-
-### Versioning
-
-When using tags or artifacts, it may be cumbersome to repeat the version multiple times; especially if it's constantly changing. For this purpose, `tag` and `artifact` both support basic version text replacement.
-
-`tag` can use `%VERSION%` to have its version replaced with the `version` defined for the package, e.g. for OpenSSL; when downloading, `tag` will evaluate to `openssl-3.6.2`:
-
-```json
-"openssl": {
-    "repo": "openssl/openssl",
-    "version": "3.6.2",
-    "tag": "openssl-%VERSION%"
-}
-```
-
-`artifact` also supports `%VERSION%` replacement, and can also use `%TAG%` to be replaced by the computed tag. Take this Boost definition:
-
-```json
-"boost": {
-    "repo": "boostorg/boost",
-    "tag": "boost-%VERSION%",
-    "version": "1.90.0"
-}
-```
-
-Boost's artifact for this version is stored in `boost-1.90.0-cmake.tar.xz`. Notice that the computed tag,`boost-1.90.0`, is in the name of the artifact! Thus, `artifact` can be either:
-
-- `boost-%VERSION%-cmake.tar.xz`
-- Or, even simpler: `%TAG%-cmake.tar.xz`
-
-Future updates need only change the `version` identifier, and the artifact and tag will automatically be updated!
-
-### Patches
-
-CPMUtil is able to apply in-place source tree patches to downloaded packages. These are defined in JSON as an array of names, preferably using `git-format-patch`'s scheme of `<4 digit number>-patch-name.patch`. These are stored in `<CPMUTIL_PATCH_DIR>/<json-key>` (remember that `CPMUTIL_PATCH_DIR` defaults to `$ROOT/.patch`); e.g. `boost` patches would be in `.patch/boost`. Let's say we've made three patches and want to add them; in the Boost JSON definition, we would add:
-
-```json
-"patches": [
-  "0001-fix-clang-cl-compilation.patch",
-  "0002-fix-msvc-arm64-compilation.patch",
-  "0003-fix-bsd-linking.patch"
-]
-```
-
-Then, when Boost is downloaded, it will apply these patches in order to the source tree.
-
-To learn how to make patches, see [Addendum: Making Patches](#addendum-making-patches).
-
-## Pre-built CI Packages
-
-The definition and usage of CI packages is subject to change in the very near future.
-
-CI packages are, in essence, prebuilt binary distributions for libraries. They exist for a few reasons:
-
-- Creating static libraries for system packages that normally lack them, e.g. Qt/SDL
-- Reducing duplicated compilation effort on rarely-changing externals, e.g. SDL
-- Creating debloated prebuilt packages specifically for your project to reduce binary size, e.g. FFmpeg
-
-CPMUtil is specifically designed to work with a small subset of prebuilt CI packages; namely, those that follow the format of the [crueter-ci spec](https://github.com/crueter-ci/spec/blob/master/README.md).
-
-To use them, you must add `ci: true` to your package definition. Alongside the common properties, CI packages define the following:
-
-- `name`: The artifacts' name prefix (required), e.g. `openssl`
-- `extension`: The artifacts' extension (default `tar.zst`)
-- `disabled_platforms`: CPMUtil-supported platforms that are not built into this repository.
-  - This is subject to change.
-
-**Note that `package` is subject to removal here.**
-
-Example:
-
-```json
-"sdl2": {
-    "repo": "crueter-ci/SDL2",
-    "package": "SDL2",
-    "min_version": "2.26.4",
-    "ci": true,
-    "version": "2.32.10-a65111bd2d",
-    "artifact": "SDL2"
-},
-```
-
-## Usage
-
-Once you've defined your package in `cpmfile.json`, simply call `AddJsonPackage(<JSON key>)` and go from there! Specific instructions differ between individual packages, so you're on your own from here.
-
-If you're only concerned with basic usage, you can stop reading. For more advanced use cases and package management, read these addenda.
-
-## Addendum: Cache Storage
-
-CPMUtil stores downloaded packages within `.cache/cpm` by default (see `CPM_SOURCE_CACHE`). Subdirectories stored within are lowercase representations of the `find_package` name for the package; for instance, a `vulkan-headers` definition with `package: "VulkanHeaders"` would be stored in `.cache/cpm/vulkanheaders`.
-
-Within these subdirectories, additional directories are created for each individual version:
-
-- A four-character shorthand of `sha`, if defined
-- If `sha` is not defined, the fully qualified `version` is used
-
-CI packages use `<platform>-<architecture>-<version>` unconditionally.
-
-## Addendum: Making Patches
-
-CPMUtil has a dedicated command for making patches. You're recommended to have Git and a command line editor installed, but CPMUtil is able to work without either. To do so, follow these steps, noting your package's JSON key:
-
-- Clean-fetch your package: `tools/cpmutil.sh package reset <package>`
-- Make any necessary modifications to the package source.
-  - You can access the package source directory via `tools/cpmutil.sh package dir <package>`.
-- Create the patch: `tools/cpmutil.sh package patch <package>`
-  - Follow the on-screen prompts. If you have Git installed, an editor will be opened so you can type your commit message. If not, just type a one-line description.
-
-And you're done! CPMUtil will automatically create and name the patch, and add it to the list of patches in the JSON definition.
-
-## Addendum: Package Identification Lists
-
-CPMUtil will create three lists of dependencies where `AddPackage` or similar was used. Each is in order of addition.
-
-- `CPM_PACKAGE_NAMES`: The names of packages included by CPMUtil
-- `CPM_PACKAGE_URLS`: The URLs to project/repo pages of packages
-- `CPM_PACKAGE_SHAS`: Short version identifiers for each package
-  - If the package was included as a system package, `(system)` is appended thereafter
-  - Packages whose versions can't be deduced will be left as `unknown`.
-
-For an example of how this might be implemented in an application, see Eden's implementation:
-
-- [`dep_hashes.h.in`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/dep_hashes.h.in)
-- [`GenerateDepHashes.cmake`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CMakeModules/GenerateDepHashes.cmake)
-- [`deps_dialog.cpp`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/yuzu/deps_dialog.cpp)
-
-## Addendum: Notes for Packagers
-
-If you are packaging a project that uses CPMUtil, read this!
-
-### Network Sandbox
-
-For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!
-
-Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)
-
-### Unsandboxed
-
-For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. See [`eden-git`](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=eden-git) for an example.
-
-## Addendum: Dependent Packages
-
-Consider the following scenario: the Vulkan Headers and Vulkan Utility libraries are both pulled in by my project. In order for both to compile cleanly, their versions *must* match. However, a user may have the Vulkan Headers installed, but *not* the Vulkan Utility Libraries! This can cause a version mismatch where the Utility Libraries expect a much newer version of the Vulkan Headers than the user has installed.
-
-To solve this, CPMUtil has an `AddDependentPackages` command. This takes a list of JSON package keys that *must* either ALL be installed to the system, or ALL be bundled.
-
-### Example: Vulkan
-
-Using the prior Vulkan example:
-
-```json
-"vulkan-headers": {
-    "repo": "KhronosGroup/Vulkan-Headers",
-    "package": "VulkanHeaders",
-    "min_version": "1.4.317",
-    "version": "1.4.342",
-    "tag": "v%VERSION%"
-},
-"vulkan-utility-libraries": {
-    "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-    "package": "VulkanUtilityLibraries",
-    "version": "1.4.342",
-    "tag": "v%VERSION%"
-}
-```
-
-In CMake:
-
-```cmake
-AddDependentPackages(vulkan-headers vulkan-utility-libraries)
-```
-
-Possible scenarios:
-
-- The user has both Vulkan Headers and Vulkan Utility Libraries installed to the system, and both are new enough.
-  - Configuration proceeds without issue.
-- The user has neither installed, or has a too-old version of Vulkan Headers installed
-  - Configuration proceeds without issue.
-- The user has a valid Vulkan Headers installed, but not Vulkan Utility Libraries.
-  - CPMUtil instructs the user to either force bundled Vulkan Headers, or install Vulkan Utility Libraries.
-- The user has both installed, but Vulkan Headers are too old.
-  - CPMUtil instructs the user to install a valid version of Vulkan Headers, or force bundled Vulkan Utility Libraries.
-
-## Addendum: Module Path Packages
-
-Sometimes, a prebuilt CI package may be packed in such a way that it's meant to be used in the context of a system install (e.g. pkgconfig or CMakeConfig files). In this case, CPMUtil normally will be unable to configure the downloaded subdirectory. To solve this, you can use `AddJsonPackage`'s `MODULE_PATH` mode, which adds the downloaded source directory to the `CMAKE_MODULE_PATH`.
-
-### Example: OpenSSL
-
-Say an OpenSSL CI package is packed to contain its CMake config files rather than a root `CMakeLists.txt`; in this case, you would call:
-
-```cmake
-AddJsonPackage(NAME openssl MODULE_PATH)
-```
-
-The `NAME` argument is also required, as the parsing is different from the standard single-argument function signature.
-
-From here, calling `find_package(OpenSSL)` will use the bundled OpenSSL.
-
-## Addendum: Adding Qt
-
-If you'd like to use customized Qt builds, CPMUtil provides a convenience function that allows you to add Qt builds. This usage and setup is subject to change.
-
-See [crueter-ci/Qt](https://github.com/crueter-ci/Qt) for an example of how one might build customized Qt. To add a Qt build to your project, use `AddQt(<repository> <version>)`, e.g.:
-
-```cmake
-AddQt(QDash-CI/Qt 6.11.1)
-```
-
-Then, call `find_package(Qt6 ...)` and it will pull Qt from your downloaded source.

docs/CPMUtil/AddCIPackage.md

@@ -0,0 +1,21 @@
+# AddPackage
+
+- `VERSION` (required): The version to get (the tag will be `v${VERSION}`)
+- `NAME` (required): Name used within the artifacts
+- `REPO` (required): CI repository, e.g. `crueter-ci/OpenSSL`
+- `PACKAGE` (required): `find_package` package name
+- `EXTENSION`: Artifact extension (default `tar.zst`)
+- `MIN_VERSION`: Minimum version for `find_package`. Only used if platform does not support this package as a bundled artifact
+- `DISABLED_PLATFORMS`: List of platforms that lack artifacts for this package. Options:
+  - `windows-amd64`
+  - `windows-arm64`
+  - `mingw-amd64`
+  - `mingw-arm64`
+  - `android-x86_64`
+  - `android-aarch64`
+  - `solaris-amd64`
+  - `freebsd-amd64`
+  - `linux-amd64`
+  - `linux-aarch64`
+  - `macos-universal`
+  - `ios-aarch64`

docs/CPMUtil/AddDependentPackage.md

@@ -0,0 +1,41 @@
+# AddDependentPackage
+
+Use `AddDependentPackage` when you have multiple packages that are required to all be from the system, OR bundled. This is useful in cases where e.g. versions must absolutely match.
+
+## Versioning
+
+Versioning must be handled by the package itself.
+
+## Examples
+
+### Vulkan
+
+`cpmfile.json`
+
+```json
+{
+    "vulkan-headers": {
+        "repo": "KhronosGroup/Vulkan-Headers",
+        "package": "VulkanHeaders",
+        "version": "1.4.317",
+        "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272",
+        "git_version": "1.4.342",
+        "tag": "v%VERSION%"
+    },
+    "vulkan-utility-libraries": {
+        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
+        "package": "VulkanUtilityLibraries",
+        "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14",
+        "git_version": "1.4.342",
+        "tag": "v%VERSION%"
+    }
+}
+```
+
+`CMakeLists.txt`:
+
+```cmake
+AddDependentPackages(vulkan-headers vulkan-utility-libraries)
+```
+
+If Vulkan Headers are installed, but NOT Vulkan Utility Libraries, then CPMUtil will throw an error.

docs/CPMUtil/AddJsonPackage.md

@@ -0,0 +1,105 @@
+# AddJsonPackage
+
+In each directory that utilizes `CPMUtil`, there must be a `cpmfile.json` that defines dependencies in a similar manner to the individual calls.
+
+The cpmfile is an object of objects, with each sub-object being named according to the package's identifier, e.g. `openssl`, which can then be fetched with `AddJsonPackage(<identifier>)`. Options are designed to map closely to the argument names, and are always strings unless otherwise specified.
+<!-- TOC -->
+- [Options](#options)
+- [Examples](#examples)
+<!-- /TOC -->
+
+## Options
+
+- `package` -> `NAME` (`PACKAGE` for CI), defaults to the object key
+- `repo` -> `REPO`
+- `version` -> `VERSION`
+- `ci` (bool)
+
+If `ci` is `false`:
+
+- `hash` -> `HASH`
+- `hash_suffix` -> `HASH_SUFFIX`
+- `sha` -> `SHA`
+- `key` -> `KEY`
+- `tag` -> `TAG`
+  - If the tag contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+- `url` -> `URL`
+- `artifact` -> `ARTIFACT`
+  - If the artifact contains `%VERSION%`, that part will be replaced by the `git_version`, OR `version` if `git_version` is not specified
+  - If the artifact contains `%TAG%`, that part will be replaced by the `tag` (with its replacement already done)
+- `git_version` -> `GIT_VERSION`
+- `git_host` -> `GIT_HOST`
+- `source_subdir` -> `SOURCE_SUBDIR`
+- `bundled` -> `BUNDLED_PACKAGE`
+- `find_args` -> `FIND_PACKAGE_ARGUMENTS`
+- `download_only` -> `DOWNLOAD_ONLY`
+- `patches` -> `PATCHES` (array)
+- `options` -> `OPTIONS` (array)
+- `skip_updates`: Tells `check-updates.sh` to not check for new updates on this package.
+
+Other arguments aren't currently supported. If you wish to add them, see the `AddJsonPackage` function in `CMakeModules/CPMUtil.cmake`.
+
+If `ci` is `true`:
+
+- `name` -> `NAME`, defaults to the object key
+- `extension` -> `EXTENSION`, defaults to `tar.zst`
+- `min_version` -> `MIN_VERSION`
+- `extension` -> `EXTENSION`
+- `disabled_platforms` -> `DISABLED_PLATFORMS` (array)
+
+## Examples
+
+In order: OpenSSL CI, Boost (tag + artifact), Opus (options + find_args), discord-rpc (sha + options + patches).
+
+```json
+{
+    "openssl": {
+        "ci": true,
+        "package": "OpenSSL",
+        "name": "openssl",
+        "repo": "crueter-ci/OpenSSL",
+        "version": "3.6.0",
+        "min_version": "1.1.1",
+        "disabled_platforms": [
+            "macos-universal",
+            "ios-aarch64"
+        ]
+    },
+    "boost": {
+        "package": "Boost",
+        "repo": "boostorg/boost",
+        "tag": "boost-%VERSION%",
+        "artifact": "%TAG%-cmake.7z",
+        "hash": "e5b049e5b61964480ca816395f63f95621e66cb9bcf616a8b10e441e0e69f129e22443acb11e77bc1e8170f8e4171b9b7719891efc43699782bfcd4b3a365f01",
+        "git_version": "1.88.0",
+        "version": "1.57"
+    },
+    "opus": {
+        "package": "Opus",
+        "repo": "xiph/opus",
+        "sha": "5ded705cf4",
+        "hash": "0dc89e58ddda1f3bc6a7037963994770c5806c10e66f5cc55c59286fc76d0544fe4eca7626772b888fd719f434bc8a92f792bdb350c807968b2ac14cfc04b203",
+        "version": "1.3",
+        "find_args": "MODULE",
+        "options": [
+            "OPUS_BUILD_TESTING OFF",
+            "OPUS_BUILD_PROGRAMS OFF",
+            "OPUS_INSTALL_PKG_CONFIG_MODULE OFF",
+            "OPUS_INSTALL_CMAKE_CONFIG_MODULE OFF"
+        ]
+    },
+    "discord-rpc": {
+        "repo": "discord/discord-rpc",
+        "sha": "963aa9f3e5",
+        "hash": "386e1344e9a666d730f2d335ee3aef1fd05b1039febefd51aa751b705009cc764411397f3ca08dffd46205c72f75b235c870c737b2091a4ed0c3b061f5919bde",
+        "options": [
+            "BUILD_EXAMPLES OFF"
+        ],
+        "patches": [
+            "0001-cmake-version.patch",
+            "0002-no-clang-format.patch",
+            "0003-fix-cpp17.patch"
+        ]
+    }
+}
+```

docs/CPMUtil/AddPackage.md

@@ -0,0 +1,118 @@
+# `AddPackage`
+
+<!-- TOC -->
+- [Identification/Fetching](#identificationfetching)
+- [Hashing](#hashing)
+- [Other Options](#other-options)
+- [Extra Variables](#extra-variables)
+- [System/Bundled Packages](#systembundled-packages)
+- [Identification](#identification)
+<!-- /TOC -->
+
+## Identification/Fetching
+
+- `NAME` (required): The package name (must be the same as the `find_package` name if applicable)
+- `VERSION`: The minimum version of this package that can be used on the system
+- `GIT_VERSION`: The "version" found within git
+- `URL`: The URL to fetch.
+- `REPO`: The repo to use (`owner/repo`).
+- `GIT_HOST`: The Git host to use
+  - Defaults to `github.com`. Do not include the protocol, as HTTPS is enforced.
+- `TAG`: The tag to fetch, if applicable.
+- `ARTIFACT`: The name of the artifact, if applicable.
+- `SHA`: Commit sha to fetch, if applicable.
+- `BRANCH`: Branch to fetch, if applicable.
+
+The following configurations are supported, in descending order of precedence:
+
+- `URL`: Bare URL download, useful for custom artifacts
+  - If this is set, `GIT_URL` or `REPO` should be set to allow the dependency viewer to link to the project's Git repository.
+  - If this is NOT set, `REPO` must be defined.
+- `REPO + TAG + ARTIFACT`: GitHub release artifact
+  - The final download URL will be `https://github.com/${REPO}/releases/download/${TAG}/${ARTIFACT}`
+  - Useful for prebuilt libraries and prefetched archives
+- `REPO + TAG`: GitHub tag archive
+  - The final download URL will be `https://github.com/${REPO}/archive/refs/tags/${TAG}.tar.gz`
+  - Useful for pinning to a specific tag, better for build identification
+- `REPO + SHA`: GitHub commit archive
+  - The final download URL will be `https://github.com/${REPO}/archive/${SHA}.zip`
+  - Useful for pinning to a specific commit
+- `REPO + BRANCH`: GitHub branch archive
+  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/${BRANCH}.zip`
+  - Generally not recommended unless the branch is frozen
+- `REPO`: GitHub master archive
+  - The final download URL will be `https://github.com/${REPO}/archive/refs/heads/master.zip`
+  - Generally not recommended unless the project is dead
+
+## Hashing
+
+Hashing is used for verifying downloads. It's highly recommended to use these.
+
+- `HASH_ALGO` (default `SHA512`): Hash algorithm to use
+
+Hashing strategies, descending order of precedence:
+
+- `HASH`: Bare hash verification, useful for static downloads e.g. commit archives
+- `HASH_SUFFIX`: Download the hash as `${DOWNLOAD_URL}.${HASH_SUFFIX}`
+  - The downloaded hash *must* match the hash algorithm and contain nothing but the hash; no filenames or extra content.
+- `HASH_URL`: Download the hash from a separate URL
+
+## Other Options
+
+- `KEY`: Custom cache key to use (stored as `.cache/cpm/${packagename_lower}/${key}`)
+  - Default is based on, in descending order of precedence:
+    - First 4 characters of the sha
+    - `GIT_VERSION`
+    - Tag
+    - `VERSION`
+    - Otherwise, CPM defaults will be used. This is not recommended as it doesn't produce reproducible caches
+- `DOWNLOAD_ONLY`: Whether or not to configure the downloaded package via CMake
+  - Useful to turn `OFF` if the project doesn't use CMake
+- `SOURCE_SUBDIR`: Subdirectory of the project containing a CMakeLists.txt file
+- `FIND_PACKAGE_ARGUMENTS`: Arguments to pass to the `find_package` call
+- `BUNDLED_PACKAGE`: Set to `ON` to default to the bundled package
+- `FORCE_BUNDLED_PACKAGE`: Set to `ON` to force the usage of the bundled package, regardless of CPMUTIL_FORCE_SYSTEM or `<package>_FORCE_SYSTEM`
+- `OPTIONS`: Options to pass to the configuration of the package
+- `PATCHES`: Patches to apply to the package, stored in `.patch/${packagename_lower}/0001-patch-name.patch` and so on
+- Other arguments can be passed to CPM as well
+
+## Extra Variables
+
+For each added package, users may additionally force usage of the system/bundled package.
+
+- `${package}_DIR`: Path to a separately-downloaded copy of the package. Note that versioning is not checked!
+- `${package}_FORCE_SYSTEM`: Require the package to be installed on the system
+- `${package}_FORCE_BUNDLED`: Force the package to be fetched and use the bundled version
+
+## System/Bundled Packages
+
+Descending order of precedence:
+
+- If `${package}_FORCE_SYSTEM` is true, requires the package to be on the system
+- If `${package}_FORCE_BUNDLED` is true, forcefully uses the bundled package
+- If `CPMUTIL_FORCE_SYSTEM` is true, requires the package to be on the system
+- If `CPMUTIL_FORCE_BUNDLED` is true, forcefully uses the bundled package
+- If the `BUNDLED_PACKAGE` argument is true, forcefully uses the bundled package
+- Otherwise, CPM will search for the package first, and if not found, will use the bundled package
+
+## Identification
+
+All dependencies must be identifiable in some way for usage in the dependency viewer. Lists are provided in descending order of precedence.
+
+URLs:
+
+- `GIT_URL`
+- `REPO` as a Git repository
+  - You may optionally specify `GIT_HOST` to use a custom host, e.g. `GIT_HOST git.crueter.xyz`. Note that the git host MUST be GitHub-like in its artifact/archive downloads, e.g. Forgejo
+  - If `GIT_HOST` is unspecified, defaults to `github.com`
+- `URL`
+
+Versions (bundled):
+
+- `SHA`
+- `GIT_VERSION`
+- `VERSION`
+- `TAG`
+- "unknown"
+
+If the package is a system package, AddPackage will attempt to determine the package version and append `(system)` to the identifier. Otherwise, it will be marked as `unknown (system)`

docs/CPMUtil/AddQt.md

@@ -0,0 +1,28 @@
+# AddQt
+
+Simply call `AddQt(<Qt Version>)` before any Qt `find_package` calls and everything will be set up for you. On Linux, the bundled Qt library is built as a shared library, and provided you have OpenSSL and X11, everything should just work.
+
+On Windows, MinGW, and MacOS, Qt is bundled as a static library. No further action is needed, as the provided libraries automatically integrate the Windows/Cocoa plugins, alongside the corresponding Multimedia and Network plugins.
+
+## Modules
+
+The following modules are bundled into these Qt builds:
+
+- Base (Gui, Core, Widgets, Network)
+- Multimedia
+- Declarative (Quick, QML)
+- Linux: Wayland client
+
+Each platform has the corresponding QPA built in and set as the default as well. This means you don't need to add `Q_IMPORT_PLUGIN`!
+
+## Example
+
+See an example in the [`tests/qt`](https://git.crueter.xyz/CMake/CPMUtil/src/branch/master/tests/qt/CMakeLists.txt) directory.
+
+## Versions
+
+The following versions have available builds:
+
+- 6.9.3
+
+See [`crueter-ci/Qt`](https://github.com/crueter-ci/Qt) for an updated list at any time.

docs/CPMUtil/README.md

@@ -0,0 +1,70 @@
+# CPMUtil
+
+CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful utility functions to make dependency management a piece of cake.
+
+Global Options:
+
+- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
+  - You may optionally override this (section)
+- `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
+
+You are highly encouraged to read AddPackage first, even if you plan to only interact with CPMUtil via `AddJsonPackage`.
+
+- [AddPackage](#addpackage)
+- [AddCIPackage](#addcipackage)
+- [AddJsonPackage](#addjsonpackage)
+- [AddQt](#addqt)
+- [Lists](#lists)
+- [For Packagers](#for-packagers)
+  - [Network Sandbox](#network-sandbox)
+  - [Unsandboxed](#unsandboxed)
+
+## AddPackage
+
+The core of CPMUtil is the [`AddPackage`](./AddPackage.md) function. [`AddPackage`](./AddPackage.md) itself is fully CMake-based, and largely serves as an interface between CPM and the rest of CPMUtil.
+
+## AddCIPackage
+
+[`AddCIPackage`](./AddCIPackage.md) adds a package that follows [crueter's CI repository spec](https://github.com/crueter-ci).
+
+## AddJsonPackage
+
+[`AddJsonPackage`](./AddJsonPackage.md) is the recommended method of usage for CPMUtil.
+
+## AddDependentPackage
+
+[`AddDependentPackage`](./AddDependentPackage.md) allows you to add multiple packages such that all of them must be from the system OR bundled.
+
+## AddQt
+
+[`AddQt`](./AddQt.md) adds a specific version of Qt to your project.
+
+## Lists
+
+CPMUtil will create three lists of dependencies where `AddPackage` or similar was used. Each is in order of addition.
+
+- `CPM_PACKAGE_NAMES`: The names of packages included by CPMUtil
+- `CPM_PACKAGE_URLS`: The URLs to project/repo pages of packages
+- `CPM_PACKAGE_SHAS`: Short version identifiers for each package
+  - If the package was included as a system package, `(system)` is appended thereafter
+  - Packages whose versions can't be deduced will be left as `unknown`.
+
+For an example of how this might be implemented in an application, see Eden's implementation:
+
+- [`dep_hashes.h.in`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/dep_hashes.h.in)
+- [`GenerateDepHashes.cmake`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CMakeModules/GenerateDepHashes.cmake)
+- [`deps_dialog.cpp`](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/src/yuzu/deps_dialog.cpp)
+
+## For Packagers
+
+If you are packaging a project that uses CPMUtil, read this!
+
+### Network Sandbox
+
+For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!
+
+Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)
+
+### Unsandboxed
+
+For others (AUR, MPR, etc). CPMUtil will handle everything for you, including if some of the project's dependencies are missing from your distribution's repositories. That is pretty much half the reason I created this behemoth, after all.

externals/CMakeLists.txt

@@ -6,7 +6,8 @@
 
 # TODO(crueter): A lot of this should be moved to the root.
 # otherwise we have to do weird shenanigans with library linking and stuff
-# Or just add a CPMUtil thing to propagate packages
+
+include(CPMUtil)
 
 # Explicitly declare this option here to propagate to the oaknut CPM call
 option(DYNARMIC_TESTS "Build tests" ${BUILD_TESTING})

externals/cpmfile.json

@@ -0,0 +1,249 @@
+{
+    "vulkan-memory-allocator": {
+        "package": "VulkanMemoryAllocator",
+        "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
+        "tag": "v%VERSION%",
+        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
+        "find_args": "CONFIG",
+        "git_version": "3.3.0"
+    },
+    "sirit": {
+        "repo": "eden-emulator/sirit",
+        "git_version": "1.0.5",
+        "tag": "v%VERSION%",
+        "artifact": "sirit-source-%VERSION%.tar.zst",
+        "hash_suffix": "sha512sum",
+        "find_args": "CONFIG",
+        "options": [
+            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
+        ]
+    },
+    "sirit-ci": {
+        "ci": true,
+        "package": "sirit",
+        "name": "sirit",
+        "repo": "eden-emulator/sirit",
+        "version": "1.0.5"
+    },
+    "httplib": {
+        "repo": "yhirose/cpp-httplib",
+        "tag": "v%VERSION%",
+        "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9",
+        "git_version": "0.46.0",
+        "find_args": "MODULE GLOBAL",
+        "patches": [
+            "0001-mingw.patch"
+        ],
+        "options": [
+            "HTTPLIB_REQUIRE_OPENSSL ON",
+            "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON"
+        ]
+    },
+    "cpp-jwt": {
+        "version": "1.4",
+        "repo": "arun11299/cpp-jwt",
+        "sha": "7f24eb4c32",
+        "hash": "d11cbd5ddb3197b4c5ca15679bcd76a49963e7b530b7dd132db91e042925efa20dfb2c24ccfbe7ef82a7012af80deff0f72ee25851312ae80381a462df8534b8",
+        "find_args": "CONFIG",
+        "options": [
+            "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF"
+        ],
+        "patches": [
+            "0001-fix-missing-decl.patch"
+        ]
+    },
+    "xbyak": {
+        "package": "xbyak",
+        "repo": "herumi/xbyak",
+        "tag": "v%VERSION%",
+        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
+        "git_version": "7.35.2"
+    },
+    "oaknut": {
+        "repo": "eden-emulator/oaknut",
+        "version": "2.0.1",
+        "git_version": "2.0.3",
+        "tag": "v%VERSION%",
+        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856"
+    },
+    "lagoon": {
+        "repo": "loongson-community/lagoon",
+        "tag": "%VERSION%",
+        "version": "1.0.0",
+        "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e"
+    },
+    "libadrenotools": {
+        "repo": "eden-emulator/libadrenotools",
+        "sha": "8ba23b42d7",
+        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
+        "patches": [
+            "0001-linkerns-cpm.patch"
+        ]
+    },
+    "oboe": {
+        "repo": "google/oboe",
+        "tag": "%VERSION%",
+        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
+        "git_version": "1.10.0",
+        "bundled": true
+    },
+    "unordered-dense": {
+        "package": "unordered_dense",
+        "repo": "martinus/unordered_dense",
+        "sha": "7b55cab841",
+        "hash": "d2106f6640f6bfb81755e4b8bfb64982e46ec4a507cacdb38f940123212ccf35a20b43c70c6f01d7bfb8c246d1a16f7845d8052971949cea9def1475e3fa02c8",
+        "find_args": "CONFIG",
+        "bundled": true,
+        "patches": [
+            "0001-avoid-memset-when-clearing-an-empty-table.patch"
+        ]
+    },
+    "enet": {
+        "repo": "lsalzman/enet",
+        "tag": "v%VERSION%",
+        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
+        "version": "1.3",
+        "git_version": "1.3.18",
+        "find_args": "MODULE"
+    },
+    "spirv-headers": {
+        "package": "SPIRV-Headers",
+        "repo": "KhronosGroup/SPIRV-Headers",
+        "sha": "04f10f650d",
+        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
+        "options": [
+            "SPIRV_WERROR OFF"
+        ]
+    },
+    "cubeb": {
+        "repo": "mozilla/cubeb",
+        "sha": "fa02160712",
+        "hash": "8a4bcb2f83ba590f52c66626e895304a73eb61928dbc57777e1822e55378e3568366f17f9da4b80036cc2ef4ea9723c32abf6e7d9bbe00fb03654f0991596ab0",
+        "find_args": "CONFIG",
+        "options": [
+            "USE_SANITIZERS OFF",
+            "BUILD_TESTS OFF",
+            "BUILD_TOOLS OFF",
+            "BUNDLE_SPEEX ON"
+        ]
+    },
+    "sdl3-ci": {
+        "ci": true,
+        "package": "SDL3",
+        "name": "SDL3",
+        "repo": "crueter-ci/SDL3",
+        "version": "3.4.8-d57c3b685c",
+        "min_version": "3.2.10"
+    },
+    "catch2": {
+        "package": "Catch2",
+        "repo": "catchorg/Catch2",
+        "tag": "v%VERSION%",
+        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
+        "version": "3.0.1",
+        "git_version": "3.13.0",
+        "patches": [
+            "0001-solaris-isnan-fix.patch"
+        ]
+    },
+    "discord-rpc": {
+        "package": "DiscordRPC",
+        "repo": "eden-emulator/discord-rpc",
+        "sha": "0d8b2d6a37",
+        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
+        "find_args": "MODULE"
+    },
+    "simpleini": {
+        "package": "SimpleIni",
+        "repo": "brofield/simpleini",
+        "tag": "v%VERSION%",
+        "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
+        "find_args": "MODULE",
+        "git_version": "4.25"
+    },
+    "sdl3": {
+        "package": "SDL3",
+        "repo": "libsdl-org/SDL",
+        "tag": "release-%VERSION%",
+        "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
+        "git_version": "3.4.8",
+        "version": "3.2.10"
+    },
+    "moltenvk": {
+        "repo": "V380-Ori/Ryujinx.MoltenVK",
+        "tag": "v%VERSION%-ryujinx",
+        "git_version": "1.4.1",
+        "artifact": "MoltenVK-macOS.tar",
+        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
+        "bundled": true
+    },
+    "gamemode": {
+        "repo": "FeralInteractive/gamemode",
+        "sha": "ce6fe122f3",
+        "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
+        "version": "1.7",
+        "find_args": "MODULE"
+    },
+    "biscuit": {
+        "repo": "lioncash/biscuit",
+        "tag": "v%VERSION%",
+        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
+        "version": "0.9.1",
+        "git_version": "0.19.0"
+    },
+    "libusb": {
+        "repo": "libusb/libusb",
+        "tag": "v%VERSION%",
+        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
+        "find_args": "MODULE",
+        "git_version": "1.0.29",
+        "patches": [
+            "0001-netbsd-gettime.patch"
+        ]
+    },
+    "ffmpeg": {
+        "repo": "FFmpeg/FFmpeg",
+        "sha": "c7b5f1537d",
+        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
+        "bundled": true
+    },
+    "ffmpeg-ci": {
+        "ci": true,
+        "package": "FFmpeg",
+        "name": "ffmpeg",
+        "repo": "crueter-ci/FFmpeg",
+        "version": "8.0.1-c7b5f1537d",
+        "min_version": "4.1"
+    },
+    "tzdb": {
+        "package": "nx_tzdb",
+        "repo": "eden-emu/tzdb_to_nx",
+        "git_host": "git.eden-emu.dev",
+        "artifact": "%VERSION%.tar.gz",
+        "tag": "%VERSION%",
+        "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
+        "version": "121125",
+        "git_version": "230326"
+    },
+    "vulkan-headers": {
+        "repo": "KhronosGroup/Vulkan-Headers",
+        "package": "VulkanHeaders",
+        "version": "1.4.317",
+        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
+        "git_version": "1.4.345",
+        "tag": "v%VERSION%"
+    },
+    "vulkan-utility-libraries": {
+        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
+        "package": "VulkanUtilityLibraries",
+        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
+        "git_version": "1.4.345",
+        "tag": "v%VERSION%"
+    },
+    "frozen": {
+        "package": "frozen",
+        "repo": "serge-sans-paille/frozen",
+        "sha": "61dce5ae18",
+        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c"
+    }
+}

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -83,10 +83,9 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     ENABLE_OVERLAY("enable_overlay"),
 
     // GPU Logging
+    GPU_LOGGING_ENABLED("gpu_logging_enabled"),
     GPU_LOG_VULKAN_CALLS("gpu_log_vulkan_calls"),
     GPU_LOG_SHADER_DUMPS("gpu_log_shader_dumps"),
-    DUMP_GUEST_SHADERS("dump_guest_shaders"),
-    DUMP_MACROS("dump_macros"),
     GPU_LOG_MEMORY_TRACKING("gpu_log_memory_tracking"),
     GPU_LOG_DRIVER_DEBUG("gpu_log_driver_debug"),
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -931,6 +931,13 @@ abstract class SettingsItem(
             )
 
             // GPU Logging settings
+            put(
+                SwitchSetting(
+                    BooleanSetting.GPU_LOGGING_ENABLED,
+                    titleId = R.string.gpu_logging_enabled,
+                    descriptionId = R.string.gpu_logging_enabled_description
+                )
+            )
             put(
                 SingleChoiceSetting(
                     ByteSetting.GPU_LOG_LEVEL,
@@ -947,13 +954,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.gpu_log_vulkan_calls_description
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.DUMP_GUEST_SHADERS,
-                    titleId = R.string.dump_guest_shaders,
-                    descriptionId = R.string.dump_guest_shaders_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.GPU_LOG_SHADER_DUMPS,
@@ -961,13 +961,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.gpu_log_shader_dumps_description
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.DUMP_MACROS,
-                    titleId = R.string.dump_macros,
-                    descriptionId = R.string.dump_macros_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.GPU_LOG_MEMORY_TRACKING,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -1288,17 +1288,14 @@ class SettingsFragmentPresenter(
             add(ShortSetting.DEBUG_KNOBS.key)
             add(StringSetting.PROGRAM_ARGS.key)
 
-            if (!NativeConfig.isPerGameConfigLoaded()) {
-                add(HeaderSetting(R.string.gpu_logging_header))
-                add(ByteSetting.GPU_LOG_LEVEL.key)
-                add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key)
-                add(BooleanSetting.DUMP_GUEST_SHADERS.key)
-                add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
-                add(BooleanSetting.DUMP_MACROS.key)
-                add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
-                add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
-                add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
-            }
+            add(HeaderSetting(R.string.gpu_logging_header))
+            add(BooleanSetting.GPU_LOGGING_ENABLED.key)
+            add(ByteSetting.GPU_LOG_LEVEL.key)
+            add(BooleanSetting.GPU_LOG_VULKAN_CALLS.key)
+            add(BooleanSetting.GPU_LOG_SHADER_DUMPS.key)
+            add(BooleanSetting.GPU_LOG_MEMORY_TRACKING.key)
+            add(BooleanSetting.GPU_LOG_DRIVER_DEBUG.key)
+            add(IntSetting.GPU_LOG_RING_BUFFER_SIZE.key)
         }
     }
 

src/android/app/src/main/res/values-ar/strings.xml

@@ -569,6 +569,8 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">تسجيل وحدة معالجة الرسومات</string>
+    <string name="gpu_logging_enabled">تمكين تسجيل وحدة معالجة الرسومات</string>
+    <string name="gpu_logging_enabled_description">تسجيل عمليات وحدة معالجة الرسومات في ملف eden_gpu.log لتصحيح أخطاء برامج تشغيل Adreno</string>
     <string name="gpu_log_level">مستوى السجل</string>
     <string name="gpu_log_level_description">مستوى التفاصيل لسجلات وحدة معالجة الرسومات (كلما زاد المستوى، زادت التفاصيل وزادت التكاليف الإضافية)</string>
     <string name="gpu_log_vulkan_calls">تسجيل استدعاءات واجهة برمجة تطبيقات Vulkan</string>

src/android/app/src/main/res/values-es/strings.xml

@@ -563,6 +563,8 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">Registros de la GPU</string>
+    <string name="gpu_logging_enabled">Activar los registros de la GPU</string>
+    <string name="gpu_logging_enabled_description">Registra las operaciones de la GPU en eden_gpu.log para la depuración de los controladores de Adreno</string>
     <string name="gpu_log_level">Nivel de registros</string>
     <string name="gpu_log_level_description">Nivel de detalle de los registros de la GPU (más alto = más detalles, más sobrecarga)</string>
     <string name="gpu_log_vulkan_calls">Registros de llamadas del API de Vulkan</string>

src/android/app/src/main/res/values-fr/strings.xml

@@ -525,6 +525,7 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">Journalisation GPU</string>
+    <string name="gpu_logging_enabled">Activer la journalisation GPU</string>
     <string name="gpu_log_level">Niveau de journalisation</string>
     <string name="gpu_log_vulkan_calls">Journaliser les appels API Vulkan</string>
     <string name="gpu_log_shader_dumps">Extraire les shaders</string>

src/android/app/src/main/res/values-ru/strings.xml

@@ -562,6 +562,8 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">Ведение журнала ГПУ</string>
+    <string name="gpu_logging_enabled">Включить ведение журнала ГПУ</string>
+    <string name="gpu_logging_enabled_description">Записывать операции ГПУ в файл eden_gpu.log для отладки драйверов Adreno</string>
     <string name="gpu_log_level">Уровень журналирования</string>
     <string name="gpu_log_level_description">Уровень детализации логов ГПУ (больше значение = больше деталей, выше нагрузка)</string>
     <string name="gpu_log_vulkan_calls">Записывать вызовы Vulkan API</string>

src/android/app/src/main/res/values-uk/strings.xml

@@ -565,6 +565,8 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">Журналювання ГП</string>
+    <string name="gpu_logging_enabled">Увімкнути журналювання ГП</string>
+    <string name="gpu_logging_enabled_description">Журналювати операції ГП до eden_gpu.log для зневадження драйверів Adreno</string>
     <string name="gpu_log_level">Рівень журналювання</string>
     <string name="gpu_log_level_description">Рівень подробиць у журналі ГП (вищий = більше подробиць, більший вплив на швидкодію)</string>
     <string name="gpu_log_vulkan_calls">Записувати виклики API Vulkan</string>

src/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -248,7 +248,7 @@
     <string name="install_prod_keys">安装 prod.keys 文件</string>
     <string name="install_prod_keys_description">需要密钥文件来解密游戏</string>
     <string name="install_prod_keys_warning">跳过添加密钥文件？</string>
-    <string name="install_prod_keys_warning_description">模拟零售版游戏需要有效的密钥。如果选择继续，仅有自制软件可以正常运行。</string>
+    <string name="install_prod_keys_warning_description">对于商业游戏，需要有效的密钥文件才能运行。如果没有密钥文件，将只能运行自制软件。</string>
     <string name="install_prod_keys_warning_help">https://yuzu-mirror.github.io/help/quickstart/#guide-introduction</string>
     <string name="install_firmware_warning">跳过添加固件？</string>
     <string name="emulator_data">设置模拟器数据</string>
@@ -418,9 +418,6 @@
     <string name="cpu_accuracy">CPU 精度</string>
     <string name="value_with_units">%1$s%2$s</string>
 
-    <string name="program_args">自制软件参数</string>
-    <string name="program_args_description">启动时传递给自制软件的命令行参数（例如 -noglsl）。</string>
-
     <!-- System settings strings -->
     <string name="device_name">设备名称</string>
     <string name="use_docked_mode">主机模式</string>
@@ -559,6 +556,8 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">GPU 日志</string>
+    <string name="gpu_logging_enabled">启用 GPU 日志</string>
+    <string name="gpu_logging_enabled_description">将 GPU 操作记录至 eden_gpu.log 以供调试 Adreno 驱动</string>
     <string name="gpu_log_level">日志等级</string>
     <string name="gpu_log_level_description">GPU 日志的详细级别(数值越高 = 细节越多,开销越大)</string>
     <string name="gpu_log_vulkan_calls">记录 Vulkan API 调用</string>

src/android/app/src/main/res/values/strings.xml

@@ -575,16 +575,14 @@
 
     <!-- GPU Logging strings -->
     <string name="gpu_logging_header">GPU Logging</string>
+    <string name="gpu_logging_enabled">Enable GPU Logging</string>
+    <string name="gpu_logging_enabled_description">Log GPU operations to eden_gpu.log for debugging Adreno drivers</string>
     <string name="gpu_log_level">Log Level</string>
     <string name="gpu_log_level_description">Detail level for GPU logs (higher = more detail, more overhead)</string>
     <string name="gpu_log_vulkan_calls">Log Vulkan API Calls</string>
     <string name="gpu_log_vulkan_calls_description">Track all Vulkan API calls in ring buffer</string>
-    <string name="gpu_log_shader_dumps">Dump SPIR-V Shaders</string>
-    <string name="gpu_log_shader_dumps_description">Save recompiled SPIR-V binaries (.spv) to dump folder. Inspect with spirv-dis/spirv-cross/spirv-val.</string>
-    <string name="dump_guest_shaders">Dump Guest (Maxwell) Shaders</string>
-    <string name="dump_guest_shaders_description">Save Maxwell guest shader bytecode files (*.ash) to dump folder. Inspect with nvdisasm.</string>
-    <string name="dump_macros">Dump Maxwell Macros</string>
-    <string name="dump_macros_description">Save Maxwell macro program files (*.macro) to dump folder. Inspect with envydis.</string>
+    <string name="gpu_log_shader_dumps">Dump Shaders</string>
+    <string name="gpu_log_shader_dumps_description">Save compiled shader SPIR-V to files</string>
     <string name="gpu_log_memory_tracking">Track GPU Memory</string>
     <string name="gpu_log_memory_tracking_description">Monitor GPU memory allocations and deallocations</string>
     <string name="gpu_log_driver_debug">Driver Debug Info</string>

src/common/CMakeLists.txt

@@ -50,6 +50,7 @@ add_library(
     elf.h
     error.cpp
     error.h
+    expected.h
     fiber.cpp
     fiber.h
     fixed_point.h

src/common/expected.h

@@ -0,0 +1,986 @@
+// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This is based on the proposed implementation of std::expected (P0323)
+// https://github.com/TartanLlama/expected/blob/master/include/tl/expected.hpp
+
+#pragma once
+
+#include <type_traits>
+#include <utility>
+
+namespace Common {
+
+template <typename T, typename E>
+class Expected;
+
+template <typename E>
+class Unexpected {
+public:
+    Unexpected() = delete;
+
+    constexpr explicit Unexpected(const E& e) : m_val{e} {}
+
+    constexpr explicit Unexpected(E&& e) : m_val{std::move(e)} {}
+
+    constexpr E& value() & {
+        return m_val;
+    }
+
+    constexpr const E& value() const& {
+        return m_val;
+    }
+
+    constexpr E&& value() && {
+        return std::move(m_val);
+    }
+
+    constexpr const E&& value() const&& {
+        return std::move(m_val);
+    }
+
+private:
+    E m_val;
+};
+
+template <typename E>
+constexpr auto operator<=>(const Unexpected<E>& lhs, const Unexpected<E>& rhs) {
+    return lhs.value() <=> rhs.value();
+}
+
+struct unexpect_t {
+    constexpr explicit unexpect_t() = default;
+};
+
+namespace detail {
+
+struct no_init_t {
+    constexpr explicit no_init_t() = default;
+};
+
+/**
+ * This specialization is for when T is not trivially destructible,
+ * so the destructor must be called on destruction of `expected'
+ * Additionally, this requires E to be trivially destructible
+ */
+template <typename T, typename E, bool = std::is_trivially_destructible_v<T>>
+    requires std::is_trivially_destructible_v<E>
+struct expected_storage_base {
+    constexpr expected_storage_base() : m_val{T{}}, m_has_val{true} {}
+
+    constexpr expected_storage_base(no_init_t) : m_has_val{false} {}
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<T, Args&&...>>* = nullptr>
+    constexpr expected_storage_base(std::in_place_t, Args&&... args)
+        : m_val{std::forward<Args>(args)...}, m_has_val{true} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<T, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr expected_storage_base(std::in_place_t, std::initializer_list<U> il, Args&&... args)
+        : m_val{il, std::forward<Args>(args)...}, m_has_val{true} {}
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<E, Args&&...>>* = nullptr>
+    constexpr explicit expected_storage_base(unexpect_t, Args&&... args)
+        : m_unexpect{std::forward<Args>(args)...}, m_has_val{false} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<E, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr explicit expected_storage_base(unexpect_t, std::initializer_list<U> il,
+                                             Args&&... args)
+        : m_unexpect{il, std::forward<Args>(args)...}, m_has_val{false} {}
+
+    ~expected_storage_base() {
+        if (m_has_val) {
+            m_val.~T();
+        }
+    }
+
+    union {
+        T m_val;
+        Unexpected<E> m_unexpect;
+    };
+
+    bool m_has_val;
+};
+
+/**
+ * This specialization is for when T is trivially destructible,
+ * so the destructor of `expected` can be trivial
+ * Additionally, this requires E to be trivially destructible
+ */
+template <typename T, typename E>
+    requires std::is_trivially_destructible_v<E>
+struct expected_storage_base<T, E, true> {
+    constexpr expected_storage_base() : m_val{T{}}, m_has_val{true} {}
+
+    constexpr expected_storage_base(no_init_t) : m_has_val{false} {}
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<T, Args&&...>>* = nullptr>
+    constexpr expected_storage_base(std::in_place_t, Args&&... args)
+        : m_val{std::forward<Args>(args)...}, m_has_val{true} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<T, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr expected_storage_base(std::in_place_t, std::initializer_list<U> il, Args&&... args)
+        : m_val{il, std::forward<Args>(args)...}, m_has_val{true} {}
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<E, Args&&...>>* = nullptr>
+    constexpr explicit expected_storage_base(unexpect_t, Args&&... args)
+        : m_unexpect{std::forward<Args>(args)...}, m_has_val{false} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<E, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr explicit expected_storage_base(unexpect_t, std::initializer_list<U> il,
+                                             Args&&... args)
+        : m_unexpect{il, std::forward<Args>(args)...}, m_has_val{false} {}
+
+    ~expected_storage_base() = default;
+
+    union {
+        T m_val;
+        Unexpected<E> m_unexpect;
+    };
+
+    bool m_has_val;
+};
+
+template <typename T, typename E>
+struct expected_operations_base : expected_storage_base<T, E> {
+    using expected_storage_base<T, E>::expected_storage_base;
+
+    template <typename... Args>
+    void construct(Args&&... args) noexcept {
+        new (std::addressof(this->m_val)) T{std::forward<Args>(args)...};
+        this->m_has_val = true;
+    }
+
+    template <typename Rhs>
+    void construct_with(Rhs&& rhs) noexcept {
+        new (std::addressof(this->m_val)) T{std::forward<Rhs>(rhs).get()};
+        this->m_has_val = true;
+    }
+
+    template <typename... Args>
+    void construct_error(Args&&... args) noexcept {
+        new (std::addressof(this->m_unexpect)) Unexpected<E>{std::forward<Args>(args)...};
+        this->m_has_val = false;
+    }
+
+    void assign(const expected_operations_base& rhs) noexcept {
+        if (!this->m_has_val && rhs.m_has_val) {
+            geterr().~Unexpected<E>();
+            construct(rhs.get());
+        } else {
+            assign_common(rhs);
+        }
+    }
+
+    void assign(expected_operations_base&& rhs) noexcept {
+        if (!this->m_has_val && rhs.m_has_val) {
+            geterr().~Unexpected<E>();
+            construct(std::move(rhs).get());
+        } else {
+            assign_common(rhs);
+        }
+    }
+
+    template <typename Rhs>
+    void assign_common(Rhs&& rhs) {
+        if (this->m_has_val) {
+            if (rhs.m_has_val) {
+                get() = std::forward<Rhs>(rhs).get();
+            } else {
+                destroy_val();
+                construct_error(std::forward<Rhs>(rhs).geterr());
+            }
+        } else {
+            if (!rhs.m_has_val) {
+                geterr() = std::forward<Rhs>(rhs).geterr();
+            }
+        }
+    }
+
+    bool has_value() const {
+        return this->m_has_val;
+    }
+
+    constexpr T& get() & {
+        return this->m_val;
+    }
+
+    constexpr const T& get() const& {
+        return this->m_val;
+    }
+
+    constexpr T&& get() && {
+        return std::move(this->m_val);
+    }
+
+    constexpr const T&& get() const&& {
+        return std::move(this->m_val);
+    }
+
+    constexpr Unexpected<E>& geterr() & {
+        return this->m_unexpect;
+    }
+
+    constexpr const Unexpected<E>& geterr() const& {
+        return this->m_unexpect;
+    }
+
+    constexpr Unexpected<E>&& geterr() && {
+        return std::move(this->m_unexpect);
+    }
+
+    constexpr const Unexpected<E>&& geterr() const&& {
+        return std::move(this->m_unexpect);
+    }
+
+    constexpr void destroy_val() {
+        get().~T();
+    }
+};
+
+/**
+ * This manages conditionally having a trivial copy constructor
+ * This specialization is for when T is trivially copy constructible
+ * Additionally, this requires E to be trivially copy constructible
+ */
+template <typename T, typename E, bool = std::is_trivially_copy_constructible_v<T>>
+    requires std::is_trivially_copy_constructible_v<E>
+struct expected_copy_base : expected_operations_base<T, E> {
+    using expected_operations_base<T, E>::expected_operations_base;
+};
+
+/**
+ * This specialization is for when T is not trivially copy constructible
+ * Additionally, this requires E to be trivially copy constructible
+ */
+template <typename T, typename E>
+    requires std::is_trivially_copy_constructible_v<E>
+struct expected_copy_base<T, E, false> : expected_operations_base<T, E> {
+    using expected_operations_base<T, E>::expected_operations_base;
+
+    expected_copy_base() = default;
+
+    expected_copy_base(const expected_copy_base& rhs)
+        : expected_operations_base<T, E>{no_init_t{}} {
+        if (rhs.has_value()) {
+            this->construct_with(rhs);
+        } else {
+            this->construct_error(rhs.geterr());
+        }
+    }
+
+    expected_copy_base(expected_copy_base&&) = default;
+
+    expected_copy_base& operator=(const expected_copy_base&) = default;
+
+    expected_copy_base& operator=(expected_copy_base&&) = default;
+};
+
+/**
+ * This manages conditionally having a trivial move constructor
+ * This specialization is for when T is trivially move constructible
+ * Additionally, this requires E to be trivially move constructible
+ */
+template <typename T, typename E, bool = std::is_trivially_move_constructible_v<T>>
+    requires std::is_trivially_move_constructible_v<E>
+struct expected_move_base : expected_copy_base<T, E> {
+    using expected_copy_base<T, E>::expected_copy_base;
+};
+
+/**
+ * This specialization is for when T is not trivially move constructible
+ * Additionally, this requires E to be trivially move constructible
+ */
+template <typename T, typename E>
+    requires std::is_trivially_move_constructible_v<E>
+struct expected_move_base<T, E, false> : expected_copy_base<T, E> {
+    using expected_copy_base<T, E>::expected_copy_base;
+
+    expected_move_base() = default;
+
+    expected_move_base(const expected_move_base&) = default;
+
+    expected_move_base(expected_move_base&& rhs) noexcept(std::is_nothrow_move_constructible_v<T>)
+        : expected_copy_base<T, E>{no_init_t{}} {
+        if (rhs.has_value()) {
+            this->construct_with(std::move(rhs));
+        } else {
+            this->construct_error(std::move(rhs.geterr()));
+        }
+    }
+
+    expected_move_base& operator=(const expected_move_base&) = default;
+
+    expected_move_base& operator=(expected_move_base&&) = default;
+};
+
+/**
+ * This manages conditionally having a trivial copy assignment operator
+ * This specialization is for when T is trivially copy assignable
+ * Additionally, this requires E to be trivially copy assignable
+ */
+template <typename T, typename E,
+          bool = std::conjunction_v<std::is_trivially_copy_assignable<T>,
+                                    std::is_trivially_copy_constructible<T>,
+                                    std::is_trivially_destructible<T>>>
+    requires std::conjunction_v<std::is_trivially_copy_assignable<E>,
+                                std::is_trivially_copy_constructible<E>,
+                                std::is_trivially_destructible<E>>
+struct expected_copy_assign_base : expected_move_base<T, E> {
+    using expected_move_base<T, E>::expected_move_base;
+};
+
+/**
+ * This specialization is for when T is not trivially copy assignable
+ * Additionally, this requires E to be trivially copy assignable
+ */
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_trivially_copy_assignable<E>,
+                                std::is_trivially_copy_constructible<E>,
+                                std::is_trivially_destructible<E>>
+struct expected_copy_assign_base<T, E, false> : expected_move_base<T, E> {
+    using expected_move_base<T, E>::expected_move_base;
+
+    expected_copy_assign_base() = default;
+
+    expected_copy_assign_base(const expected_copy_assign_base&) = default;
+
+    expected_copy_assign_base(expected_copy_assign_base&&) = default;
+
+    expected_copy_assign_base& operator=(const expected_copy_assign_base& rhs) {
+        this->assign(rhs);
+        return *this;
+    }
+
+    expected_copy_assign_base& operator=(expected_copy_assign_base&&) = default;
+};
+
+/**
+ * This manages conditionally having a trivial move assignment operator
+ * This specialization is for when T is trivially move assignable
+ * Additionally, this requires E to be trivially move assignable
+ */
+template <typename T, typename E,
+          bool = std::conjunction_v<std::is_trivially_move_assignable<T>,
+                                    std::is_trivially_move_constructible<T>,
+                                    std::is_trivially_destructible<T>>>
+    requires std::conjunction_v<std::is_trivially_move_assignable<E>,
+                                std::is_trivially_move_constructible<E>,
+                                std::is_trivially_destructible<E>>
+struct expected_move_assign_base : expected_copy_assign_base<T, E> {
+    using expected_copy_assign_base<T, E>::expected_copy_assign_base;
+};
+
+/**
+ * This specialization is for when T is not trivially move assignable
+ * Additionally, this requires E to be trivially move assignable
+ */
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_trivially_move_assignable<E>,
+                                std::is_trivially_move_constructible<E>,
+                                std::is_trivially_destructible<E>>
+struct expected_move_assign_base<T, E, false> : expected_copy_assign_base<T, E> {
+    using expected_copy_assign_base<T, E>::expected_copy_assign_base;
+
+    expected_move_assign_base() = default;
+
+    expected_move_assign_base(const expected_move_assign_base&) = default;
+
+    expected_move_assign_base(expected_move_assign_base&&) = default;
+
+    expected_move_assign_base& operator=(const expected_move_assign_base&) = default;
+
+    expected_move_assign_base& operator=(expected_move_assign_base&& rhs) noexcept(
+        std::conjunction_v<std::is_nothrow_move_constructible<T>,
+                           std::is_nothrow_move_assignable<T>>) {
+        this->assign(std::move(rhs));
+        return *this;
+    }
+};
+
+/**
+ * expected_delete_ctor_base will conditionally delete copy and move constructors
+ * depending on whether T is copy/move constructible
+ * Additionally, this requires E to be copy/move constructible
+ */
+template <typename T, typename E, bool EnableCopy = std::is_copy_constructible_v<T>,
+          bool EnableMove = std::is_move_constructible_v<T>>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>
+struct expected_delete_ctor_base {
+    expected_delete_ctor_base() = default;
+    expected_delete_ctor_base(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base(expected_delete_ctor_base&&) noexcept = default;
+    expected_delete_ctor_base& operator=(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base& operator=(expected_delete_ctor_base&&) noexcept = default;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>
+struct expected_delete_ctor_base<T, E, true, false> {
+    expected_delete_ctor_base() = default;
+    expected_delete_ctor_base(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base(expected_delete_ctor_base&&) noexcept = delete;
+    expected_delete_ctor_base& operator=(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base& operator=(expected_delete_ctor_base&&) noexcept = default;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>
+struct expected_delete_ctor_base<T, E, false, true> {
+    expected_delete_ctor_base() = default;
+    expected_delete_ctor_base(const expected_delete_ctor_base&) = delete;
+    expected_delete_ctor_base(expected_delete_ctor_base&&) noexcept = default;
+    expected_delete_ctor_base& operator=(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base& operator=(expected_delete_ctor_base&&) noexcept = default;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>>
+struct expected_delete_ctor_base<T, E, false, false> {
+    expected_delete_ctor_base() = default;
+    expected_delete_ctor_base(const expected_delete_ctor_base&) = delete;
+    expected_delete_ctor_base(expected_delete_ctor_base&&) noexcept = delete;
+    expected_delete_ctor_base& operator=(const expected_delete_ctor_base&) = default;
+    expected_delete_ctor_base& operator=(expected_delete_ctor_base&&) noexcept = default;
+};
+
+/**
+ * expected_delete_assign_base will conditionally delete copy and move assignment operators
+ * depending on whether T is copy/move constructible + assignable
+ * Additionally, this requires E to be copy/move constructible + assignable
+ */
+template <
+    typename T, typename E,
+    bool EnableCopy = std::conjunction_v<std::is_copy_constructible<T>, std::is_copy_assignable<T>>,
+    bool EnableMove = std::conjunction_v<std::is_move_constructible<T>, std::is_move_assignable<T>>>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,
+                                std::is_copy_assignable<E>, std::is_move_assignable<E>>
+struct expected_delete_assign_base {
+    expected_delete_assign_base() = default;
+    expected_delete_assign_base(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base(expected_delete_assign_base&&) noexcept = default;
+    expected_delete_assign_base& operator=(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base& operator=(expected_delete_assign_base&&) noexcept = default;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,
+                                std::is_copy_assignable<E>, std::is_move_assignable<E>>
+struct expected_delete_assign_base<T, E, true, false> {
+    expected_delete_assign_base() = default;
+    expected_delete_assign_base(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base(expected_delete_assign_base&&) noexcept = default;
+    expected_delete_assign_base& operator=(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base& operator=(expected_delete_assign_base&&) noexcept = delete;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,
+                                std::is_copy_assignable<E>, std::is_move_assignable<E>>
+struct expected_delete_assign_base<T, E, false, true> {
+    expected_delete_assign_base() = default;
+    expected_delete_assign_base(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base(expected_delete_assign_base&&) noexcept = default;
+    expected_delete_assign_base& operator=(const expected_delete_assign_base&) = delete;
+    expected_delete_assign_base& operator=(expected_delete_assign_base&&) noexcept = default;
+};
+
+template <typename T, typename E>
+    requires std::conjunction_v<std::is_copy_constructible<E>, std::is_move_constructible<E>,
+                                std::is_copy_assignable<E>, std::is_move_assignable<E>>
+struct expected_delete_assign_base<T, E, false, false> {
+    expected_delete_assign_base() = default;
+    expected_delete_assign_base(const expected_delete_assign_base&) = default;
+    expected_delete_assign_base(expected_delete_assign_base&&) noexcept = default;
+    expected_delete_assign_base& operator=(const expected_delete_assign_base&) = delete;
+    expected_delete_assign_base& operator=(expected_delete_assign_base&&) noexcept = delete;
+};
+
+/**
+ * This is needed to be able to construct the expected_default_ctor_base which follows,
+ * while still conditionally deleting the default constructor.
+ */
+struct default_constructor_tag {
+    constexpr explicit default_constructor_tag() = default;
+};
+
+/**
+ * expected_default_ctor_base will ensure that expected
+ * has a deleted default constructor if T is not default constructible
+ * This specialization is for when T is default constructible
+ */
+template <typename T, typename E, bool Enable = std::is_default_constructible_v<T>>
+struct expected_default_ctor_base {
+    constexpr expected_default_ctor_base() noexcept = default;
+    constexpr expected_default_ctor_base(expected_default_ctor_base const&) noexcept = default;
+    constexpr expected_default_ctor_base(expected_default_ctor_base&&) noexcept = default;
+    expected_default_ctor_base& operator=(expected_default_ctor_base const&) noexcept = default;
+    expected_default_ctor_base& operator=(expected_default_ctor_base&&) noexcept = default;
+
+    constexpr explicit expected_default_ctor_base(default_constructor_tag) {}
+};
+
+template <typename T, typename E>
+struct expected_default_ctor_base<T, E, false> {
+    constexpr expected_default_ctor_base() noexcept = delete;
+    constexpr expected_default_ctor_base(expected_default_ctor_base const&) noexcept = default;
+    constexpr expected_default_ctor_base(expected_default_ctor_base&&) noexcept = default;
+    expected_default_ctor_base& operator=(expected_default_ctor_base const&) noexcept = default;
+    expected_default_ctor_base& operator=(expected_default_ctor_base&&) noexcept = default;
+
+    constexpr explicit expected_default_ctor_base(default_constructor_tag) {}
+};
+
+template <typename T, typename E, typename U>
+using expected_enable_forward_value =
+    std::enable_if_t<std::is_constructible_v<T, U&&> &&
+                     !std::is_same_v<std::remove_cvref_t<U>, std::in_place_t> &&
+                     !std::is_same_v<Expected<T, E>, std::remove_cvref_t<U>> &&
+                     !std::is_same_v<Unexpected<E>, std::remove_cvref_t<U>>>;
+
+template <typename T, typename E, typename U, typename G, typename UR, typename GR>
+using expected_enable_from_other = std::enable_if_t<
+    std::is_constructible_v<T, UR> && std::is_constructible_v<E, GR> &&
+    !std::is_constructible_v<T, Expected<U, G>&> && !std::is_constructible_v<T, Expected<U, G>&&> &&
+    !std::is_constructible_v<T, const Expected<U, G>&> &&
+    !std::is_constructible_v<T, const Expected<U, G>&&> &&
+    !std::is_convertible_v<Expected<U, G>&, T> && !std::is_convertible_v<Expected<U, G>&&, T> &&
+    !std::is_convertible_v<const Expected<U, G>&, T> &&
+    !std::is_convertible_v<const Expected<U, G>&&, T>>;
+
+} // namespace detail
+
+template <typename T, typename E>
+class Expected : private detail::expected_move_assign_base<T, E>,
+                 private detail::expected_delete_ctor_base<T, E>,
+                 private detail::expected_delete_assign_base<T, E>,
+                 private detail::expected_default_ctor_base<T, E> {
+public:
+    using value_type = T;
+    using error_type = E;
+    using unexpected_type = Unexpected<E>;
+
+    constexpr Expected() = default;
+    constexpr Expected(const Expected&) = default;
+    constexpr Expected(Expected&&) = default;
+    Expected& operator=(const Expected&) = default;
+    Expected& operator=(Expected&&) = default;
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<T, Args&&...>>* = nullptr>
+    constexpr Expected(std::in_place_t, Args&&... args)
+        : impl_base{std::in_place, std::forward<Args>(args)...},
+          ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<T, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr Expected(std::in_place_t, std::initializer_list<U> il, Args&&... args)
+        : impl_base{std::in_place, il, std::forward<Args>(args)...},
+          ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename G = E, std::enable_if_t<std::is_constructible_v<E, const G&>>* = nullptr,
+              std::enable_if_t<!std::is_convertible_v<const G&, E>>* = nullptr>
+    constexpr explicit Expected(const Unexpected<G>& e)
+        : impl_base{unexpect_t{}, e.value()}, ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename G = E, std::enable_if_t<std::is_constructible_v<E, const G&>>* = nullptr,
+              std::enable_if_t<std::is_convertible_v<const G&, E>>* = nullptr>
+    constexpr Expected(Unexpected<G> const& e)
+        : impl_base{unexpect_t{}, e.value()}, ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename G = E, std::enable_if_t<std::is_constructible_v<E, G&&>>* = nullptr,
+              std::enable_if_t<!std::is_convertible_v<G&&, E>>* = nullptr>
+    constexpr explicit Expected(Unexpected<G>&& e) noexcept(std::is_nothrow_constructible_v<E, G&&>)
+        : impl_base{unexpect_t{}, std::move(e.value())}, ctor_base{
+                                                             detail::default_constructor_tag{}} {}
+
+    template <typename G = E, std::enable_if_t<std::is_constructible_v<E, G&&>>* = nullptr,
+              std::enable_if_t<std::is_convertible_v<G&&, E>>* = nullptr>
+    constexpr Expected(Unexpected<G>&& e) noexcept(std::is_nothrow_constructible_v<E, G&&>)
+        : impl_base{unexpect_t{}, std::move(e.value())}, ctor_base{
+                                                             detail::default_constructor_tag{}} {}
+
+    template <typename... Args, std::enable_if_t<std::is_constructible_v<E, Args&&...>>* = nullptr>
+    constexpr explicit Expected(unexpect_t, Args&&... args)
+        : impl_base{unexpect_t{}, std::forward<Args>(args)...},
+          ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_constructible_v<E, std::initializer_list<U>&, Args&&...>>* =
+                  nullptr>
+    constexpr explicit Expected(unexpect_t, std::initializer_list<U> il, Args&&... args)
+        : impl_base{unexpect_t{}, il, std::forward<Args>(args)...},
+          ctor_base{detail::default_constructor_tag{}} {}
+
+    template <typename U, typename G,
+              std::enable_if_t<!(std::is_convertible_v<U const&, T> &&
+                                 std::is_convertible_v<G const&, E>)>* = nullptr,
+              detail::expected_enable_from_other<T, E, U, G, const U&, const G&>* = nullptr>
+    constexpr explicit Expected(const Expected<U, G>& rhs)
+        : ctor_base{detail::default_constructor_tag{}} {
+        if (rhs.has_value()) {
+            this->construct(*rhs);
+        } else {
+            this->construct_error(rhs.error());
+        }
+    }
+
+    template <typename U, typename G,
+              std::enable_if_t<(std::is_convertible_v<U const&, T> &&
+                                std::is_convertible_v<G const&, E>)>* = nullptr,
+              detail::expected_enable_from_other<T, E, U, G, const U&, const G&>* = nullptr>
+    constexpr Expected(const Expected<U, G>& rhs) : ctor_base{detail::default_constructor_tag{}} {
+        if (rhs.has_value()) {
+            this->construct(*rhs);
+        } else {
+            this->construct_error(rhs.error());
+        }
+    }
+
+    template <typename U, typename G,
+              std::enable_if_t<!(std::is_convertible_v<U&&, T> && std::is_convertible_v<G&&, E>)>* =
+                  nullptr,
+              detail::expected_enable_from_other<T, E, U, G, U&&, G&&>* = nullptr>
+    constexpr explicit Expected(Expected<U, G>&& rhs)
+        : ctor_base{detail::default_constructor_tag{}} {
+        if (rhs.has_value()) {
+            this->construct(std::move(*rhs));
+        } else {
+            this->construct_error(std::move(rhs.error()));
+        }
+    }
+
+    template <typename U, typename G,
+              std::enable_if_t<(std::is_convertible_v<U&&, T> && std::is_convertible_v<G&&, E>)>* =
+                  nullptr,
+              detail::expected_enable_from_other<T, E, U, G, U&&, G&&>* = nullptr>
+    constexpr Expected(Expected<U, G>&& rhs) : ctor_base{detail::default_constructor_tag{}} {
+        if (rhs.has_value()) {
+            this->construct(std::move(*rhs));
+        } else {
+            this->construct_error(std::move(rhs.error()));
+        }
+    }
+
+    template <typename U = T, std::enable_if_t<!std::is_convertible_v<U&&, T>>* = nullptr,
+              detail::expected_enable_forward_value<T, E, U>* = nullptr>
+    constexpr explicit Expected(U&& v) : Expected{std::in_place, std::forward<U>(v)} {}
+
+    template <typename U = T, std::enable_if_t<std::is_convertible_v<U&&, T>>* = nullptr,
+              detail::expected_enable_forward_value<T, E, U>* = nullptr>
+    constexpr Expected(U&& v) : Expected{std::in_place, std::forward<U>(v)} {}
+
+    template <typename U = T, typename G = T,
+              std::enable_if_t<std::is_nothrow_constructible_v<T, U&&>>* = nullptr,
+              std::enable_if_t<(
+                  !std::is_same_v<Expected<T, E>, std::remove_cvref_t<U>> &&
+                  !std::conjunction_v<std::is_scalar<T>, std::is_same<T, std::remove_cvref_t<U>>> &&
+                  std::is_constructible_v<T, U> && std::is_assignable_v<G&, U> &&
+                  std::is_nothrow_move_constructible_v<E>)>* = nullptr>
+    Expected& operator=(U&& v) {
+        if (has_value()) {
+            val() = std::forward<U>(v);
+        } else {
+            err().~Unexpected<E>();
+            new (valptr()) T{std::forward<U>(v)};
+            this->m_has_val = true;
+        }
+
+        return *this;
+    }
+
+    template <typename U = T, typename G = T,
+              std::enable_if_t<!std::is_nothrow_constructible_v<T, U&&>>* = nullptr,
+              std::enable_if_t<(
+                  !std::is_same_v<Expected<T, E>, std::remove_cvref_t<U>> &&
+                  !std::conjunction_v<std::is_scalar<T>, std::is_same<T, std::remove_cvref_t<U>>> &&
+                  std::is_constructible_v<T, U> && std::is_assignable_v<G&, U> &&
+                  std::is_nothrow_move_constructible_v<E>)>* = nullptr>
+    Expected& operator=(U&& v) {
+        if (has_value()) {
+            val() = std::forward<U>(v);
+        } else {
+            auto tmp = std::move(err());
+            err().~Unexpected<E>();
+            new (valptr()) T{std::forward<U>(v)};
+            this->m_has_val = true;
+        }
+
+        return *this;
+    }
+
+    template <typename G = E, std::enable_if_t<std::is_nothrow_copy_constructible_v<G> &&
+                                               std::is_assignable_v<G&, G>>* = nullptr>
+    Expected& operator=(const Unexpected<G>& rhs) {
+        if (!has_value()) {
+            err() = rhs;
+        } else {
+            this->destroy_val();
+            new (errptr()) Unexpected<E>{rhs};
+            this->m_has_val = false;
+        }
+
+        return *this;
+    }
+
+    template <typename G = E, std::enable_if_t<std::is_nothrow_move_constructible_v<G> &&
+                                               std::is_move_assignable_v<G>>* = nullptr>
+    Expected& operator=(Unexpected<G>&& rhs) noexcept {
+        if (!has_value()) {
+            err() = std::move(rhs);
+        } else {
+            this->destroy_val();
+            new (errptr()) Unexpected<E>{std::move(rhs)};
+            this->m_has_val = false;
+        }
+
+        return *this;
+    }
+
+    template <typename... Args,
+              std::enable_if_t<std::is_nothrow_constructible_v<T, Args&&...>>* = nullptr>
+    void emplace(Args&&... args) {
+        if (has_value()) {
+            val() = T{std::forward<Args>(args)...};
+        } else {
+            err().~Unexpected<E>();
+            new (valptr()) T{std::forward<Args>(args)...};
+            this->m_has_val = true;
+        }
+    }
+
+    template <typename... Args,
+              std::enable_if_t<!std::is_nothrow_constructible_v<T, Args&&...>>* = nullptr>
+    void emplace(Args&&... args) {
+        if (has_value()) {
+            val() = T{std::forward<Args>(args)...};
+        } else {
+            auto tmp = std::move(err());
+            err().~Unexpected<E>();
+            new (valptr()) T{std::forward<Args>(args)...};
+            this->m_has_val = true;
+        }
+    }
+
+    template <typename U, typename... Args,
+              std::enable_if_t<std::is_nothrow_constructible_v<T, std::initializer_list<U>&,
+                                                               Args&&...>>* = nullptr>
+    void emplace(std::initializer_list<U> il, Args&&... args) {
+        if (has_value()) {
+            T t{il, std::forward<Args>(args)...};
+            val() = std::move(t);
+        } else {
+            err().~Unexpected<E>();
+            new (valptr()) T{il, std::forward<Args>(args)...};
+            this->m_has_val = true;
+        }
+    }
+
+    template <typename U, typename... Args,
+              std::enable_if_t<!std::is_nothrow_constructible_v<T, std::initializer_list<U>&,
+                                                                Args&&...>>* = nullptr>
+    void emplace(std::initializer_list<U> il, Args&&... args) {
+        if (has_value()) {
+            T t{il, std::forward<Args>(args)...};
+            val() = std::move(t);
+        } else {
+            auto tmp = std::move(err());
+            err().~Unexpected<E>();
+            new (valptr()) T{il, std::forward<Args>(args)...};
+            this->m_has_val = true;
+        }
+    }
+
+    constexpr T* operator->() {
+        return valptr();
+    }
+
+    constexpr const T* operator->() const {
+        return valptr();
+    }
+
+    template <typename U = T>
+    constexpr U& operator*() & {
+        return val();
+    }
+
+    template <typename U = T>
+    constexpr const U& operator*() const& {
+        return val();
+    }
+
+    template <typename U = T>
+    constexpr U&& operator*() && {
+        return std::move(val());
+    }
+
+    template <typename U = T>
+    constexpr const U&& operator*() const&& {
+        return std::move(val());
+    }
+
+    constexpr bool has_value() const noexcept {
+        return this->m_has_val;
+    }
+
+    constexpr explicit operator bool() const noexcept {
+        return this->m_has_val;
+    }
+
+    template <typename U = T>
+    constexpr U& value() & {
+        return val();
+    }
+
+    template <typename U = T>
+    constexpr const U& value() const& {
+        return val();
+    }
+
+    template <typename U = T>
+    constexpr U&& value() && {
+        return std::move(val());
+    }
+
+    template <typename U = T>
+    constexpr const U&& value() const&& {
+        return std::move(val());
+    }
+
+    constexpr E& error() & {
+        return err().value();
+    }
+
+    constexpr const E& error() const& {
+        return err().value();
+    }
+
+    constexpr E&& error() && {
+        return std::move(err().value());
+    }
+
+    constexpr const E&& error() const&& {
+        return std::move(err().value());
+    }
+
+    template <typename U>
+    constexpr T value_or(U&& v) const& {
+        static_assert(std::is_copy_constructible_v<T> && std::is_convertible_v<U&&, T>,
+                      "T must be copy-constructible and convertible from U&&");
+        return bool(*this) ? **this : static_cast<T>(std::forward<U>(v));
+    }
+
+    template <typename U>
+    constexpr T value_or(U&& v) && {
+        static_assert(std::is_move_constructible_v<T> && std::is_convertible_v<U&&, T>,
+                      "T must be move-constructible and convertible from U&&");
+        return bool(*this) ? std::move(**this) : static_cast<T>(std::forward<U>(v));
+    }
+
+private:
+    static_assert(!std::is_reference_v<T>, "T must not be a reference");
+    static_assert(!std::is_same_v<T, std::remove_cv_t<std::in_place_t>>,
+                  "T must not be std::in_place_t");
+    static_assert(!std::is_same_v<T, std::remove_cv_t<unexpect_t>>, "T must not be unexpect_t");
+    static_assert(!std::is_same_v<T, std::remove_cv_t<Unexpected<E>>>,
+                  "T must not be Unexpected<E>");
+    static_assert(!std::is_reference_v<E>, "E must not be a reference");
+
+    T* valptr() {
+        return std::addressof(this->m_val);
+    }
+
+    const T* valptr() const {
+        return std::addressof(this->m_val);
+    }
+
+    Unexpected<E>* errptr() {
+        return std::addressof(this->m_unexpect);
+    }
+
+    const Unexpected<E>* errptr() const {
+        return std::addressof(this->m_unexpect);
+    }
+
+    template <typename U = T>
+    constexpr U& val() {
+        return this->m_val;
+    }
+
+    template <typename U = T>
+    constexpr const U& val() const {
+        return this->m_val;
+    }
+
+    constexpr Unexpected<E>& err() {
+        return this->m_unexpect;
+    }
+
+    constexpr const Unexpected<E>& err() const {
+        return this->m_unexpect;
+    }
+
+    using impl_base = detail::expected_move_assign_base<T, E>;
+    using ctor_base = detail::expected_default_ctor_base<T, E>;
+};
+
+template <typename T, typename E, typename U, typename F>
+constexpr bool operator==(const Expected<T, E>& lhs, const Expected<U, F>& rhs) {
+    return (lhs.has_value() != rhs.has_value())
+               ? false
+               : (!lhs.has_value() ? lhs.error() == rhs.error() : *lhs == *rhs);
+}
+
+template <typename T, typename E, typename U, typename F>
+constexpr bool operator!=(const Expected<T, E>& lhs, const Expected<U, F>& rhs) {
+    return !operator==(lhs, rhs);
+}
+
+template <typename T, typename E, typename U>
+constexpr bool operator==(const Expected<T, E>& x, const U& v) {
+    return x.has_value() ? *x == v : false;
+}
+
+template <typename T, typename E, typename U>
+constexpr bool operator==(const U& v, const Expected<T, E>& x) {
+    return x.has_value() ? *x == v : false;
+}
+
+template <typename T, typename E, typename U>
+constexpr bool operator!=(const Expected<T, E>& x, const U& v) {
+    return !operator==(x, v);
+}
+
+template <typename T, typename E, typename U>
+constexpr bool operator!=(const U& v, const Expected<T, E>& x) {
+    return !operator==(v, x);
+}
+
+template <typename T, typename E>
+constexpr bool operator==(const Expected<T, E>& x, const Unexpected<E>& e) {
+    return x.has_value() ? false : x.error() == e.value();
+}
+
+template <typename T, typename E>
+constexpr bool operator==(const Unexpected<E>& e, const Expected<T, E>& x) {
+    return x.has_value() ? false : x.error() == e.value();
+}
+
+template <typename T, typename E>
+constexpr bool operator!=(const Expected<T, E>& x, const Unexpected<E>& e) {
+    return !operator==(x, e);
+}
+
+template <typename T, typename E>
+constexpr bool operator!=(const Unexpected<E>& e, const Expected<T, E>& x) {
+    return !operator==(e, x);
+}
+
+} // namespace Common

src/common/settings.cpp

@@ -54,6 +54,7 @@ SWITCHABLE(CpuBackend, true);
 SWITCHABLE(CpuAccuracy, true);
 SWITCHABLE(FullscreenMode, true);
 SWITCHABLE(GpuAccuracy, true);
+SWITCHABLE(GpuLogLevel, true);
 SWITCHABLE(Language, true);
 SWITCHABLE(MemoryLayout, true);
 SWITCHABLE(NvdecEmulation, false);
@@ -212,16 +213,6 @@ bool IsNceEnabled() {
     return is_nce_enabled;
 }
 
-static u64 current_program_id = 0;
-
-void SetCurrentProgramID(u64 program_id) {
-    current_program_id = program_id;
-}
-
-u64 GetCurrentProgramID() {
-    return current_program_id;
-}
-
 bool IsDockedMode() {
     return values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
 }

src/common/settings.h

@@ -573,13 +573,6 @@ struct Values {
         false,
 #endif
         "rescale_hack", Category::RendererHacks};
-    SwitchableSetting<bool> enable_gpu_buffer_readback{linkage,
-                                                       false,
-                                                       "enable_gpu_buffer_readback",
-                                                       Category::RendererAdvanced,
-                                                       Specialization::Default,
-                                                       true,
-                                                       true};
 
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererHacks};
@@ -795,8 +788,8 @@ struct Values {
                                                 false};  // runtime_modifiable_ — startup-only
     Setting<bool> dump_exefs{linkage, false, "dump_exefs", Category::Debugging};
     Setting<bool> dump_nso{linkage, false, "dump_nso", Category::Debugging};
-    Setting<bool> dump_guest_shaders{
-                               linkage, false, "dump_guest_shaders", Category::DebuggingGraphics, Specialization::Default,
+    Setting<bool> dump_shaders{
+                               linkage, false, "dump_shaders", Category::DebuggingGraphics, Specialization::Default,
                                false};
     Setting<bool> dump_macros{
                               linkage, false, "dump_macros", Category::DebuggingGraphics, Specialization::Default, false};
@@ -820,8 +813,9 @@ struct Values {
     Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Debugging};
 
     // GPU Logging
-    Setting<GpuLogLevel> gpu_log_level{linkage, GpuLogLevel::Off, "gpu_log_level",
-                                       Category::Debugging};
+    Setting<bool> gpu_logging_enabled{linkage, false, "gpu_logging_enabled", Category::Debugging};
+    SwitchableSetting<GpuLogLevel> gpu_log_level{linkage, GpuLogLevel::Standard, "gpu_log_level",
+                                                   Category::Debugging};
     Setting<bool> gpu_log_vulkan_calls{linkage, true, "gpu_log_vulkan_calls", Category::Debugging};
     Setting<bool> gpu_log_shader_dumps{linkage, false, "gpu_log_shader_dumps", Category::Debugging};
     Setting<bool> gpu_log_memory_tracking{linkage, true, "gpu_log_memory_tracking",
@@ -882,9 +876,6 @@ bool IsFastmemEnabled();
 void SetNceEnabled(bool is_64bit);
 bool IsNceEnabled();
 
-void SetCurrentProgramID(u64 program_id);
-u64 GetCurrentProgramID();
-
 bool IsOpenGL();
 
 bool IsDockedMode();

src/common/virtual_buffer.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -17,11 +17,7 @@ namespace Common {
 
 void* AllocateMemoryPages(std::size_t size) noexcept {
 #ifdef _WIN32
-    void* base = VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-    if (base == nullptr) {
-        // Probably failing to reserve is less likely than failing to commit
-        base = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
-    }
+    void* base = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_READWRITE);
 #else
     void* base = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
     if (base == MAP_FAILED)

src/core/core.cpp

@@ -326,9 +326,6 @@ struct System::Impl {
 
         LOG_INFO(Core, "Loading {} ({:016X}) ...", name, params.program_id);
 
-        // Expose program id to dump sites and other global readers.
-        Settings::SetCurrentProgramID(params.program_id);
-
         // Track launch time for frontend launches
         LaunchTimestampCache::SaveLaunchTimestamp(params.program_id);
 

src/core/hle/result.h

@@ -10,6 +10,7 @@
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
+#include "common/expected.h"
 
 // All the constants in this file come from <https://switchbrew.org/wiki/Error_codes>
 

src/core/hle/service/am/frontend/applet_web_browser.cpp

@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "applet_web_browser_types.h"
 #include "common/assert.h"
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
@@ -371,13 +370,16 @@ void WebBrowser::ExtractOfflineRomFS() {
 
 void WebBrowser::WebBrowserExit(WebExitReason exit_reason, std::string last_url) {
     const bool use_tlv_output =
-        (web_arg_header.shim_kind == ShimKind::Share && web_applet_version >= WebAppletVersion::Version196608)
-        || (web_arg_header.shim_kind == ShimKind::Web && web_applet_version >= WebAppletVersion::Version524288)
-        || (web_arg_header.shim_kind == ShimKind::Lhub);
+        (web_arg_header.shim_kind == ShimKind::Share &&
+         web_applet_version >= WebAppletVersion::Version196608) ||
+        (web_arg_header.shim_kind == ShimKind::Web &&
+         web_applet_version >= WebAppletVersion::Version524288) ||
+        (web_arg_header.shim_kind == ShimKind::Lhub);
 
     // https://switchbrew.org/wiki/Internet_Browser#TLVs
     if (use_tlv_output) {
-        LOG_DEBUG(Service_AM, "Using TLV output: exit_reason={}, last_url={}, last_url_size={}", exit_reason, last_url, last_url.size());
+        LOG_DEBUG(Service_AM, "Using TLV output: exit_reason={}, last_url={}, last_url_size={}",
+                  exit_reason, last_url, last_url.size());
 
         // storage size for TLVs is 0x2000 bytes (as per switchbrew documentation)
         constexpr size_t TLV_STORAGE_SIZE = 0x2000;
@@ -598,14 +600,11 @@ void WebBrowser::ExecuteShare() {
 
 void WebBrowser::ExecuteWeb() {
     LOG_INFO(Service_AM, "Opening external URL at {}", external_url);
-    frontend.OpenExternalWebPage(external_url, [this](WebExitReason exit_reason, std::string last_url) {
-        // Offline and web applets must be explicitly exited from because they respect exit state
-        // Unlike the other web stuffs
-        if (exit_reason == WebExitReason::ExitRequested || exit_reason == WebExitReason::EndButtonPressed)
-            exit_reason = (web_arg_header.shim_kind == ShimKind::Web || web_arg_header.shim_kind == ShimKind::Offline)
-                ? WebExitReason::ExitRequested : WebExitReason::EndButtonPressed;
-        WebBrowserExit(exit_reason, last_url);
-    });
+
+    frontend.OpenExternalWebPage(external_url,
+                                 [this](WebExitReason exit_reason, std::string last_url) {
+                                     WebBrowserExit(exit_reason, last_url);
+                                 });
 }
 
 void WebBrowser::ExecuteWifi() {

src/core/hle/service/sockets/bsd.cpp

@@ -24,6 +24,9 @@
 #include "network/network.h"
 #include <common/settings.h>
 
+using Common::Expected;
+using Common::Unexpected;
+
 namespace Service::Sockets {
 
 namespace {
@@ -461,22 +464,13 @@ void BSD::DuplicateSocket(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     auto input = rp.PopRaw<InputParameters>();
 
+    Expected<s32, Errno> res = DuplicateSocketImpl(input.fd);
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
-
-    auto const res_v = DuplicateSocketImpl(input.fd);
-    if (auto* res = std::get_if<s32>(&res_v)) {
-        rb.PushRaw(OutputParameters{
-            .ret = *res,
-            .bsd_errno = Errno::SUCCESS,
-        });
-    } else {
-        auto* err = std::get_if<Errno>(&res_v);
-        rb.PushRaw(OutputParameters{
-            .ret = 0,
-            .bsd_errno = *err,
-        });
-    }
+    rb.PushRaw(OutputParameters{
+        .ret = res.value_or(0),
+        .bsd_errno = res ? Errno::SUCCESS : res.error(),
+    });
 }
 
 void BSD::EventFd(HLERequestContext& ctx) {
@@ -983,15 +977,15 @@ Errno BSD::CloseImpl(s32 fd) {
     return bsd_errno;
 }
 
-std::variant<s32, Errno> BSD::DuplicateSocketImpl(s32 fd) {
+Expected<s32, Errno> BSD::DuplicateSocketImpl(s32 fd) {
     if (!IsFileDescriptorValid(fd)) {
-        return Errno::BADF;
+        return Unexpected(Errno::BADF);
     }
 
     const s32 new_fd = FindFreeFileDescriptorHandle();
     if (new_fd < 0) {
         LOG_ERROR(Service, "No more file descriptors available");
-        return Errno::MFILE;
+        return Unexpected(Errno::MFILE);
     }
 
     file_descriptors[new_fd] = FileDescriptor{

src/core/hle/service/sockets/bsd.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -8,9 +8,9 @@
 #include <memory>
 #include <span>
 #include <vector>
-#include <variant>
 
 #include "common/common_types.h"
+#include "common/expected.h"
 #include "common/socket_types.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/sockets/sockets.h"
@@ -35,7 +35,7 @@ public:
     // These methods are called from SSL; the first two are also called from
     // this class for the corresponding IPC methods.
     // On the real device, the SSL service makes IPC calls to this service.
-    std::variant<s32, Errno> DuplicateSocketImpl(s32 fd);
+    Common::Expected<s32, Errno> DuplicateSocketImpl(s32 fd);
     Errno CloseImpl(s32 fd);
     std::optional<std::shared_ptr<Network::SocketBase>> GetSocket(s32 fd);
 

src/core/hle/service/sockets/sfdnsres.cpp

@@ -88,12 +88,11 @@ static const constexpr std::array blockedDomains = {
     "sun.hac.lp1.d4c.nintendo.net",
     "phoenix-api.wbagora.com", //hogwarts legacy
     "battle.net",
-    "microsoft.com", // Minecraft dungeons + other games
+    "microsoft.com", //minecraft dungeons + other games
     "mojang.com",
     "xboxlive.com",
     "api.epicgames.dev", // marvel cosmic invasion +?
-    "minecraftservices.com",
-    "508223012e5a5ff19f30a391b2bdadc0.my.2k.com", // Civilization 5
+    "minecraftservices.com"
 };
 
 static bool IsBlockedHost(const std::string& host) {
@@ -208,15 +207,16 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte
         return {0, GetAddrInfoError::AGAIN};
     }
 
-    auto res_v = Network::GetAddressInfo(host, /*service*/ std::nullopt);
-    if (auto* res = std::get_if<std::vector<Network::AddrInfo>>(&res_v)) {
-        const std::vector<u8> data = SerializeAddrInfoAsHostEnt(*res, host);
-        const u32 data_size = u32(data.size());
-        ctx.WriteBuffer(data, 0);
-        return {data_size, GetAddrInfoError::SUCCESS};
+    auto res = Network::GetAddressInfo(host, /*service*/ std::nullopt);
+    if (!res.has_value()) {
+        return {0, Translate(res.error())};
     }
-    auto* err = std::get_if<Network::GetAddrInfoError>(&res_v);
-    return {0, Translate(*err)};
+
+    const std::vector<u8> data = SerializeAddrInfoAsHostEnt(res.value(), host);
+    const u32 data_size = static_cast<u32>(data.size());
+    ctx.WriteBuffer(data, 0);
+
+    return {data_size, GetAddrInfoError::SUCCESS};
 }
 
 void SFDNSRES::GetHostByNameRequest(HLERequestContext& ctx) {
@@ -332,15 +332,16 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext
 
     // Serialized hints are also passed in a buffer, but are ignored for now.
 
-    auto res_v = Network::GetAddressInfo(host, service);
-    if (auto* res = std::get_if<std::vector<Network::AddrInfo>>(&res_v)) {
-        const std::vector<u8> data = SerializeAddrInfo(*res, host);
-        const u32 data_size = u32(data.size());
-        ctx.WriteBuffer(data, 0);
-        return {data_size, GetAddrInfoError::SUCCESS};
+    auto res = Network::GetAddressInfo(host, service);
+    if (!res.has_value()) {
+        return {0, Translate(res.error())};
     }
-    auto* err = std::get_if<Network::GetAddrInfoError>(&res_v);
-    return {0, Translate(*err)};
+
+    const std::vector<u8> data = SerializeAddrInfo(res.value(), host);
+    const u32 data_size = static_cast<u32>(data.size());
+    ctx.WriteBuffer(data, 0);
+
+    return {data_size, GetAddrInfoError::SUCCESS};
 }
 
 void SFDNSRES::GetAddrInfoRequest(HLERequestContext& ctx) {

src/core/hle/service/ssl/ssl.cpp

@@ -160,26 +160,29 @@ private:
         auto bsd = system.ServiceManager().GetService<Service::Sockets::BSD>("bsd:u");
         ASSERT_OR_EXECUTE(bsd, { return ResultInternalError; });
 
-        auto const res_v = bsd->DuplicateSocketImpl(fd);
-        if (auto *res = std::get_if<s32>(&res_v)) {
-            const s32 duplicated_fd = *res;
-            if (do_not_close_socket) {
-                *out_fd = duplicated_fd;
-            } else {
-                *out_fd = -1;
-                fd_to_close = duplicated_fd;
-            }
-            std::optional<std::shared_ptr<Network::SocketBase>> sock = bsd->GetSocket(duplicated_fd);
-            if (!sock.has_value()) {
-                LOG_ERROR(Service_SSL, "invalid socket fd {} after duplication", duplicated_fd);
-                return ResultInvalidSocket;
-            }
-            socket = std::move(*sock);
-            backend->SetSocket(socket);
-            return ResultSuccess;
+        auto res = bsd->DuplicateSocketImpl(fd);
+        if (!res.has_value()) {
+            LOG_ERROR(Service_SSL, "Failed to duplicate socket with fd {}", fd);
+            return ResultInvalidSocket;
         }
-        LOG_ERROR(Service_SSL, "Failed to duplicate socket with fd {}", fd);
-        return ResultInvalidSocket;
+
+        const s32 duplicated_fd = *res;
+
+        if (do_not_close_socket) {
+            *out_fd = duplicated_fd;
+        } else {
+            *out_fd = -1;
+            fd_to_close = duplicated_fd;
+        }
+
+        std::optional<std::shared_ptr<Network::SocketBase>> sock = bsd->GetSocket(duplicated_fd);
+        if (!sock.has_value()) {
+            LOG_ERROR(Service_SSL, "invalid socket fd {} after duplication", duplicated_fd);
+            return ResultInvalidSocket;
+        }
+        socket = std::move(*sock);
+        backend->SetSocket(socket);
+        return ResultSuccess;
     }
 
     Result SetHostNameImpl(const std::string& hostname) {

src/core/internal_network/network.cpp

@@ -28,6 +28,7 @@
 
 #include "common/assert.h"
 #include "common/common_types.h"
+#include "common/expected.h"
 #include "common/logging.h"
 #include "common/settings.h"
 #include "core/internal_network/network.h"
@@ -732,14 +733,15 @@ u32 IPv4AddressToInteger(IPv4Address ip_addr) {
            static_cast<u32>(ip_addr[2]) << 8 | static_cast<u32>(ip_addr[3]);
 }
 
-std::variant<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo(
+Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo(
     const std::string& host, const std::optional<std::string>& service) {
     addrinfo hints{};
     hints.ai_family = AF_INET; // Switch only supports IPv4.
     addrinfo* addrinfo;
-    s32 gai_err = getaddrinfo(host.c_str(), service.has_value() ? service->c_str() : nullptr, &hints, &addrinfo);
+    s32 gai_err = getaddrinfo(host.c_str(), service.has_value() ? service->c_str() : nullptr,
+                              &hints, &addrinfo);
     if (gai_err != 0) {
-        return TranslateGetAddrInfoErrorFromNative(gai_err);
+        return Common::Unexpected(TranslateGetAddrInfoErrorFromNative(gai_err));
     }
     std::vector<AddrInfo> ret;
     for (auto* current = addrinfo; current; current = current->ai_next) {

src/core/internal_network/network.h

@@ -9,7 +9,6 @@
 #include <array>
 #include <optional>
 #include <vector>
-#include <variant>
 
 #include "common/common_funcs.h"
 #include "common/common_types.h"
@@ -125,6 +124,7 @@ std::string IPv4AddressToString(IPv4Address ip_addr);
 u32 IPv4AddressToInteger(IPv4Address ip_addr);
 
 // named to avoid name collision with Windows macro
-std::variant<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo(const std::string& host, const std::optional<std::string>& service);
+Common::Expected<std::vector<AddrInfo>, GetAddrInfoError> GetAddressInfo(
+    const std::string& host, const std::optional<std::string>& service);
 
 } // namespace Network

src/qt_common/config/shared_translation.cpp

@@ -229,8 +229,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
     INSERT(Settings, dma_accuracy, tr("DMA Accuracy:"),
            tr("Controls the DMA precision accuracy. Safe precision fixes issues in some games but "
               "may degrade performance."));
-    INSERT(Settings, enable_gpu_buffer_readback, tr("Enable GPU buffer readback"),
-           tr("Preserves GPU-modified buffer data by reading it back before uploads.\nSome games require this to render certain effects properly.\nMay cause issues if the hardware cannot handle the additional workload."));
     INSERT(Settings, use_asynchronous_shaders, tr("Enable asynchronous shader compilation"),
            tr("May reduce shader stutter."));
     INSERT(Settings, fast_gpu_time, tr("Fast GPU Time"),

src/video_core/buffer_cache/buffer_cache.h

@@ -1634,17 +1634,15 @@ bool BufferCache<P>::SynchronizeBuffer(Buffer& buffer, DAddr device_addr, u32 si
     if (total_size_bytes == 0) {
         return true;
     }
-    if (Settings::values.enable_gpu_buffer_readback.GetValue()) {
-        u64 min_offset = (std::numeric_limits<u64>::max)();
-        u64 max_offset = 0;
-        for (const auto& copy : upload_copies) {
-            min_offset = (std::min)(min_offset, copy.dst_offset);
-            max_offset = (std::max)(max_offset, copy.dst_offset + copy.size);
-        }
-        const DAddr sync_addr = buffer.CpuAddr() + min_offset;
-        const u64 sync_size = max_offset - min_offset;
-        DownloadBufferMemory(buffer, sync_addr, sync_size);
+    u64 min_offset = (std::numeric_limits<u64>::max)();
+    u64 max_offset = 0;
+    for (const auto& copy : upload_copies) {
+        min_offset = (std::min)(min_offset, copy.dst_offset);
+        max_offset = (std::max)(max_offset, copy.dst_offset + copy.size);
     }
+    const DAddr sync_addr = buffer.CpuAddr() + min_offset;
+    const u64 sync_size = max_offset - min_offset;
+    DownloadBufferMemory(buffer, sync_addr, sync_size);
     const std::span<BufferCopy> copies_span(upload_copies.data(), upload_copies.size());
     UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);
     any_buffer_uploaded = true;

src/video_core/engines/draw_manager.cpp

@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <cstring>
-
 #include "common/settings.h"
 #include "video_core/dirty_flags.h"
 #include "video_core/engines/maxwell_3d.h"
@@ -132,44 +130,6 @@ void Maxwell3D::DrawManager::SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 inde
     draw_state.draw_mode = DrawMode::InlineIndex;
 }
 
-void Maxwell3D::DrawManager::SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 method,
-                                                  const u32* base_start, u32 amount) {
-    auto& index_buffer = draw_state.inline_index_draw_indexes;
-    switch (method) {
-    case MAXWELL3D_REG_INDEX(draw_inline_index): {
-        const auto* const bytes = reinterpret_cast<const u8*>(base_start);
-        index_buffer.insert(index_buffer.end(), bytes, bytes + size_t(amount) * sizeof(u32));
-        break;
-    }
-    case MAXWELL3D_REG_INDEX(inline_index_2x16.even): {
-        const size_t offset = index_buffer.size();
-        index_buffer.resize(offset + size_t(amount) * 2 * sizeof(u32));
-        u8* dst = index_buffer.data() + offset;
-        for (u32 i = 0; i < amount; ++i) {
-            const u32 word = base_start[i];
-            const u32 indexes[2]{word & 0xFFFF, word >> 16};
-            std::memcpy(dst, indexes, sizeof(indexes));
-            dst += sizeof(indexes);
-        }
-        break;
-    }
-    case MAXWELL3D_REG_INDEX(inline_index_4x8.index0): {
-        const size_t offset = index_buffer.size();
-        index_buffer.resize(offset + size_t(amount) * 4 * sizeof(u32));
-        u8* dst = index_buffer.data() + offset;
-        for (u32 i = 0; i < amount; ++i) {
-            const u32 word = base_start[i];
-            const u32 indexes[4]{word & 0xFF, (word >> 8) & 0xFF, (word >> 16) & 0xFF,
-                                 word >> 24};
-            std::memcpy(dst, indexes, sizeof(indexes));
-            dst += sizeof(indexes);
-        }
-        break;
-    }
-    }
-    draw_state.draw_mode = DrawMode::InlineIndex;
-}
-
 void Maxwell3D::DrawManager::DrawBegin(Maxwell3D& maxwell3d) {
     auto reset_instance_count = maxwell3d.regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First;
     auto increment_instance_count = maxwell3d.regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent;

src/video_core/engines/maxwell_3d.cpp

@@ -208,6 +208,9 @@ void Maxwell3D::ProcessMacro(Core::System& system, u32 method, const u32* base_s
     }
 
     macro_params.insert(macro_params.end(), base_start, base_start + amount);
+    for (size_t i = 0; i < amount; i++) {
+        macro_addresses.push_back(current_dma_segment + i * sizeof(u32));
+    }
     macro_segments.emplace_back(current_dma_segment, amount);
     current_macro_dirty |= current_dirty;
     current_dirty = false;
@@ -217,6 +220,7 @@ void Maxwell3D::ProcessMacro(Core::System& system, u32 method, const u32* base_s
         ConsumeSink(system);
         CallMacroMethod(system, executing_macro, macro_params);
         macro_params.clear();
+        macro_addresses.clear();
         macro_segments.clear();
         current_macro_dirty = false;
     }
@@ -436,14 +440,6 @@ void Maxwell3D::CallMultiMethod(Core::System& system, u32 method, const u32* bas
         upload_state.ProcessData(base_start, amount);
         return;
     }
-    case MAXWELL3D_REG_INDEX(draw_inline_index):
-    case MAXWELL3D_REG_INDEX(inline_index_2x16.even):
-    case MAXWELL3D_REG_INDEX(inline_index_4x8.index0):
-        if (shadow_state.shadow_ram_control != Regs::ShadowRamControl::Replay) {
-            ProcessInlineIndexMultiData(method, base_start, amount);
-            break;
-        }
-        [[fallthrough]];
     default:
         for (u32 i = 0; i < amount; i++) {
             CallMethod(system, method, base_start[i], methods_pending - i <= 1);
@@ -630,15 +626,6 @@ void Maxwell3D::ProcessCBData(u32 value) {
     ProcessCBMultiData(&value, 1);
 }
 
-void Maxwell3D::ProcessInlineIndexMultiData(u32 method, const u32* start_base, u32 amount) {
-    if (amount == 0) {
-        return;
-    }
-    const u32 argument = ProcessShadowRam(method, start_base[amount - 1]);
-    ProcessDirtyRegisters(method, argument);
-    draw_manager.SetInlineIndexBuffer(*this, method, start_base, amount);
-}
-
 Texture::TICEntry Maxwell3D::GetTICEntry(u32 tic_index) const {
     const GPUVAddr tic_address_gpu{regs.tex_header.Address() +
                                    tic_index * sizeof(Texture::TICEntry)};

src/video_core/engines/maxwell_3d.h

@@ -3077,7 +3077,6 @@ public:
         void DrawArrayIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology);
         void DrawIndexedIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 index_first, u32 index_count);
         void SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 index);
-        void SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 method, const u32* base_start, u32 amount);
         void DrawBegin(Maxwell3D& maxwell3d);
         void DrawEnd(Maxwell3D& maxwell3d, u32 instance_count = 1, bool force_draw = false);
         void DrawIndexSmall(Maxwell3D& maxwell3d, u32 argument);
@@ -3159,14 +3158,7 @@ public:
     DrawManager draw_manager;
 
     GPUVAddr GetMacroAddress(size_t index) const {
-        size_t base = 0;
-        for (const auto& [addr, count] : macro_segments) {
-            if (index < base + count) {
-                return addr + (index - base) * sizeof(u32);
-            }
-            base += count;
-        }
-        return 0;
+        return macro_addresses[index];
     }
 
     void RefreshParameters() {
@@ -3194,8 +3186,6 @@ public:
     void ProcessCBData(u32 value);
     void ProcessCBMultiData(const u32* start_base, u32 amount);
 
-    void ProcessInlineIndexMultiData(u32 method, const u32* start_base, u32 amount);
-
 private:
     void InitializeRegisterDefaults();
 
@@ -3271,6 +3261,7 @@ private:
     bool execute_on{true};
 
     std::vector<std::pair<GPUVAddr, size_t>> macro_segments;
+    std::vector<GPUVAddr> macro_addresses;
     bool current_macro_dirty{};
 };
 

src/video_core/gpu_logging/gpu_logging.cpp

@@ -4,7 +4,6 @@
 #include "video_core/gpu_logging/gpu_logging.h"
 
 #include <fmt/format.h>
-#include <mutex>
 #include <thread>
 
 #include "common/fs/file.h"
@@ -281,12 +280,13 @@ void GPULogger::LogMemoryDeallocation(uintptr_t memory) {
 }
 
 void GPULogger::LogShaderCompilation(const std::string& shader_name,
-                                     const std::string& shader_info) {
+                                     const std::string& shader_info,
+                                     std::span<const u32> spirv_code) {
     if (!initialized || current_level == LogLevel::Off) {
         return;
     }
 
-    if (current_level < LogLevel::Verbose) {
+    if (!dump_shaders && current_level < LogLevel::Verbose) {
         return;
     }
 
@@ -294,36 +294,38 @@ void GPULogger::LogShaderCompilation(const std::string& shader_name,
         std::chrono::steady_clock::now().time_since_epoch());
 
     const auto log_entry = fmt::format("[{}] [Shader] Compiled: {} ({})\n",
-                                       FormatTimestamp(timestamp), shader_name, shader_info);
+                                      FormatTimestamp(timestamp), shader_name, shader_info);
     WriteToLog(log_entry);
-}
 
-bool IsActive() noexcept {
-    return Settings::values.gpu_log_level.GetValue() != Settings::GpuLogLevel::Off;
-}
+    // Dump SPIR-V binary if enabled and we have data
+    if (dump_shaders && !spirv_code.empty()) {
+        using namespace Common::FS;
+        const auto& log_dir = GetEdenPath(EdenPath::LogDir);
+        const auto shaders_dir = log_dir / "shaders";
 
-void DumpSpirvShader(u64 shader_hash, std::span<const u32> spirv_code) {
-    if (spirv_code.empty()) {
-        return;
+        // Create directory on first dump
+        if (!shader_dump_dir_created) {
+            [[maybe_unused]] const bool created = CreateDir(shaders_dir);
+            shader_dump_dir_created = true;
+        }
+
+        // Write SPIR-V binary file
+        const auto shader_path = shaders_dir / fmt::format("{}.spv", shader_name);
+        auto shader_file = std::make_unique<Common::FS::IOFile>(
+            shader_path, FileAccessMode::Write, FileType::BinaryFile);
+
+        if (shader_file->IsOpen()) {
+            const size_t bytes_to_write = spirv_code.size() * sizeof(u32);
+            static_cast<void>(shader_file->WriteSpan(spirv_code));
+            shader_file->Close();
+
+            const auto dump_log = fmt::format("[{}] [Shader] Dumped SPIR-V: {} ({} bytes)\n",
+                FormatTimestamp(timestamp), shader_path.string(), bytes_to_write);
+            WriteToLog(dump_log);
+        } else {
+            LOG_WARNING(Render_Vulkan, "[GPU Logging] Failed to dump shader: {}", shader_path.string());
+        }
     }
-
-    using namespace Common::FS;
-    const auto& dump_dir = GetEdenPath(EdenPath::DumpDir);
-
-    // Ensure DumpDir exists once. CreateDir is idempotent, so guarded to skip the syscall.
-    static std::once_flag dump_dir_flag;
-    std::call_once(dump_dir_flag, [&dump_dir]() {
-        [[maybe_unused]] const bool created = CreateDir(dump_dir);
-    });
-
-    const auto shader_path = dump_dir / fmt::format("{:016x}_{:016x}.spv",
-                                                    Settings::GetCurrentProgramID(), shader_hash);
-    Common::FS::IOFile shader_file(shader_path, FileAccessMode::Write, FileType::BinaryFile);
-    if (!shader_file.IsOpen()) {
-        LOG_WARNING(Render_Vulkan, "[Shader Dump] Failed to open {}", shader_path.string());
-        return;
-    }
-    static_cast<void>(shader_file.WriteSpan(spirv_code));
 }
 
 void GPULogger::LogPipelineStateChange(const std::string& state_info) {
@@ -655,6 +657,10 @@ void GPULogger::EnableVulkanCallTracking(bool enabled) {
     track_vulkan_calls = enabled;
 }
 
+void GPULogger::EnableShaderDumps(bool enabled) {
+    dump_shaders = enabled;
+}
+
 void GPULogger::EnableMemoryTracking(bool enabled) {
     track_memory = enabled;
 }

src/video_core/gpu_logging/gpu_logging.h

@@ -87,7 +87,8 @@ public:
     void LogVulkanCall(const std::string& call_name, const std::string& params, int result);
     void LogMemoryAllocation(uintptr_t memory, u64 size, u32 memory_flags);
     void LogMemoryDeallocation(uintptr_t memory);
-    void LogShaderCompilation(const std::string& shader_name, const std::string& shader_info);
+    void LogShaderCompilation(const std::string& shader_name, const std::string& shader_info,
+                              std::span<const u32> spirv_code = {});
     void LogPipelineStateChange(const std::string& state_info);
     void LogDriverDebugInfo(const std::string& debug_info);
 
@@ -120,6 +121,7 @@ public:
     // Settings
     void SetLogLevel(LogLevel level);
     void EnableVulkanCallTracking(bool enabled);
+    void EnableShaderDumps(bool enabled);
     void EnableMemoryTracking(bool enabled);
     void EnableDriverDebugInfo(bool enabled);
     void SetRingBufferSize(size_t entries);
@@ -169,6 +171,7 @@ private:
 
     // Feature flags
     bool track_vulkan_calls = true;
+    bool dump_shaders = false;
     bool track_memory = false;
     bool capture_driver_debug = false;
 
@@ -176,16 +179,15 @@ private:
     std::set<std::string> used_extensions;
     mutable std::mutex extension_mutex;
 
+    // Shader dump directory (created on demand)
+    bool shader_dump_dir_created = false;
+
     // Stored state for crash dumps
     std::string stored_driver_debug_info;
     std::string stored_pipeline_state;
     mutable std::mutex state_mutex;
 };
 
-[[nodiscard]] bool IsActive() noexcept;
-
-void DumpSpirvShader(u64 shader_hash, std::span<const u32> spirv_code);
-
 // Helper to get stage name from index
 inline const char* GetShaderStageName(size_t stage_index) {
     static constexpr std::array<const char*, 5> stage_names{

src/video_core/macro.cpp

@@ -1328,14 +1328,22 @@ Macro::Opcode MacroJITx64Impl::GetOpCode() const {
 #endif
 
 static void Dump(u64 hash, std::span<const u32> code, bool decompiled = false) {
-    const auto dump_dir{Common::FS::GetEdenPath(Common::FS::EdenPath::DumpDir)};
-    if (!Common::FS::CreateDir(dump_dir)) {
-        LOG_ERROR(Common_Filesystem, "Failed to create dump directory");
+    const auto base_dir{Common::FS::GetEdenPath(Common::FS::EdenPath::DumpDir)};
+    const auto macro_dir{base_dir / "macros"};
+    if (!Common::FS::CreateDir(base_dir) || !Common::FS::CreateDir(macro_dir)) {
+        LOG_ERROR(Common_Filesystem, "Failed to create macro dump directories");
         return;
     }
-    const char* const variant_suffix = decompiled ? "jit" : "raw";
-    const auto name{dump_dir / fmt::format("{:016x}_{:016x}_{}.macro",
-                                           Settings::GetCurrentProgramID(), hash, variant_suffix)};
+    auto name{macro_dir / fmt::format("{:016x}.macro", hash)};
+
+    if (decompiled) {
+        auto new_name{macro_dir / fmt::format("decompiled_{:016x}.macro", hash)};
+        if (Common::FS::Exists(name)) {
+            (void)Common::FS::RenameFile(name, new_name);
+            return;
+        }
+        name = new_name;
+    }
 
     std::fstream macro_file(name, std::ios::out | std::ios::binary);
     if (!macro_file) {
@@ -1348,33 +1356,33 @@ static void Dump(u64 hash, std::span<const u32> code, bool decompiled = false) {
 void MacroEngine::Execute(Core::System& system, Engines::Maxwell3D& maxwell3d, u32 method, std::span<const u32> parameters) {
     auto const execute_variant = [&system, &maxwell3d, &parameters, method](AnyCachedMacro& acm) {
         if (auto a = std::get_if<HLE_DrawArraysIndirect>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_DrawIndexedIndirect>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_MultiDrawIndexedIndirectCount>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_MultiLayerClear>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_C713C83D8F63CCF3>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_D7333D26E0A93EDE>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_BindShader>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_SetRasterBoundingBox>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_ClearConstBuffer>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_ClearMemory>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_TransformFeedbackSetup>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<HLE_DrawIndirectByteCount>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<MacroInterpreterImpl>(&acm))
-            return a->Execute(system, maxwell3d, parameters, method);
+            a->Execute(system, maxwell3d, parameters, method);
         if (auto a = std::get_if<std::unique_ptr<DynamicCachedMacro>>(&acm))
-            return a->get()->Execute(system, maxwell3d, parameters, method);
+            a->get()->Execute(system, maxwell3d, parameters, method);
     };
     if (auto const it = macro_cache.find(method); it != macro_cache.end()) {
         auto& ci = it->second;

src/video_core/renderer_opengl/gl_shader_cache.cpp

@@ -54,7 +54,7 @@ using VideoCommon::LoadPipelines;
 using VideoCommon::SerializePipeline;
 using Context = ShaderContext::Context;
 
-constexpr u32 CACHE_VERSION = 16;
+constexpr u32 CACHE_VERSION = 15;
 
 template <typename Container>
 auto MakeSpan(Container& container) {
@@ -481,7 +481,7 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
         const u32 cfg_offset = u32(env.StartAddress() + sizeof(Shader::ProgramHeader));
         Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset, index == 0);
 
-        if (Settings::values.dump_guest_shaders) {
+        if (Settings::values.dump_shaders) {
             env.Dump(hash, key.unique_hashes[index]);
         }
 
@@ -578,7 +578,7 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
 
     Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()};
 
-    if (Settings::values.dump_guest_shaders) {
+    if (Settings::values.dump_shaders) {
         env.Dump(hash, key.unique_hash);
     }
 

src/video_core/renderer_vulkan/vk_compute_pipeline.cpp

@@ -87,7 +87,7 @@ ComputePipeline::ComputePipeline(const Device& device_, Scheduler& scheduler, vk
         }, *pipeline_cache);
 
         // Log compute pipeline creation
-        if (GPU::Logging::IsActive()) {
+        if (Settings::values.gpu_logging_enabled.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogPipelineStateChange(
                 "ComputePipeline created"
             );
@@ -223,7 +223,7 @@ void ComputePipeline::Configure(Tegra::Engines::KeplerCompute& kepler_compute,
     }
 
     // Log compute pipeline binding
-    if (GPU::Logging::IsActive() &&
+    if (Settings::values.gpu_logging_enabled.GetValue() &&
         Settings::values.gpu_log_vulkan_calls.GetValue()) {
         GPU::Logging::GPULogger::GetInstance().LogPipelineBind(true, "compute pipeline");
     }

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -532,7 +532,7 @@ void GraphicsPipeline::ConfigureDraw(const RescalingPushConstant& rescaling,
     const bool bind_pipeline{scheduler.UpdateGraphicsPipeline(this)};
 
     // Log graphics pipeline binding
-    if (bind_pipeline && GPU::Logging::IsActive() &&
+    if (bind_pipeline && Settings::values.gpu_logging_enabled.GetValue() &&
         Settings::values.gpu_log_vulkan_calls.GetValue()) {
         const std::string pipeline_info = fmt::format("hash=0x{:016x}", key.Hash());
         GPU::Logging::GPULogger::GetInstance().LogPipelineBind(false, pipeline_info);
@@ -986,7 +986,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
     }, *pipeline_cache);
 
     // Log graphics pipeline creation
-    if (GPU::Logging::IsActive()) {
+    if (Settings::values.gpu_logging_enabled.GetValue()) {
         const std::string pipeline_info = fmt::format(
             "GraphicsPipeline created: stages={}, attachments={}",
             shader_stages.size(),

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -62,7 +62,7 @@ using VideoCommon::FileEnvironment;
 using VideoCommon::GenericEnvironment;
 using VideoCommon::GraphicsEnvironment;
 
-constexpr u32 CACHE_VERSION = 18;
+constexpr u32 CACHE_VERSION = 17;
 constexpr std::array<char, 8> VULKAN_CACHE_MAGIC_NUMBER{'y', 'u', 'z', 'u', 'v', 'k', 'c', 'h'};
 
 template <typename Container>
@@ -751,7 +751,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
             programs[index] = MergeDualVertexPrograms(program_va, program_vb, env);
         }
 
-        if (Settings::values.dump_guest_shaders) {
+        if (Settings::values.dump_shaders) {
             env.Dump(hash, key.unique_hashes[index]);
         }
 
@@ -783,22 +783,14 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
         device.SaveShader(code);
         modules[stage_index] = BuildShader(device, code);
 
-        // Text log + .spv dump. Text log is gated by gpu_log_level != Off; .spv dump
-        // is independent and gated only by gpu_log_shader_dumps.
-        const bool should_log = GPU::Logging::IsActive();
-        const bool should_dump = Settings::values.gpu_log_shader_dumps.GetValue();
-        if (should_log || should_dump) {
+        // Log shader compilation to GPU logger (with SPIR-V binary dump if enabled)
+        if (Settings::values.gpu_logging_enabled.GetValue()) {
             static constexpr std::array stage_names{"vertex", "tess_control", "tess_eval", "geometry", "fragment"};
             const std::string shader_name = fmt::format("shader_{:016x}_{}", key.unique_hashes[index], stage_names[stage_index]);
-            if (should_log) {
-                const std::string shader_info = fmt::format("SPIR-V size: {} bytes, hash: {:016x}",
-                    code.size() * sizeof(u32), key.unique_hashes[index]);
-                GPU::Logging::GPULogger::GetInstance().LogShaderCompilation(shader_name, shader_info);
-            }
-            if (should_dump) {
-                GPU::Logging::DumpSpirvShader(key.unique_hashes[index],
-                                              std::span<const u32>(code.data(), code.size()));
-            }
+            const std::string shader_info = fmt::format("SPIR-V size: {} bytes, hash: {:016x}",
+                code.size() * sizeof(u32), key.unique_hashes[index]);
+            GPU::Logging::GPULogger::GetInstance().LogShaderCompilation(shader_name, shader_info,
+                std::span<const u32>(code.data(), code.size()));
         }
 
         if (device.HasDebuggingToolAttached()) {
@@ -887,7 +879,7 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
     Shader::Maxwell::Flow::CFG cfg{env, pools.flow_block, env.StartAddress()};
 
     // Dump it before error.
-    if (Settings::values.dump_guest_shaders) {
+    if (Settings::values.dump_shaders) {
         env.Dump(hash, key.unique_hash);
     }
 
@@ -909,20 +901,13 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
     device.SaveShader(code);
     vk::ShaderModule spv_module{BuildShader(device, code)};
 
-    // Text log + .spv dump. Same split as the graphics path.
-    const bool should_log = GPU::Logging::IsActive();
-    const bool should_dump = Settings::values.gpu_log_shader_dumps.GetValue();
-    if (should_log || should_dump) {
+    // Log compute shader compilation to GPU logger (with SPIR-V binary dump if enabled)
+    if (Settings::values.gpu_logging_enabled.GetValue()) {
         const std::string shader_name = fmt::format("shader_{:016x}_compute", key.unique_hash);
-        if (should_log) {
-            const std::string shader_info = fmt::format("SPIR-V size: {} bytes, hash: {:016x}",
-                code.size() * sizeof(u32), key.unique_hash);
-            GPU::Logging::GPULogger::GetInstance().LogShaderCompilation(shader_name, shader_info);
-        }
-        if (should_dump) {
-            GPU::Logging::DumpSpirvShader(key.unique_hash,
-                                          std::span<const u32>(code.data(), code.size()));
-        }
+        const std::string shader_info = fmt::format("SPIR-V size: {} bytes, hash: {:016x}",
+            code.size() * sizeof(u32), key.unique_hash);
+        GPU::Logging::GPULogger::GetInstance().LogShaderCompilation(shader_name, shader_info,
+            std::span<const u32>(code.data(), code.size()));
     }
 
     if (device.HasDebuggingToolAttached()) {

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -270,7 +270,7 @@ void RasterizerVulkan::Draw(bool is_indexed, u32 instance_count) {
         });
 
         // Log draw call
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_vulkan_calls.GetValue()) {
             const std::string params = is_indexed ?
                 fmt::format("vertices={}, instances={}, firstIndex={}, baseVertex={}, baseInstance={}",
@@ -331,7 +331,7 @@ void RasterizerVulkan::DrawIndirect() {
         });
 
         // Log indirect draw call
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_vulkan_calls.GetValue()) {
             const std::string log_params = fmt::format("drawCount={}, stride={}",
                 params.max_draw_counts, params.stride);
@@ -585,7 +585,7 @@ void RasterizerVulkan::DispatchCompute() {
     scheduler.Record([dim](vk::CommandBuffer cmdbuf) { cmdbuf.Dispatch(dim[0], dim[1], dim[2]); });
 
     // Log compute dispatch
-    if (GPU::Logging::IsActive() &&
+    if (Settings::values.gpu_logging_enabled.GetValue() &&
         Settings::values.gpu_log_vulkan_calls.GetValue()) {
         const std::string params = fmt::format("groupCountX={}, groupCountY={}, groupCountZ={}",
             dim[0], dim[1], dim[2]);
@@ -1110,7 +1110,7 @@ void RasterizerVulkan::HandleTransformFeedback() {
                               regs.transform_feedback_enabled);
     if (regs.transform_feedback_enabled != 0) {
         // Log extension usage for transform feedback
-        if (GPU::Logging::IsActive()) {
+        if (Settings::values.gpu_logging_enabled.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogExtensionUsage(
                 "VK_EXT_transform_feedback", "HandleTransformFeedback");
         }

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -181,7 +181,7 @@ void Scheduler::RequestRenderpass(const Framebuffer* framebuffer) {
     state.render_area = render_area;
 
     // Log render pass begin
-    if (GPU::Logging::IsActive() &&
+    if (Settings::values.gpu_logging_enabled.GetValue() &&
         Settings::values.gpu_log_vulkan_calls.GetValue()) {
         const std::string render_pass_info = fmt::format(
             "renderArea={}x{}, numImages={}",
@@ -279,7 +279,7 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_se
             .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
             .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
         };
-        upload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);
+        upload_cmdbuf.PipelineBarrier(vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, WRITE_BARRIER);
         upload_cmdbuf.End();
         cmdbuf.End();
 
@@ -292,7 +292,7 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_se
                     cmdbuf, upload_cmdbuf, signal_semaphore, wait_semaphore, signal_value)) {
         case VK_SUCCESS:
             // Log successful queue submission
-            if (GPU::Logging::IsActive() &&
+            if (Settings::values.gpu_logging_enabled.GetValue() &&
                 Settings::values.gpu_log_vulkan_calls.GetValue()) {
                 GPU::Logging::GPULogger::GetInstance().LogVulkanCall(
                     "vkQueueSubmit", "", VK_SUCCESS);
@@ -335,7 +335,7 @@ void Scheduler::EndRenderPass()
         query_cache->CounterClose(VideoCommon::QueryType::StreamingByteCount);
 
         // Log render pass end
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_vulkan_calls.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogRenderPassEnd();
         }

src/video_core/renderer_vulkan/vk_texture_cache.cpp

@@ -2332,7 +2332,7 @@ Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& t
     if (has_custom_border_colors) {
         pnext = &border_ci;
         // Log extension usage for custom border color
-        if (GPU::Logging::IsActive()) {
+        if (Settings::values.gpu_logging_enabled.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogExtensionUsage(
                 "VK_EXT_custom_border_color", "Sampler::Sampler");
         }

src/video_core/shader_environment.cpp

@@ -18,7 +18,6 @@
 #include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/logging.h"
-#include "common/settings.h"
 #include <ranges>
 #include "shader_recompiler/environment.h"
 #include "video_core/engines/kepler_compute.h"
@@ -74,36 +73,36 @@ static Shader::TexturePixelFormat ConvertTexturePixelFormat(const Tegra::Texture
 static std::string_view StageToPrefix(Shader::Stage stage) {
     switch (stage) {
     case Shader::Stage::VertexB:
-        return "vs";
+        return "VB";
     case Shader::Stage::TessellationControl:
-        return "tc";
+        return "TC";
     case Shader::Stage::TessellationEval:
-        return "te";
+        return "TE";
     case Shader::Stage::Geometry:
-        return "gs";
+        return "GS";
     case Shader::Stage::Fragment:
-        return "fs";
+        return "FS";
     case Shader::Stage::Compute:
-        return "cs";
+        return "CS";
     case Shader::Stage::VertexA:
-        return "va";
+        return "VA";
     default:
-        return "uk";
+        return "UK";
     }
 }
 
-static void DumpImpl(u64 /*pipeline_hash*/, u64 shader_hash, std::span<const u64> code,
+static void DumpImpl(u64 pipeline_hash, u64 shader_hash, std::span<const u64> code,
                      [[maybe_unused]] u32 read_highest, [[maybe_unused]] u32 read_lowest,
                      u32 initial_offset, Shader::Stage stage) {
-    const auto dump_dir{Common::FS::GetEdenPath(Common::FS::EdenPath::DumpDir)};
-    if (!Common::FS::CreateDir(dump_dir)) {
-        LOG_ERROR(Common_Filesystem, "Failed to create dump directory");
+    const auto shader_dir{Common::FS::GetEdenPath(Common::FS::EdenPath::DumpDir)};
+    const auto base_dir{shader_dir / "shaders"};
+    if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir)) {
+        LOG_ERROR(Common_Filesystem, "Failed to create shader dump directories");
         return;
     }
     const auto prefix = StageToPrefix(stage);
-    const auto name{dump_dir /
-                    fmt::format("{:016x}_{:016x}_{}.ash",
-                                Settings::GetCurrentProgramID(), shader_hash, prefix)};
+    const auto name{base_dir /
+                    fmt::format("{:016x}_{}_{:016x}.ash", pipeline_hash, prefix, shader_hash)};
     std::fstream shader_file(name, std::ios::out | std::ios::binary);
     ASSERT(initial_offset % sizeof(u64) == 0);
     const size_t jump_index = initial_offset / sizeof(u64);

src/video_core/vulkan_common/vulkan_debug_callback.cpp

@@ -76,7 +76,7 @@ VkBool32 DebugUtilCallback(VkDebugUtilsMessageSeverityFlagBitsEXT severity,
     }
 
     // Route to GPU logger for tracking Vulkan validation messages
-    if (GPU::Logging::IsActive() &&
+    if (Settings::values.gpu_logging_enabled.GetValue() &&
         Settings::values.gpu_log_vulkan_calls.GetValue()) {
         // Convert severity to result code for logging (negative = error)
         int result_code = 0;

src/video_core/vulkan_common/vulkan_device.cpp

@@ -1518,10 +1518,7 @@ std::vector<VkDeviceQueueCreateInfo> Device::GetDeviceQueueCreateInfos() const {
 }
 
 void Device::InitializeGPULogging() {
-    // Get log level from settings — Off is the disable.
-    const auto log_level = static_cast<GPU::Logging::LogLevel>(
-        static_cast<u32>(Settings::values.gpu_log_level.GetValue()));
-    if (log_level == GPU::Logging::LogLevel::Off) {
+    if (!Settings::values.gpu_logging_enabled.GetValue()) {
         return;
     }
 
@@ -1535,12 +1532,18 @@ void Device::InitializeGPULogging() {
         detected_driver = GPU::Logging::DriverType::Qualcomm;
     }
 
+    // Get log level from settings
+    const auto log_level = static_cast<GPU::Logging::LogLevel>(
+        static_cast<u32>(Settings::values.gpu_log_level.GetValue()));
+
     // Initialize GPU logger
     GPU::Logging::GPULogger::GetInstance().Initialize(log_level, detected_driver);
 
     // Configure feature flags
     GPU::Logging::GPULogger::GetInstance().EnableVulkanCallTracking(
         Settings::values.gpu_log_vulkan_calls.GetValue());
+    GPU::Logging::GPULogger::GetInstance().EnableShaderDumps(
+        Settings::values.gpu_log_shader_dumps.GetValue());
     GPU::Logging::GPULogger::GetInstance().EnableMemoryTracking(
         Settings::values.gpu_log_memory_tracking.GetValue());
     GPU::Logging::GPULogger::GetInstance().EnableDriverDebugInfo(

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -111,7 +111,7 @@ namespace Vulkan {
             : allocator{alloc}, allocation{a}, memory{info.deviceMemory},
               offset{info.offset}, size{info.size}, mapped_ptr{info.pMappedData} {
         // Log GPU memory allocation
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_memory_tracking.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
                 reinterpret_cast<uintptr_t>(memory),
@@ -179,7 +179,7 @@ namespace Vulkan {
     void MemoryCommit::Release() {
         if (allocation && allocator) {
             // Log GPU memory deallocation
-            if (GPU::Logging::IsActive() &&
+            if (Settings::values.gpu_logging_enabled.GetValue() &&
                 Settings::values.gpu_log_memory_tracking.GetValue() &&
                 memory != VK_NULL_HANDLE) {
                 GPU::Logging::GPULogger::GetInstance().LogMemoryDeallocation(
@@ -243,7 +243,7 @@ namespace Vulkan {
         vk::Check(vmaCreateImage(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));
 
         // Log GPU memory allocation for images
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_memory_tracking.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
                 reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),
@@ -281,7 +281,7 @@ namespace Vulkan {
         vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);
 
         // Log GPU memory allocation for buffers
-        if (GPU::Logging::IsActive() &&
+        if (Settings::values.gpu_logging_enabled.GetValue() &&
             Settings::values.gpu_log_memory_tracking.GetValue()) {
             GPU::Logging::GPULogger::GetInstance().LogMemoryAllocation(
                 reinterpret_cast<uintptr_t>(alloc_info.deviceMemory),

src/yuzu/configuration/configure_debug.cpp

@@ -81,8 +81,8 @@ void ConfigureDebug::SetConfiguration() {
     ui->enable_shader_feedback->setChecked(Settings::values.renderer_shader_feedback.GetValue());
     ui->enable_nsight_aftermath->setEnabled(runtime_lock);
     ui->enable_nsight_aftermath->setChecked(Settings::values.enable_nsight_aftermath.GetValue());
-    ui->dump_guest_shaders->setEnabled(runtime_lock);
-    ui->dump_guest_shaders->setChecked(Settings::values.dump_guest_shaders.GetValue());
+    ui->dump_shaders->setEnabled(runtime_lock);
+    ui->dump_shaders->setChecked(Settings::values.dump_shaders.GetValue());
     ui->dump_macros->setEnabled(runtime_lock);
     ui->dump_macros->setChecked(Settings::values.dump_macros.GetValue());
     ui->disable_macro_jit->setEnabled(runtime_lock);
@@ -94,12 +94,6 @@ void ConfigureDebug::SetConfiguration() {
         Settings::values.disable_shader_loop_safety_checks.GetValue());
     ui->perform_vulkan_check->setChecked(Settings::values.perform_vulkan_check.GetValue());
     ui->debug_knobs_spinbox->setValue(Settings::values.debug_knobs.GetValue());
-
-    ui->gpu_log_level->setEnabled(runtime_lock);
-    ui->gpu_log_level->setCurrentIndex(
-        static_cast<int>(Settings::values.gpu_log_level.GetValue()));
-    ui->gpu_log_shader_dumps->setEnabled(runtime_lock);
-    ui->gpu_log_shader_dumps->setChecked(Settings::values.gpu_log_shader_dumps.GetValue());
 #ifdef YUZU_USE_QT_WEB_ENGINE
     ui->disable_web_applet->setChecked(Settings::values.disable_web_applet.GetValue());
 #else
@@ -129,7 +123,7 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.disable_buffer_reorder = ui->disable_buffer_reorder->isChecked();
     Settings::values.renderer_shader_feedback = ui->enable_shader_feedback->isChecked();
     Settings::values.enable_nsight_aftermath = ui->enable_nsight_aftermath->isChecked();
-    Settings::values.dump_guest_shaders = ui->dump_guest_shaders->isChecked();
+    Settings::values.dump_shaders = ui->dump_shaders->isChecked();
     Settings::values.dump_macros = ui->dump_macros->isChecked();
     Settings::values.disable_shader_loop_safety_checks =
         ui->disable_loop_safety_checks->isChecked();
@@ -141,9 +135,6 @@ void ConfigureDebug::ApplyConfiguration() {
     Settings::values.serial_battery = ui->serial_battery_edit->text().toUInt();
     Settings::values.serial_unit = ui->serial_board_edit->text().toUInt();
     Settings::values.debug_knobs = ui->debug_knobs_spinbox->value();
-    Settings::values.gpu_log_level =
-        static_cast<Settings::GpuLogLevel>(ui->gpu_log_level->currentIndex());
-    Settings::values.gpu_log_shader_dumps = ui->gpu_log_shader_dumps->isChecked();
     Debugger::ToggleConsole();
     Common::Log::Filter filter;
     filter.ParseFilterString(Settings::values.log_filter.GetValue());

src/yuzu/configuration/configure_debug.ui

@@ -157,7 +157,7 @@
          <string>Logging</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_1">
-         <item row="0" column="0" colspan="4">
+         <item row="0" column="0" colspan="2">
           <widget class="QWidget" name="logging_widget" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -197,77 +197,7 @@
            </layout>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QWidget" name="gpu_log_level_widget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="gpu_log_level_layout">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="gpu_log_level_label">
-              <property name="text">
-               <string>GPU Logging/Level</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="gpu_log_level">
-              <property name="toolTip">
-               <string>Detail level for GPU logs. Off disables logging entirely.</string>
-              </property>
-              <item>
-               <property name="text">
-                <string>Off</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Errors</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Standard</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>Verbose</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>All</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="toggle_console">
-           <property name="text">
-            <string>Show Log in Console</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
+         <item row="2" column="0">
           <widget class="QCheckBox" name="extended_logging">
            <property name="enabled">
             <bool>true</bool>
@@ -280,20 +210,15 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="3">
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="toggle_console">
+           <property name="text">
+            <string>Show Log in Console</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
           <widget class="QPushButton" name="open_log_button">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
-             <horstretch>1</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>250</width>
-             <height>0</height>
-            </size>
-           </property>
            <property name="text">
             <string>Open Log Location</string>
            </property>
@@ -345,7 +270,7 @@
            </property>
           </widget>
          </item>
-         <item row="9" column="0">
+         <item row="8" column="0">
           <widget class="QCheckBox" name="dump_macros">
            <property name="enabled">
             <bool>true</bool>
@@ -369,15 +294,15 @@
           </widget>
          </item>
          <item row="6" column="0">
-          <widget class="QCheckBox" name="dump_guest_shaders">
+          <widget class="QCheckBox" name="dump_shaders">
            <property name="enabled">
             <bool>true</bool>
            </property>
            <property name="toolTip">
-            <string>When checked, it will dump original Maxwell guest shader bytecode (the input to the recompiler) as .ash files under DumpDir/shaders/. Useful for inspection with nvdisasm.</string>
+            <string>When checked, it will dump all the original assembler shaders from the disk shader cache or game as found</string>
            </property>
            <property name="text">
-            <string>Dump Guest (Maxwell) Shaders</string>
+            <string>Dump Game Shaders</string>
            </property>
           </widget>
          </item>
@@ -388,7 +313,7 @@
            </property>
           </widget>
          </item>
-         <item row="8" column="0">
+         <item row="7" column="0">
           <widget class="QCheckBox" name="disable_macro_jit">
            <property name="enabled">
             <bool>true</bool>
@@ -401,7 +326,7 @@
            </property>
           </widget>
          </item>
-         <item row="10" column="0">
+         <item row="9" column="0">
           <widget class="QCheckBox" name="disable_macro_hle">
            <property name="enabled">
             <bool>true</bool>
@@ -427,7 +352,7 @@
            </property>
           </widget>
          </item>
-         <item row="11" column="0">
+         <item row="10" column="0">
           <spacer name="verticalSpacer_5">
            <property name="orientation">
             <enum>Qt::Orientation::Vertical</enum>
@@ -463,16 +388,6 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="0">
-          <widget class="QCheckBox" name="gpu_log_shader_dumps">
-           <property name="toolTip">
-            <string>When checked, it will dump the recompiler's output SPIR-V binaries (.spv) under LogDir/shaders/. Inspect via SPIRV-Tools (spirv-dis / spirv-cross / spirv-val) or RenderDoc.</string>
-           </property>
-           <property name="text">
-            <string>Dump SPIR-V Shaders</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
@@ -599,65 +514,31 @@
            </layout>
           </widget>
          </item>
-         <item row="8" column="0">
-          <widget class="QWidget" name="debug_knobs_widget" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_debug_knobs">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label_debug_knobs">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string>Debug Knobs:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QSpinBox" name="debug_knobs_spinbox">
-              <property name="minimum">
-               <number>0</number>
-              </property>
-              <property name="maximum">
-               <number>65535</number>
-              </property>
-              <property name="toolTip">
-               <string>Bitmask for quick development toggles</string>
-              </property>
-              <property name="statusTip">
-               <string>Set debug knobs (bitmask)</string>
-              </property>
-              <property name="whatsThis">
-               <string>16-bit debug knob set for quick development toggles</string>
-              </property>
-              <property name="suffix">
-               <string> (bitmask)</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
+          <item row="8" column="0">
+            <widget class="QSpinBox" name="debug_knobs_spinbox">
+                <property name="minimum">
+                <number>0</number>
+                </property>
+                <property name="maximum">
+                <number>65535</number>
+                </property>
+                <property name="toolTip">
+                <string>Bitmask for quick development toggles</string>
+                </property>
+                <property name="statusTip">
+                <string>Set debug knobs (bitmask)</string>
+                </property>
+                <property name="whatsThis">
+                <string>16-bit debug knob set for quick development toggles</string>
+                </property>
+                <property name="suffix">
+                <string> (bitmask)</string>
+                </property>
+                <property name="prefix">
+                <string>Debug Knobs: </string>
+                </property>
+            </widget>
+          </item>
          <item row="7" column="0">
           <widget class="QWidget" name="serial_board_widget" native="true">
            <property name="sizePolicy">
@@ -698,7 +579,7 @@
            </layout>
           </widget>
          </item>
-         <item row="20" column="0">
+         <item row="0" column="0">
           <spacer name="verticalSpacer_3">
            <property name="orientation">
             <enum>Qt::Orientation::Vertical</enum>

tools/cpm/common.sh

@@ -3,43 +3,35 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-: "${CPM_SOURCE_CACHE:=$PWD/.cache/cpm}"
-: "${CPMUTIL_PATCH_DIR:=$PWD/.patch}"
+##################################
+# CHANGE THESE FOR YOUR PROJECT! #
+##################################
 
-# TODO: cache cpmfile defs?
-
-cmd_exists() {
-	command -v "$1" >/dev/null 2>&1
-}
+# TODO: cache cpmfile defs
 
 must_install() {
 	for cmd in "$@"; do
-		cmd_exists "$cmd" || { echo "-- $cmd must be installed" && exit 1; }
+		command -v "$cmd" >/dev/null 2>&1 || { echo "-- $cmd must be installed" && exit 1; }
 	done
 }
 
-# Random integer between 100000 and 999999
-_randint() {
-	awk 'BEGIN { srand(); print int(100000 + rand() * 900000) }'
-}
+must_install jq find mktemp tar 7z unzip sha512sum git patch curl xargs
 
-# Use mktemp if available, use a local temp dir otherwise
-make_temp_dir() {
-	if cmd_exists mktemp; then
-		mktemp -d
-	else
-		TMP="$PWD/.cpm/tmp-$(_randint)"
-		mkdir -p "$TMP"
-		echo "$TMP"
-	fi
-}
+# How many levels to go (3 is 2 subdirs max)
+MAXDEPTH=3
 
-# must_install jq find mktemp tar 7z unzip sha512sum git patch curl
+# For your project you'll want to change this to define what dirs you have cpmfiles in
+# Remember to account for the MAXDEPTH variable!
+# Adding ./ before each will help to remove duplicates
+CPMFILES=$(find . -maxdepth "$MAXDEPTH" -name cpmfile.json | sort | uniq)
 
-if [ ! -s cpmfile.json ]; then
-	# TODO: actually make it a no-op
-	echo "-- Warning: cpmfile.json does not exist or is empty, most commands will be no-ops"
-else
-	LIBS=$(jq -j 'keys_unsorted | join(" ")' cpmfile.json)
-	export LIBS
-fi
+# shellcheck disable=SC2016
+PACKAGES=$(echo "$CPMFILES" | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
+
+LIBS=$(echo "$PACKAGES" | jq -j 'keys_unsorted | join(" ")')
+
+export PACKAGES
+export CPMFILES
+export LIBS
+export DIRS
+export MAXDEPTH

tools/cpm/format.sh

@@ -1,9 +1,9 @@
 #!/bin/sh -e
 
-# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-FileCopyrightText: Copyright 2025 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-jq --indent 4 -S <cpmfile.json >cpmfile.json.new
-mv cpmfile.json.new cpmfile.json
-
-# TODO: Run some sanity checks e.g. patches exist, etc.
+for file in $CPMFILES; do
+	jq --indent 4 <"$file" >"$file".new
+	mv "$file".new "$file"
+done

tools/cpm/migrate.sh

@@ -33,7 +33,7 @@ for i in $SUBMODULES; do
 		'{
         ($name): {
             sha: $sha,
-            version: $ver,
+            git_version: $ver,
             repo: $repo
         } + (if $host != "" then {git_host: $host} else {} end)
         }')

tools/cpm/package.sh

@@ -18,11 +18,8 @@ Commands:
     add     	Add a new package
     rm      	Remove a package
     version 	Change the version of a package
-    which   	Check if a package is defined
+    which   	Find which cpmfile a package is defined in
     download 	Get the download URL for a package
-    dir     	Get the local directory for a package
-    reset   	Reset a fetched package to its original state
-    patch   	Create an in-tree patch based on local modifications
 
 EOF
 
@@ -34,7 +31,7 @@ export SCRIPTS
 
 while :; do
 	case "$1" in
-	hash | update | fetch | add | rm | version | which | download | reset | patch | dir)
+	hash | update | fetch | add | rm | version | which | download)
 		cmd="$1"
 		shift
 		"$SCRIPTS/$cmd".sh "$@"

tools/cpm/package/add.sh

@@ -7,20 +7,31 @@ RETURN=0
 
 usage() {
 	cat <<EOF
-Usage: cpmutil.sh package add [package name]
+Usage: cpmutil.sh package add [-s|--sha] [-t|--tag]
+           [-c|--cpmfile CPMFILE] [package name]
 
 Add a new package to a cpmfile.
 
+Options:
+    -t, --tag            	Use tag versioning, instead of the default,
+                           	commit sha versioning.
+    -c, --cpmfile <CPMFILE>	Use the specified cpmfile instead of the root cpmfile
+
 Note that you are still responsible for integrating this into your CMake.
 
 EOF
 
-	exit "$RETURN"
+	exit $RETURN
 }
 
 die() {
 	echo "-- $*" >&2
-	RETURN=1 usage
+	exit 1
+}
+
+_cpmfile() {
+	[ -n "$1" ] || die "You must specify a valid cpmfile."
+	CPMFILE="$1"
 }
 
 while :; do
@@ -33,11 +44,21 @@ while :; do
 			opt=$(echo "$opt" | cut -c2-)
 
 			case "$char" in
+			t) TAG=1 ;;
+			c)
+				_cpmfile "$2"
+				shift
+				;;
 			h) usage ;;
 			*) die "Invalid option -$char" ;;
 			esac
 		done
 		;;
+	--tag) TAG=1 ;;
+	--cpmfile)
+		_cpmfile "$2"
+		shift
+		;;
 	--help) usage ;;
 	"$0") break ;;
 	"") break ;;
@@ -47,8 +68,12 @@ while :; do
 	shift
 done
 
+: "${CPMFILE:=$PWD/cpmfile.json}"
+
 [ -n "$PKG" ] || die "You must specify a package name."
 
 export PKG
+export CPMFILE
+export TAG
 
 "$SCRIPTS"/util/interactive.sh

tools/cpm/package/dir.sh

@@ -1,57 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/../common.sh
-
-usage() {
-	cat <<EOF
-Usage: cpmutil.sh package dir [-a|--all] [PACKAGE]...
-
-Get the local directory for the specified packages.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-
-EOF
-
-	exit 0
-}
-
-while :; do
-	case "$1" in
-	-a | --all) ALL=1 ;;
-	-h | --help) usage ;;
-	"$0") break ;;
-	"") break ;;
-	*) packages="$packages $1" ;;
-	esac
-
-	shift
-done
-
-[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
-[ -n "$packages" ] || usage
-
-for pkg in $packages; do
-	unset JSON
-	export PACKAGE="$pkg"
-
-	# shellcheck disable=SC1091
-	. "$SCRIPTS"/vars.sh
-
-	# TODO: common get dir func
-	if [ "$CI" = true ]; then
-		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}"
-	else
-		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
-	fi
-
-	echo "-- $pkg: $dir"
-
-	if [ ! -d "$dir" ]; then
-		echo "-- * Warning: directory does not exist. Use fetch or reset to create it"
-	fi
-done

tools/cpm/package/download.sh

@@ -33,9 +33,8 @@ done
 [ -n "$packages" ] || usage
 
 for pkg in $packages; do
-	unset JSON
-	export PACKAGE="$pkg"
-
+	PACKAGE="$pkg"
+	export PACKAGE
 	# shellcheck disable=SC1091
 	. "$SCRIPTS"/vars.sh
 

tools/cpm/package/fetch.sh

@@ -3,8 +3,115 @@
 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later
 
-# shellcheck disable=SC1091
-. "$SCRIPTS/util/fetch.sh"
+: "${CPM_SOURCE_CACHE:=$PWD/.cache/cpm}"
+
+mkdir -p "$CPM_SOURCE_CACHE"
+
+ROOTDIR="$PWD"
+
+TMP=$(mktemp -d)
+
+download_package() {
+	FILENAME=$(basename "$DOWNLOAD")
+
+	OUTFILE="$TMP/$FILENAME"
+
+	LOWER_PACKAGE=$(echo "$PACKAGE_NAME" | tr '[:upper:]' '[:lower:]')
+	OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+	[ -d "$OUTDIR" ] && return
+
+	curl "$DOWNLOAD" -sS -L -o "$OUTFILE"
+
+	ACTUAL_HASH=$("${HASH_ALGO}"sum "$OUTFILE" | cut -d" " -f1)
+	[ "$ACTUAL_HASH" != "$HASH" ] && echo "!! $FILENAME did not match expected hash; expected $HASH but got $ACTUAL_HASH" && exit 1
+
+	TMPDIR="$TMP/extracted"
+	mkdir -p "$OUTDIR"
+	mkdir -p "$TMPDIR"
+
+	PREVDIR="$PWD"
+	mkdir -p "$TMPDIR"
+	cd "$TMPDIR"
+
+	case "$FILENAME" in
+	*.7z)
+		7z x "$OUTFILE" >/dev/null
+		;;
+	*.tar*)
+		tar xf "$OUTFILE" >/dev/null
+		;;
+	*.zip)
+		unzip "$OUTFILE" >/dev/null
+		;;
+	esac
+
+	# basically if only one real item exists at the top we just move everything from there
+	# since github and some vendors hate me
+	DIRS=$(find . -maxdepth 1 -type d -o -type f)
+
+	# thanks gnu
+	if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then
+		SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
+		mv "$SUBDIR"/* "$OUTDIR"
+		mv "$SUBDIR"/.* "$OUTDIR" 2>/dev/null || true
+		rmdir "$SUBDIR"
+	else
+		mv ./* "$OUTDIR"
+		mv ./.* "$OUTDIR" 2>/dev/null || true
+	fi
+
+	cd "$OUTDIR"
+
+	if echo "$JSON" | grep -e "patches" >/dev/null; then
+		PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
+		for patch in $PATCHES; do
+			patch --binary -p1 <"$ROOTDIR/.patch/$PACKAGE/$patch"
+		done
+	fi
+
+	cd "$PREVDIR"
+}
+
+ci_package() {
+	[ "$REPO" != null ] || { echo "-- ! No repo defined" && return; }
+
+	echo "-- CI package $PACKAGE_NAME"
+
+	for platform in \
+		windows-amd64 windows-arm64 \
+		mingw-amd64 mingw-arm64 \
+		android-aarch64 android-x86_64 \
+		solaris-amd64 freebsd-amd64 openbsd-amd64 \
+		linux-amd64 linux-aarch64 \
+		macos-universal ios-aarch64; do
+		echo "-- * platform $platform"
+
+		case $DISABLED in
+		*"$platform"*)
+			echo "-- * -- disabled"
+			continue
+			;;
+		esac
+
+		FILENAME="${NAME}-${platform}-${VERSION}.${EXT}"
+		DOWNLOAD="https://$GIT_HOST/${REPO}/releases/download/v${VERSION}/${FILENAME}"
+		KEY="$platform-$VERSION"
+
+		LOWER_PACKAGE=$(echo "$PACKAGE_NAME" | tr '[:upper:]' '[:lower:]')
+		OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+		[ -d "$OUTDIR" ] && continue
+
+		HASH_ALGO=$(echo "$JSON" | jq -r ".hash_algo")
+		[ "$HASH_ALGO" != null ] || HASH_ALGO=sha512
+
+		HASH_SUFFIX="${HASH_ALGO}sum"
+		HASH_URL="${DOWNLOAD}.${HASH_SUFFIX}"
+
+		HASH=$(curl "$HASH_URL" -sS -q -L -o -)
+
+		download_package
+	done
+}
 
 usage() {
 	cat <<EOF
@@ -34,11 +141,16 @@ done
 [ -n "$packages" ] || usage
 
 for PACKAGE in $packages; do
-	unset JSON
 	export PACKAGE
-
 	# shellcheck disable=SC1091
 	. "$SCRIPTS"/vars.sh
 
-	fetch_package
+	if [ "$CI" = "true" ]; then
+		ci_package
+	else
+		echo "-- Downloading regular package $PACKAGE, with key $KEY, from $DOWNLOAD"
+		download_package
+	fi
 done
+
+rm -rf "$TMP"

tools/cpm/package/hash.sh

@@ -59,33 +59,8 @@ done
 export UPDATE
 
 for pkg in $packages; do
-	unset JSON
 	echo "-- Package $pkg"
-
-	export PACKAGE="$pkg"
-
-	# shellcheck disable=SC1091
-	. "$SCRIPTS"/vars.sh
-
-	[ "$CI" = null ] || continue
-
-	ACTUAL=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
-
-	if [ "$ACTUAL" != "$HASH" ] && [ "$QUIET" != true ]; then
-		echo "-- * Expected $HASH"
-		echo "-- * Got      $ACTUAL"
-
-		if [ "$UPDATE" != "true" ]; then
-			RETURN=1
-			continue
-		fi
-	fi
-
-	if [ "$UPDATE" = "true" ] && [ "$ACTUAL" != "$HASH" ]; then
-		NEW_JSON=$(echo "$JSON" | jq ".hash = \"$ACTUAL\"")
-
-		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
-	fi
+	"$SCRIPTS"/util/fix-hash.sh "$pkg" || RETURN=1
 done
 
 exit $RETURN

tools/cpm/package/patch.sh

@@ -1,173 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/../common.sh
-
-RETURN=0
-
-usage() {
-	cat <<EOF
-Usage: cpmutil.sh package patch [PACKAGE]
-
-Create an in-tree patch for the specified package.
-
-EOF
-
-	exit "$RETURN"
-}
-
-die() {
-	echo "-- $*" >&2
-	RETURN=1 usage
-}
-
-while :; do
-	case "$1" in
-	-h | --help) usage ;;
-	"$0") break ;;
-	"") break ;;
-	*)
-		if [ -n "$PACKAGE" ]; then
-			die "You may only specify one package."
-		else
-			PACKAGE="$1"
-		fi
-		;;
-	esac
-
-	shift
-done
-
-[ -n "$PACKAGE" ] || usage
-
-unset JSON
-export PACKAGE
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/vars.sh
-
-if [ "$CI" = true ]; then
-	die "CI packages do not support in-tree patching"
-fi
-
-patch_dir="$PWD/.patch/$PACKAGE"
-TMP=$(make_temp_dir)
-
-tmp_package="${TMP}/${LOWER_PACKAGE}/${KEY}"
-
-# First fetch the package...
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/util/fetch.sh
-
-local_dir="$CPM_SOURCE_CACHE/$LOWER_PACKAGE/$KEY"
-
-if [ ! -d "$local_dir" ]; then
-	echo "-- $PACKAGE_NAME is not fetched locally" >&2
-	exit 1
-fi
-
-src_dir="$tmp_package/$LOWER_PACKAGE/$KEY"
-
-CPM_SOURCE_CACHE="$tmp_package" fetch_package
-
-mkdir -p "$patch_dir"
-
-existing=$(find "$patch_dir" -maxdepth 1 -type f -name '[0-9][0-9][0-9][0-9]-*.patch' 2>/dev/null | sort | tail -1)
-if [ -n "$existing" ]; then
-	last_num=$(basename "$existing" | cut -c1-4)
-	last_num=$(echo "$last_num" | sed 's/^0*//')
-	last_num="${last_num:-0}"
-	next_num=$(printf "%04d" $((last_num + 1)))
-else
-	next_num="0001"
-fi
-
-echo "-- Creating patch for $PACKAGE..."
-
-orig_dir="$PWD"
-if cmd_exists git; then
-	cd "$src_dir"
-
-	git init >/dev/null 2>&1
-	git add -A >/dev/null 2>&1
-	git commit -m "base" >/dev/null 2>&1
-
-	git --work-tree="$local_dir" add -A #>/dev/null 2>&1
-
-	if git diff --cached --quiet; then
-		echo "-- No differences found between local and source"
-		cd "$orig_dir"
-		rm -rf "$TMP"
-		exit 0
-	fi
-
-	if ! git commit -v; then
-		echo "-- Patch cancelled" >&2
-		cd "$orig_dir"
-		rm -rf "$TMP"
-		exit 1
-	fi
-
-	description=$(git log -1 --format="%s")
-
-	git format-patch -1 HEAD --stdout >"$patch_dir/tmp.patch"
-	rm -rf .git
-
-	cd "$orig_dir"
-	unset orig_dir
-else
-	if diff -ruN "$src_dir" "$local_dir" >/dev/null 2>&1; then
-		echo "-- No differences found between local and source"
-		rm -rf "$TMP"
-		exit 0
-	fi
-
-	printf -- "-- Enter a patch description: "
-	if ! read -r description; then
-		echo "" >&2
-		echo "-- Patch cancelled" >&2
-		rm -rf "$TMP"
-		exit 1
-	fi
-
-	mkdir -p "$TMP/patchdir/a" "$TMP/patchdir/b"
-	cp -r "$src_dir/." "$TMP/patchdir/a/"
-	cp -r "$local_dir/." "$TMP/patchdir/b/"
-	cd "$TMP/patchdir"
-	{
-		echo "Subject: [PATCH] $description" | fold -s -w 80
-		echo "---"
-		diff -ruN a b || true
-	} >"$patch_dir/tmp.patch"
-
-	cd "$orig_dir"
-	unset orig_dir
-fi
-
-rm -rf "$TMP"
-
-if [ ! -s "$patch_dir/tmp.patch" ]; then
-	rm -f "$patch_dir/tmp.patch"
-	echo "-- No differences found between local and source for $PACKAGE"
-	exit 0
-fi
-
-name_part=$(printf "%s" "$description" | sed 's/^[0-9]\{4\}-//' | sed 's/ /-/g; s/[^a-zA-Z0-9-]//g; s/--*/-/g; s/^-//; s/-$//')
-[ -n "$name_part" ] || name_part="patch"
-
-# max is 60 chars, minus 5 for number, minus 6 for patch suffix
-max_name_len=49
-name_part=$(printf "%s" "$name_part" | cut -c1-"$max_name_len" | sed 's/-$//')
-
-patch_name="${next_num}-${name_part}.patch"
-
-mv "$patch_dir/tmp.patch" "$patch_dir/$patch_name"
-
-NEW_JSON=$(echo "$JSON" | jq ".patches += [\"$patch_name\"]")
-"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
-
-echo "-- Patch created at $patch_dir/$patch_name"

tools/cpm/package/reset.sh

@@ -1,56 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/../common.sh
-
-usage() {
-	cat <<EOF
-Usage: cpmutil.sh package reset [a|--all] [PACKAGE]...
-
-Reset a locally fetched package to its original state.
-This is most useful for dropping any changes you've made.
-
-EOF
-
-	exit 0
-}
-
-while :; do
-	case "$1" in
-	-h | --help) usage ;;
-	-a | --all) ALL=1 ;;
-	"$0") break ;;
-	"") break ;;
-	*) packages="$packages $1" ;;
-	esac
-
-	shift
-done
-
-[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
-[ -n "$packages" ] || usage
-
-for PACKAGE in $packages; do
-	unset JSON
-	export PACKAGE
-
-	# shellcheck disable=SC1091
-	. "$SCRIPTS"/vars.sh
-
-	if [ "$CI" = true ]; then
-		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}"
-	else
-		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
-	fi
-
-	echo "-- Removing $dir"
-	rm -rf "$dir"
-
-	# shellcheck disable=SC1091
-	. "$SCRIPTS"/util/fetch.sh
-
-	fetch_package
-done

tools/cpm/package/rm.sh

@@ -9,7 +9,7 @@ usage() {
 	cat <<EOF
 Usage: cpmutil.sh package rm [PACKAGE]...
 
-Delete a package or packages' cpmfile definition.
+Delete a package or packages' cpmfile definition(s).
 
 EOF
 
@@ -19,12 +19,12 @@ EOF
 [ $# -ge 1 ] || usage
 
 for pkg in "$@"; do
-	"$SCRIPTS"/which.sh "$pkg" || {
+	JSON=$("$SCRIPTS"/which.sh "$pkg") || {
 		echo "!! No cpmfile definition for $pkg"
 		continue
 	}
 
-	jq --indent 4 "del(.\"$pkg\")" cpmfile.json >cpmfile.json.new
-	mv cpmfile.json.new cpmfile.json
-	echo "-- Removed $pkg"
+	jq --indent 4 "del(.\"$pkg\")" "$JSON" >"$JSON".tmp
+	mv "$JSON".tmp "$JSON"
+	echo "-- Removed $pkg from $JSON" || :
 done

tools/cpm/package/update.sh

@@ -63,9 +63,8 @@ done
 [ -n "$packages" ] || usage
 
 for pkg in $packages; do
-	unset JSON
-	export PACKAGE="$pkg"
-
+	PACKAGE="$pkg"
+	export PACKAGE
 	# shellcheck disable=SC1091
 	. "$SCRIPTS"/vars.sh
 
@@ -83,14 +82,13 @@ for pkg in $packages; do
 
 	echo "-- Package $PACKAGE"
 
-	# TODO(crueter): Support for forgejo_token?
+	# TODO(crueter): Support for Forgejo updates w/ forgejo_token
+	# Use gh-cli to avoid ratelimits, if available
 	endpoint="/repos/$REPO/tags"
 	if command -v gh >/dev/null 2>&1; then
 		TAGS=$(gh api --method GET "$endpoint")
-	elif [ "$GIT_HOST" = github.com ]; then
-		TAGS=$(curl -sfL "https://api.github.com$endpoint")
 	else
-		TAGS=$(curl -sfL "https://$GIT_HOST/api/v1$endpoint")
+		TAGS=$(curl -sfL "https://api.github.com$endpoint")
 	fi
 
 	# filter out some commonly known annoyances
@@ -104,6 +102,7 @@ for pkg in $packages; do
 
 	filter_out yotta # mbedtls
 
+	# ????????????????????????????????
 	filter_out vksc
 
 	# ignore betas/alphas (remove if needed)
@@ -111,15 +110,15 @@ for pkg in $packages; do
 	filter_out beta
 	filter_out rc
 
-	# Add package-specific overrides here, e.g. here for fmt:
-	[ "$PACKAGE" != fmt ] || filter_out v0.11
-
-	# Or for OpenSSL:
+	# openssl
 	if [ "$PACKAGE" = openssl ]; then
 		filter_out rsaref
 		filter_in "openssl-"
 	fi
 
+	# Add package-specific overrides here, e.g. here for fmt:
+	[ "$PACKAGE" != fmt ] || filter_out v0.11
+
 	LATEST=$(echo "$TAGS" | jq -r '.[0].name')
 
 	if [ "$LATEST" = "null" ] ||
@@ -128,47 +127,45 @@ for pkg in $packages; do
 		continue
 	fi
 
-	# TODO: This is identical to version.sh
-
 	if [ "$HAS_REPLACE" = "true" ]; then
 		# this just extracts the tag prefix
 		VERSION_PREFIX=$(echo "$ORIGINAL_TAG" | cut -d"%" -f1)
 
-		# then we strip out the prefix from the new tag, and make that our new version
+		# then we strip out the prefix from the new tag, and make that our new git_version
 		if [ -z "$VERSION_PREFIX" ]; then
-			NEW_VERSION="$LATEST"
+			NEW_GIT_VERSION="$LATEST"
 		else
-			NEW_VERSION=$(echo "$LATEST" | sed "s/$VERSION_PREFIX//g")
+			NEW_GIT_VERSION=$(echo "$LATEST" | sed "s/$VERSION_PREFIX//g")
 		fi
 	else
-		NEW_VERSION="$LATEST"
+		NEW_GIT_VERSION="$LATEST"
 	fi
 
 	_commit="$_commit
-* $PACKAGE: $VERSION -> $NEW_VERSION"
+* $PACKAGE: $GIT_VERSION -> $NEW_GIT_VERSION"
 
 	echo "-- * Version $LATEST available, current is $TAG"
 
 	if [ "$UPDATE" = "true" ]; then
 		if [ "$HAS_REPLACE" = "true" ]; then
-			JSON=$(echo "$JSON" | jq ".version = \"$NEW_VERSION\"")
+			NEW_JSON=$(echo "$JSON" | jq ".git_version = \"$NEW_GIT_VERSION\"")
 		else
-			JSON=$(echo "$JSON" | jq ".tag = \"$NEW_VERSION\"")
+			NEW_JSON=$(echo "$JSON" | jq ".tag = \"$NEW_GIT_VERSION\"")
 		fi
 
+		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
+
 		echo "-- * -- Updating hash"
 
-		# shellcheck disable=SC1091
-		. "$SCRIPTS"/vars.sh
-		HASH=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
-		JSON=$(echo "$JSON" | jq ".hash = \"$HASH\"")
-
-		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$JSON"
+		export UPDATE
+		QUIET=true "$SCRIPTS"/util/fix-hash.sh "$PACKAGE"
 	fi
 done
 
 if [ "$UPDATE" = "true" ] && [ "$COMMIT" = "true" ] && [ -n "$_commit" ]; then
-	git add "cpmfile.json"
+	for file in $CPMFILES; do
+		git add "$file"
+	done
 	git commit -m "Update dependencies
 $_commit"
 fi

tools/cpm/package/util/fetch.sh

@@ -1,134 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. "$SCRIPTS"/../common.sh
-
-download_package() {
-	mkdir -p "$CPM_SOURCE_CACHE"
-
-	tmp=$(make_temp_dir)
-
-	FILENAME=$(basename "$DOWNLOAD")
-
-	OUTFILE="$tmp/$FILENAME"
-
-	OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
-	if [ -d "$OUTDIR" ]; then return; fi
-
-	curl "$DOWNLOAD" -sS -L -o "$OUTFILE"
-
-	ACTUAL_HASH=$(sha512sum "$OUTFILE" | cut -d" " -f1)
-	if [ "$ACTUAL_HASH" != "$HASH" ]; then
-		echo "!! $FILENAME did not match expected hash; expected $HASH but got $ACTUAL_HASH" >&2
-		exit 1
-	fi
-
-	TMPDIR="$tmp/extracted"
-	mkdir -p "$OUTDIR"
-	mkdir -p "$TMPDIR"
-
-	PREVDIR="$PWD"
-	mkdir -p "$TMPDIR"
-	cd "$TMPDIR"
-
-	case "$FILENAME" in
-	*.7z)
-		must_install 7z
-		7z x "$OUTFILE" >/dev/null
-		;;
-	*.tar*)
-		# TODO: Extensions
-		must_install tar
-		tar xf "$OUTFILE" >/dev/null
-		;;
-	*.zip)
-		must_install unzip
-		unzip "$OUTFILE" >/dev/null
-		;;
-	esac
-
-	# basically if only one real item exists at the top we just move everything from there
-	# since github and some vendors hate me
-	DIRS=$(find . -maxdepth 1 -type d -o -type f)
-
-	# thanks gnu
-	if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then
-		SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
-		mv "$SUBDIR"/* "$OUTDIR"
-		mv "$SUBDIR"/.* "$OUTDIR" 2>/dev/null || true
-		rmdir "$SUBDIR"
-	else
-		mv ./* "$OUTDIR"
-		mv ./.* "$OUTDIR" 2>/dev/null || true
-	fi
-
-	cd "$OUTDIR"
-
-	# TODO: Common custom patch/source cache dirs
-	if echo "$JSON" | grep -e "patches" >/dev/null; then
-		PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
-		for patch in $PATCHES; do
-			abs_patch="$CPMUTIL_PATCH_DIR/$PACKAGE/$patch"
-			if [ ! -f "$abs_patch" ]; then
-				echo "-- * Attempted to apply nonexistent patch $patch!"
-				continue
-			fi
-
-			echo "-- * Applying patch $patch"
-			patch --binary -p1 <"$abs_patch"
-		done
-	fi
-
-	cd "$PREVDIR"
-
-	rm -rf "$tmp"
-}
-
-# TODO: individual platform fetch?
-ci_package() {
-	[ "$REPO" != null ] || { echo "-- ! No repo defined" && return; }
-	mkdir -p "$CPM_SOURCE_CACHE"
-
-	echo "-- CI package $PACKAGE_NAME"
-
-	for platform in \
-		windows-amd64 windows-arm64 \
-		mingw-amd64 mingw-arm64 \
-		android-aarch64 android-x86_64 \
-		linux-amd64 linux-aarch64 \
-		macos-universal ios-aarch64; do
-		echo "-- * platform $platform"
-
-		case $DISABLED in
-		*"$platform"*)
-			echo "-- * -- disabled"
-			continue
-			;;
-		esac
-
-		FILENAME="${NAME}-${platform}-${VERSION}.${EXT}"
-		DOWNLOAD="https://$GIT_HOST/${REPO}/releases/download/v${VERSION}/${FILENAME}"
-		KEY="$platform-$VERSION"
-
-		OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
-		[ -d "$OUTDIR" ] && continue
-
-		HASH_URL="${DOWNLOAD}.sha512sum"
-
-		HASH=$(curl "$HASH_URL" -sS -q -L -o -)
-
-		download_package
-	done
-}
-
-fetch_package() {
-	if [ "$CI" = "true" ]; then
-		ci_package
-	else
-		echo "-- Downloading regular package $PACKAGE, with key $KEY, from $DOWNLOAD"
-		download_package
-	fi
-}

tools/cpm/package/util/fix-hash.sh

@@ -9,10 +9,18 @@
 
 # re-read json files
 # shellcheck disable=SC2016
+PACKAGES=$(echo "$CPMFILES" | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
+export PACKAGES
+
 . "$SCRIPTS"/vars.sh
 
 [ "$CI" = null ] || exit 0
 
+[ "$HASH_URL" = null ] || exit 0
+[ "$HASH_SUFFIX" = null ] || exit 0
+
+[ "$HASH" != null ] || { echo "-- * Package has no hash specified" && exit 0; }
+
 ACTUAL=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
 
 if [ "$ACTUAL" != "$HASH" ] && [ "$QUIET" != true ]; then

tools/cpm/package/util/interactive.sh

@@ -86,18 +86,6 @@ optional "Additional find_package arguments, space-separated" \
 
 FIND_ARGS="$reply"
 
-optional "Git host (default: github.com)" \
-	"The hostname of the Git server, if not GitHub (e.g. codeberg.org, git.crueter.xyz)"
-
-GIT_HOST="$reply"
-
-required "Numeric version of the bundled package" \
-	"The semantic version of the bundled package. This is only used for package identification,
-and if you use tag/artifact fetching. Do not input the entire tag here; for example, if you're using
-tag v1.3.0, then set this to 1.3.0 and set the tag to v%VERSION%."
-
-VERSION="$reply"
-
 optional "Is this a CI package? [y/N]" \
 	"Yes if the package is a prebuilt binary distribution (e.g. crueter-ci),
 no if the package is built from source if it's bundled."
@@ -108,31 +96,27 @@ case "$reply" in
 esac
 
 if [ "$CI" = "false" ]; then
-	while :; do
-		required "Use tag or commit sha versioning? [tag/sha]" \
-			"Tag versioning is compatible with auto-updating.
-Use sha versioning for projects with improper tagging practices"
+	optional "Git host (default: github.com)" \
+		"The hostname of the Git server, if not GitHub (e.g. codeberg.org, git.crueter.xyz)"
 
-		if [ "$reply" = "tag" ]; then
-			TAG=1
-			break
-		elif [ "$reply" = "sha" ]; then
-			SHA=1
-			break
-		else
-			echo "-- Invalid choice $reply"
-		fi
-	done
+	GIT_HOST="$reply"
 
 	if [ "$TAG" = "1" ]; then
-		optional "Name of the upstream tag. %VERSION% is replaced by the numeric version ($VERSION) (default: %VERSION%)" \
+		required "Numeric version of the bundled package" \
+			"The semantic version of the bundled package. This is only used for package identification,
+and if you use tag/artifact fetching. Do not input the entire tag here; for example, if you're using
+tag v1.3.0, then set this to 1.3.0 and set the tag to v%VERSION%."
+
+		GIT_VERSION="$reply"
+
+		optional "Name of the upstream tag. %VERSION% is replaced by the numeric version (default: %VERSION%)" \
 			"Most commonly this will be something like v%VERSION% or release-%VERSION%, or just %VERSION%."
 
 		TAGNAME="$reply"
 		[ -n "$TAGNAME" ] || TAGNAME="%VERSION%"
 
 		optional "Name of the release artifact to download, if applicable.
--- %VERSION% is replaced by the numeric version ($VERSION) and %TAG% is replaced by the tag name" \
+-- %VERSION% is replaced by the numeric version and %TAG% is replaced by the tag name" \
 			"Download the specified artifact from the release with the previously specified tag.
 If unspecified, the source code at the specified tag will be used instead."
 
@@ -150,6 +134,11 @@ should be set in CMake with AddJsonPackage's OPTIONS parameter."
 
 	OPTIONS="$reply"
 else
+	required "Version of the CI package (e.g. 3.6.0-9eff87adb1)" \
+		"CI artifacts are stored as <name>-<platform>-<version>.tar.zst. This option controls the version."
+
+	VERSION="$reply"
+
 	required "Name of the CI artifact" \
 		"CI artifacts are stored as <name>-<platform>-<version>.tar.zst. This option controls the name."
 
@@ -160,6 +149,7 @@ else
 windows-amd64 windows-arm64
 mingw-amd64 mingw-arm64
 android-aarch64 android-x86_64
+solaris-amd64 freebsd-amd64 openbsd-amd64
 linux-amd64 linux-aarch64
 macos-universal ios-aarch64"
 
@@ -173,15 +163,11 @@ jq_input='{repo: "'"$REPO"'"}'
 [ -z "$PACKAGE" ] || jq_input="$jq_input + {package: \"$PACKAGE\"}"
 [ -z "$MIN_VERSION" ] || jq_input="$jq_input + {min_version: \"$MIN_VERSION\"}"
 [ -z "$FIND_ARGS" ] || jq_input="$jq_input + {find_args: \"$FIND_ARGS\"}"
-jq_input="$jq_input + {version: \"$VERSION\"}"
-
-if [ -n "$GIT_HOST" ] && [ "$GIT_HOST" != "github.com" ]; then
-	jq_input="$jq_input + {git_host: \"$GIT_HOST\"}"
-fi
 
 if [ "$CI" = "true" ]; then
 	jq_input="$jq_input + {
         ci: true,
+        version: \"$VERSION\",
         artifact: \"$ARTIFACT\"
     }"
 
@@ -200,29 +186,32 @@ else
 		jq_input="$jq_input + {options: $options_json}"
 	fi
 
+	# Git host
+	if [ -n "$GIT_HOST" ] && [ "$GIT_HOST" != "github.com" ]; then
+		jq_input="$jq_input + {git_host: \"$GIT_HOST\"}"
+	fi
+
 	# versioning stuff
-	if [ "$TAG" = 1 ]; then
-		jq_input="$jq_input + {tag: \"$TAGNAME\"}"
+	if [ -n "$GIT_VERSION" ]; then
+		jq_input="$jq_input + {git_version: \"$GIT_VERSION\"}"
+		[ -z "$TAGNAME" ] || jq_input="$jq_input + {tag: \"$TAGNAME\"}"
 		[ -z "$ARTIFACT" ] || jq_input="$jq_input + {artifact: \"$ARTIFACT\"}"
 	else
 		jq_input="$jq_input + {sha: \"$SHA\"}"
 	fi
 fi
 
-JSON=$(jq -n "$jq_input")
+new_json=$(jq -n "$jq_input")
 
-# shellcheck disable=SC1091
-. "$SCRIPTS"/vars.sh
+jq --arg key "$PKG" --argjson new "$new_json" \
+	'.[$key] = $new' "$CPMFILE" --indent 4 >"${CPMFILE}.tmp" &&
+	mv "${CPMFILE}.tmp" "$CPMFILE"
 
+# now correct the hash
 if [ "$CI" != true ]; then
-	HASH=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
-	JSON=$(echo "$JSON" | jq ".hash = \"$HASH\"")
+	# shellcheck disable=SC1091
+	. "$ROOTDIR"/common.sh
+	QUIET=true UPDATE=true "$SCRIPTS"/util/fix-hash.sh "$PKG"
 fi
 
-jq --arg key "$PKG" --argjson new "$JSON" \
-	'.[$key] = $new' "cpmfile.json" --indent 4 >"cpmfile.json.tmp" &&
-	mv "cpmfile.json.tmp" cpmfile.json
-
-"$SCRIPTS"/format.sh
-
-echo "Added package $PKG to cpmfile.json. Include it in your project with AddJsonPackage($PKG)"
+echo "Added package $PKG to $CPMFILE. Include it in your project with AddJsonPackage($PKG)"