dynarmic: no PRECOMPILED_HEADERS ftw

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>

.shellcheckrc

@@ -1 +0,0 @@
-shell=sh

CMakeLists.txt

@@ -32,20 +32,10 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
-
-# NB: this does not account for SPARC
-# If you get Eden working on SPARC, please shoot crueter@crueter.xyz multiple emails
-# and you will be hailed for eternity
 if (PLATFORM_SUN)
     # Terrific Solaris pkg shenanigans
     list(APPEND CMAKE_PREFIX_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
     list(APPEND CMAKE_MODULE_PATH "/usr/lib/qt/6.6/lib/amd64/cmake")
-
-    # amazing
-    # absolutely incredible
-    list(APPEND CMAKE_PREFIX_PATH "/usr/lib/amd64/cmake")
-    list(APPEND CMAKE_MODULE_PATH "/usr/lib/amd64/cmake")
-
     # For some mighty reason, doing a normal release build sometimes may not trigger
     # the proper -O3 switch to materialize
     if (CMAKE_BUILD_TYPE MATCHES "Release")
@@ -227,8 +217,6 @@ endif()
 # TODO(crueter): CI this?
 option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)
 
-option(YUZU_LEGACY "Apply patches that improve compatibility with older GPUs (e.g. Snapdragon 865) at the cost of performance" OFF)
-
 cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)
 cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)
 
@@ -326,11 +314,6 @@ if (UNIX)
     add_compile_definitions(YUZU_UNIX=1)
 endif()
 
-if (YUZU_LEGACY)
-    message(WARNING "Making legacy build. Performance may suffer.")
-    add_compile_definitions(YUZU_LEGACY)
-endif()
-
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
     set(HAS_NCE 1)
     add_compile_definitions(HAS_NCE=1)
@@ -471,7 +454,6 @@ if (YUZU_USE_CPM)
 
     if (zstd_ADDED)
         add_library(zstd::zstd ALIAS libzstd_static)
-        add_library(zstd::libzstd ALIAS libzstd_static)
     endif()
 
     # Opus
@@ -507,9 +489,9 @@ else()
 
     # wow
     if (PLATFORM_LINUX)
-        find_package(Boost 1.57.0 CONFIG REQUIRED headers context system fiber)
+        find_package(Boost 1.57.0 REQUIRED headers context system fiber)
     else()
-        find_package(Boost 1.57.0 CONFIG REQUIRED)
+        find_package(Boost 1.57.0 REQUIRED)
     endif()
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR ANDROID)
@@ -560,7 +542,6 @@ find_package(MbedTLS)
 find_package(VulkanUtilityLibraries)
 find_package(SimpleIni)
 find_package(SPIRV-Tools)
-find_package(sirit)
 
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
     find_package(xbyak)
@@ -612,8 +593,6 @@ if (ENABLE_QT)
     endif()
 
     if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # yes Qt, we get it
-        set(QT_NO_PRIVATE_MODULE_WARNING ON)
         find_package(Qt6 REQUIRED COMPONENTS DBus OPTIONAL_COMPONENTS GuiPrivate)
     elseif (UNIX AND NOT APPLE)
         find_package(Qt6 REQUIRED COMPONENTS DBus Gui)

CMakeModules/CPM.cmake

@@ -743,11 +743,9 @@ function(CPMAddPackage)
     if(NOT DEFINED CPM_ARGS_NAME)
       set(CPM_ARGS_NAME ${nameFromUrl})
     endif()
-
+    if(NOT DEFINED CPM_ARGS_VERSION)
-    # this is dumb and should not be done
+      set(CPM_ARGS_VERSION ${verFromUrl})
-    # if(NOT DEFINED CPM_ARGS_VERSION)
+    endif()
-    #   set(CPM_ARGS_VERSION ${verFromUrl})
-    # endif()
 
     list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}")
   endif()

CMakeModules/CPMUtil.cmake

@@ -277,7 +277,6 @@ function(AddPackage)
 
         KEY
         BUNDLED_PACKAGE
-        FORCE_BUNDLED_PACKAGE
         FIND_PACKAGE_ARGUMENTS
     )
 
@@ -427,9 +426,7 @@ function(AddPackage)
         - BUNDLED_PACKAGE
         - default to allow local
     ]]#
-    if (PKG_ARGS_FORCE_BUNDLED_PACKAGE)
+    if (${PKG_ARGS_NAME}_FORCE_SYSTEM)
-        set_precedence(OFF OFF)
-    elseif (${PKG_ARGS_NAME}_FORCE_SYSTEM)
         set_precedence(ON ON)
     elseif (${PKG_ARGS_NAME}_FORCE_BUNDLED)
         set_precedence(OFF OFF)
@@ -449,14 +446,9 @@ function(AddPackage)
         set_precedence(ON OFF)
     endif()
 
-    if (DEFINED PKG_ARGS_VERSION)
-        list(APPEND EXTRA_ARGS
-            VERSION ${PKG_ARGS_VERSION}
-        )
-    endif()
-
     CPMAddPackage(
         NAME ${PKG_ARGS_NAME}
+        VERSION ${PKG_ARGS_VERSION}
         URL ${pkg_url}
         URL_HASH ${pkg_hash}
         CUSTOM_CACHE_KEY ${pkg_key}
@@ -467,8 +459,6 @@ function(AddPackage)
         PATCHES ${PKG_ARGS_PATCHES}
         EXCLUDE_FROM_ALL ON
 
-        ${EXTRA_ARGS}
-
         ${PKG_ARGS_UNPARSED_ARGUMENTS}
     )
 
@@ -521,12 +511,12 @@ function(add_ci_package key)
         NAME ${ARTIFACT_PACKAGE}
         REPO ${ARTIFACT_REPO}
         TAG v${ARTIFACT_VERSION}
-        GIT_VERSION ${ARTIFACT_VERSION}
+        VERSION ${ARTIFACT_VERSION}
         ARTIFACT ${ARTIFACT}
 
-        KEY ${key}-${ARTIFACT_VERSION}
+        KEY ${key}
         HASH_SUFFIX sha512sum
-        FORCE_BUNDLED_PACKAGE ON
+        BUNDLED_PACKAGE ON
     )
 
     set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}_SOURCE_DIR} PARENT_SCOPE)

CMakeModules/Findzstd.cmake

@@ -13,12 +13,9 @@ find_package_handle_standard_args(zstd
 if (zstd_FOUND AND NOT TARGET zstd::zstd)
     if (TARGET zstd::libzstd_shared)
         add_library(zstd::zstd ALIAS zstd::libzstd_shared)
-        add_library(zstd::libzstd ALIAS zstd::libzstd_shared)
     elseif (TARGET zstd::libzstd_static)
         add_library(zstd::zstd ALIAS zstd::libzstd_static)
-        add_library(zstd::libzstd ALIAS zstd::libzstd_static)
     else()
         add_library(zstd::zstd ALIAS PkgConfig::ZSTD)
-        add_library(zstd::libzstd ALIAS PkgConfig::ZSTD)
     endif()
 endif()

README.md

@@ -48,8 +48,6 @@ A list of supported games will be available in future. Please be patient.
 
 Check out our [website](https://eden-emu.dev) for the latest news on exciting features, monthly progress reports, and more!
 
-[![Packaging status](https://repology.org/badge/vertical-allrepos/eden-emulator.svg)](https://repology.org/project/eden-emulator/versions)
-
 ## Development
 
 Most of the development happens on our Git server. It is also where [our central repository](https://git.eden-emu.dev/eden-emu/eden) is hosted. For development discussions, please join us on [Discord](https://discord.gg/kXAmGCXBGD) or [Revolt](https://rvlt.gg/qKgFEAbH).
@@ -65,8 +63,6 @@ Alternatively, if you wish to add translations, go to the [Eden project on Trans
 
 See the [General Build Guide](docs/Build.md)
 
-For information on provided development tooling, see the [Tools directory](./tools)
-
 ## Download
 
 You can download the latest releases from [here](https://github.com/eden-emulator/Releases/releases).

cpmfile.json

@@ -18,7 +18,6 @@
         "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
         "git_version": "1.89.0",
         "version": "1.57",
-        "find_args": "CONFIG",
         "patches": [
             "0001-clang-cl.patch",
             "0002-use-marmasm.patch",
@@ -27,10 +26,12 @@
     },
     "fmt": {
         "repo": "fmtlib/fmt",
-        "tag": "%VERSION%",
+        "sha": "40626af88b",
-        "hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
+        "hash": "d59f06c24339f223de4ec2afeba1c67b5835a0f350a1ffa86242a72fc3e616a6b8b21798355428d4200c75287308b66634619ffa0b52ba5bd74cc01772ea1a8a",
         "version": "8",
-        "git_version": "12.0.0"
+        "options": [
+            "FMT_INSTALL OFF"
+        ]
     },
     "lz4": {
         "name": "lz4",
@@ -42,18 +43,16 @@
     "nlohmann": {
         "package": "nlohmann_json",
         "repo": "nlohmann/json",
-        "tag": "v%VERSION%",
+        "sha": "55f93686c0",
-        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
+        "hash": "b739749b066800e21154506ea150d2c5cbce8a45344177f46f884547a1399d26753166fd0df8135269ce28cf223552b1b65cd625b88c844d54753f2434900486",
-        "version": "3.8",
+        "version": "3.8"
-        "git_version": "3.12.0"
     },
     "zlib": {
         "package": "ZLIB",
         "repo": "madler/zlib",
-        "tag": "v%VERSION%",
+        "sha": "51b7f2abda",
-        "hash": "8c9642495bafd6fad4ab9fb67f09b268c69ff9af0f4f20cf15dfc18852ff1f312bd8ca41de761b3f8d8e90e77d79f2ccacd3d4c5b19e475ecf09d021fdfe9088",
+        "hash": "16eaf1f3752489d12fd9ce30f7b5f7cbd5cb8ff53d617005a9847ae72d937f65e01e68be747f62d7ac19fd0c9aeba9956e60f16d6b465c5fdc2f3d08b4db2e6c",
         "version": "1.2",
-        "git_version": "1.3.1",
         "options": [
             "ZLIB_BUILD_SHARED OFF",
             "ZLIB_INSTALL OFF"
@@ -61,8 +60,8 @@
     },
     "zstd": {
         "repo": "facebook/zstd",
-        "sha": "b8d6101fba",
+        "sha": "f8745da6ff",
-        "hash": "a6c8e5272214fd3e65e03ae4fc375f452bd2f646623886664ee23e239e35751cfc842db4d34a84a8039d89fc8f76556121f2a4ae350d017bdff5e22150f9c3de",
+        "hash": "3037007f990040fe32573b46f9bef8762fd5dbeeb07ffffcbfeba51ec98167edae39bb9c87f9299efcd61c4e467c5e84f7c19f0df7799bc1fc04864a278792ee",
         "version": "1.5",
         "source_subdir": "build/cmake",
         "find_args": "MODULE",
@@ -90,7 +89,7 @@
     "llvm-mingw": {
         "repo": "misc/llvm-mingw",
         "git_host": "git.crueter.xyz",
-        "tag": "%VERSION%",
+        "tag": "20250828",
         "version": "20250828",
         "artifact": "clang-rt-builtins.tar.zst",
         "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181"

docs/CPM.md

@@ -0,0 +1,258 @@
+# CPM
+
+CPM (CMake Package Manager) is the preferred method of managing dependencies within Eden.
+
+Global Options:
+
+- `YUZU_USE_CPM` is set by default on MSVC and Android. Other platforms should use this if certain "required" system dependencies (e.g. OpenSSL) are broken or missing
+  * If this is `OFF`, required system dependencies will be searched via `find_package`, although certain externals use CPM regardless.
+- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
+  * Many packages, e.g. mcl, sirit, xbyak, discord-rpc, are not generally available as a system package.
+  * You may optionally override these (see CPMUtil section)
+- `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
+
+## 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.
+
+### AddPackage
+
+`AddPackage` is the core of the CPMUtil wrapper, and is generally the lowest level you will need to go when dealing with dependencies.
+
+**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 GitHub repo to use (`owner/repo`).
+  * Only GitHub is supported for now, though other platforms will see support at some point
+- `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
+
+**Additional 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 force the usage of a bundled package
+- `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}_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
+
+**Bundled/System Switching**
+
+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)`
+
+### AddCIPackage
+
+Adds a package that follows crueter's CI repository spec.
+
+- `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. One of:
+  * `windows-amd64`
+  * `windows-arm64`
+  * `android`
+  * `solaris-amd64`
+  * `freebsd-amd64`
+  * `linux-amd64`
+  * `linux-aarch64`
+  * `macos-universal`
+
+### AddJsonPackage
+
+This is the recommended method of usage for CPMUtil. 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.
+
+- `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`
+- `patches` -> `PATCHES` (array)
+- `options` -> `OPTIONS` (array)
+
+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`
+
+### 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.5.2",
+        "min_version": "1.1.1"
+    },
+    "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"
+        ]
+    },
+}
+```
+
+### Inclusion
+
+To include CPMUtil:
+
+```cmake
+include(CPMUtil)
+```
+
+## Prefetching
+
+- To prefetch a CPM dependency (requires cpmfile):
+  * `tools/cpm-fetch.sh <packages>`
+- To prefetch all CPM dependencies:
+  * `tools/cpm-fetch-all.sh`
+
+Currently, `cpm-fetch.sh` defines the following directories for cpmfiles (max depth of 2, so subdirs are caught as well):
+
+`externals src/qt_common src/dynarmic .`
+
+Whenever you add a new cpmfile, update the script accordingly

docs/CPMUtil.md

@@ -1,14 +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.
-
-See more in [its repository](https://git.crueter.xyz/CMake/CPMUtil)
-
-Eden-specific options:
-
-- `YUZU_USE_CPM` is set by default on MSVC and Android. Other platforms should use this if certain "required" system dependencies (e.g. OpenSSL) are broken or missing
-  * If this is `OFF`, required system dependencies will be searched via `find_package`, although most externals use CPM regardless.
-
-## Tooling
-
-See the [tooling docs](../tools/cpm)

docs/Deps.md

@@ -63,7 +63,6 @@ Certain other dependencies will be fetched by CPM regardless. System packages *c
 * [VulkanMemoryAllocator](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator)
 * [sirit](https://github.com/eden-emulator/sirit)
 * [httplib](https://github.com/yhirose/cpp-httplib) - if `ENABLE_QT_UPDATE_CHECKER` or `ENABLE_WEB_SERVICE` are on
-  - This package is known to be broken on the AUR.
 * [cpp-jwt](https://github.com/arun11299/cpp-jwt) 1.4+ - if `ENABLE_WEB_SERVICE` is on
 * [unordered-dense](https://github.com/martinus/unordered_dense)
 * [mcl](https://github.com/azahar-emu/mcl) - subject to removal
@@ -195,7 +194,7 @@ Run the usual update + install of essential toolings: `sudo pkg update && sudo p
 - **gcc**: `sudo pkg install developer/gcc-14`.
 - **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.
 
-Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
+Then install the libraries: `sudo pkg install qt6 boost glslang libzip library/lz4 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt`.
 </details>
 
 <details>

docs/README.md

@@ -5,6 +5,6 @@ This contains documentation created by developers. This contains build instructi
 - **[General Build Instructions](Build.md)**
 - **[Development Guidelines](Development.md)**
 - **[Dependencies](Deps.md)**
-- **[CPM - CMake Package Manager](CPMUtil.md)**
+- **[CPM - CMake Package Manager](CPM.md)**
 - **[Platform-Specific Caveats](Caveats.md)**
 - **[User Directory Handling](User.md)**

externals/CMakeLists.txt

@@ -148,23 +148,22 @@ if (ENABLE_SDL2)
 endif()
 
 # SPIRV Headers
-AddJsonPackage(spirv-headers)
+# We only need SPIRV-Headers iff spirv-tools is bundled
-
+if (SPIRV-Tools_FORCE_BUNDLED OR CPMUTIL_FORCE_BUNDLED)
-# Sirit
+    set(NEED_SPIRV_HEADERS ON)
-if (YUZU_USE_BUNDLED_SIRIT)
-    AddJsonPackage(sirit-ci)
 else()
-    AddJsonPackage(sirit)
+    find_package(SPIRV-Tools MODULE QUIET)
-    if(MSVC AND USE_CCACHE AND sirit_ADDED)
+    if (NOT SPIRV-Tools_FOUND)
-        get_target_property(_opts sirit COMPILE_OPTIONS)
+        set(NEED_SPIRV_HEADERS ON)
-        list(FILTER _opts EXCLUDE REGEX "/Zi")
+    else()
-        list(APPEND _opts "/Z7")
+        set(NEED_SPIRV_HEADERS OFF)
-        set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
-    elseif(MSVC AND CXX_CLANG)
-        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
     endif()
 endif()
 
+if (NEED_SPIRV_HEADERS)
+    AddJsonPackage(spirv-headers)
+endif()
+
 # SPIRV Tools
 AddJsonPackage(spirv-tools)
 
@@ -206,6 +205,21 @@ if (VulkanMemoryAllocator_ADDED)
     endif()
 endif()
 
+# Sirit
+if (YUZU_USE_BUNDLED_SIRIT)
+    AddJsonPackage(sirit-ci)
+else()
+    AddJsonPackage(sirit)
+    if(MSVC AND USE_CCACHE AND sirit_ADDED)
+        get_target_property(_opts sirit COMPILE_OPTIONS)
+        list(FILTER _opts EXCLUDE REGEX "/Zi")
+        list(APPEND _opts "/Z7")
+        set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
+    elseif(MSVC AND CXX_CLANG)
+        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
+    endif()
+endif()
+
 # httplib
 if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
     AddJsonPackage(httplib)

externals/cpmfile.json

@@ -2,34 +2,29 @@
     "vulkan-memory-allocator": {
         "package": "VulkanMemoryAllocator",
         "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
-        "tag": "v%VERSION%",
+        "sha": "1076b348ab",
-        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
+        "hash": "a46b44e4286d08cffda058e856c47f44c7fed3da55fe9555976eb3907fdcc20ead0b1860b0c38319cda01dbf9b1aa5d4b4038c7f1f8fbd97283d837fa9af9772",
-        "find_args": "CONFIG",
+        "find_args": "CONFIG"
-        "git_version": "3.3.0"
     },
     "sirit": {
         "repo": "eden-emulator/sirit",
-        "git_version": "1.0.2",
+        "version": "1.0.1",
         "tag": "v%VERSION%",
         "artifact": "sirit-source-%VERSION%.tar.zst",
         "hash_suffix": "sha512sum",
-        "find_args": "CONFIG",
+        "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.2"
+        "version": "1.0.0"
     },
     "httplib": {
         "repo": "yhirose/cpp-httplib",
-        "tag": "v%VERSION%",
+        "sha": "a609330e4c",
-        "hash": "b364500f76e2ecb0fe21b032d831272e3f1dfeea71af74e325f8fc4ce9dcdb3c941b97a5b422bdeafb9facd058597b90f8bfc284fb9afe3c33fefa15dd5a010b",
+        "hash": "dd3fd0572f8367d8549e1319fd98368b3e75801a293b0c3ac9b4adb806473a4506a484b3d389dc5bee5acc460cb90af7a20e5df705a1696b56496b30b9ce7ed2"
-        "git_version": "0.26.0"
     },
     "cpp-jwt": {
         "version": "1.4",
@@ -44,26 +39,22 @@
     "xbyak_sun": {
         "package": "xbyak",
         "repo": "herumi/xbyak",
-        "tag": "v%VERSION%",
+        "sha": "9bb219333a",
-        "hash": "e84992c65ad62c577e2746ec5180132fd2875166d1e6b1521a0ff619787e1645792fe5f6a858fe94ed66f297912b6a6b89a509b5d5f5e81a2db1dd7e6790b1f5",
+        "hash": "303165d45c8c19387ec49d9fda7d7a4e0d86d4c0153898c23f25ce2d58ece567f44c0bbbfe348239b933edb6e1a1e34f4bc1c0ab3a285bee5da0e548879387b0",
-        "bundled": true,
+        "bundled": true
-        "git_version": "7.30"
     },
     "xbyak": {
         "package": "xbyak",
         "repo": "herumi/xbyak",
-        "tag": "v%VERSION%",
+        "sha": "4e44f4614d",
-        "hash": "1042090405c426e339506c179d53e91d4d545ce9c9f53d8f797caa092d589f913a9bcb9c8f31c4c60870acb954c556e305fb6732c66bc3c8f1cd924f9172def9",
+        "hash": "5824e92159e07fa36a774aedd3b3ef3541d0241371d522cffa4ab3e1f215fa5097b1b77865b47b2481376c704fa079875557ea463ca63d0a7fd6a8a20a589e70",
-        "git_version": "7.22",
+        "bundled": true
-        "bundled": true,
-        "skip_updates": true
     },
     "oaknut": {
-        "repo": "eden-emulator/oaknut",
         "version": "2.0.1",
-        "git_version": "2.0.3",
+        "repo": "merryhime/oaknut",
-        "tag": "v%VERSION%",
+        "sha": "94c726ce03",
-        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856"
+        "hash": "d8d082242fa1881abce3c82f8dafa002c4e561e66a69e7fc038af67faa5eff2630f082d3d19579c88c4c9f9488e54552accc8cb90e7ce743efe043b6230c08ac"
     },
     "libadrenotools": {
         "repo": "bylaws/libadrenotools",
@@ -75,18 +66,16 @@
     },
     "oboe": {
         "repo": "google/oboe",
-        "tag": "%VERSION%",
+        "sha": "2bc873e53c",
-        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
+        "hash": "02329058a7f9cf7d5039afaae5ab170d9f42f60f4c01e21eaf4f46073886922b057a9ae30eeac040b3ac182f51b9c1bfe9fe1050a2c9f6ce567a1a9a0ec2c768",
-        "git_version": "1.10.0",
         "bundled": true
     },
     "unordered-dense": {
         "package": "unordered_dense",
         "repo": "martinus/unordered_dense",
-        "tag": "v%VERSION%",
+        "sha": "73f3cbb237",
-        "hash": "f9c819e28e1c1a387acfee09277d6af5e366597a0d39acf1c687acf0608a941ba966af8aaebdb8fba0126c7360269c4a51754ef4cab17c35c01a30215f953368",
+        "hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
-        "find_args": "CONFIG",
+        "find_args": "CONFIG"
-        "git_version": "4.5.0"
     },
     "mbedtls": {
         "package": "MbedTLS",
@@ -95,32 +84,29 @@
         "hash": "6671fb8fcaa832e5b115dfdce8f78baa6a4aea71f5c89a640583634cdee27aefe3bf4be075744da91f7c3ae5ea4e0c765c8fc3937b5cfd9ea73d87ef496524da",
         "version": "3",
         "git_version": "3.6.4",
-        "artifact": "%TAG%.tar.bz2",
+        "artifact": "%TAG%.tar.bz2"
-        "skip_updates": true
     },
     "enet": {
         "repo": "lsalzman/enet",
-        "tag": "v%VERSION%",
+        "sha": "2662c0de09",
-        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
+        "hash": "3de1beb4fa3d6b1e03eda8dd1e7580694f854af3ed3975dcdabfdcdf76b97f322b9734d35ea7f185855bb490d957842b938b26da4dd2dfded509390f8d2794dd",
         "version": "1.3",
-        "git_version": "1.3.18",
         "find_args": "MODULE"
     },
     "vulkan-utility-headers": {
         "package": "VulkanUtilityLibraries",
         "repo": "scripts/VulkanUtilityHeaders",
-        "tag": "%VERSION%",
+        "tag": "1.4.326",
-        "git_version": "1.4.328",
         "artifact": "VulkanUtilityHeaders.tar.zst",
         "git_host": "git.crueter.xyz",
-        "hash": "9922217b39faf73cd4fc1510f2fdba14a49aa5c0d77f9ee24ee0512cef16b234d0cabc83c1fec861fa5df1d43e7f086ca9b6501753899119f39c5ca530cb0dae"
+        "hash": "5924629755cb1605c4aa4eee20ef7957a9dd8d61e4df548be656d98054f2730c4109693c1bd35811f401f4705d2ccff9fc849be32b0d8480bc3f73541a5e0964"
     },
-    "spirv-tools": {
+        "spirv-tools": {
         "package": "SPIRV-Tools",
         "repo": "KhronosGroup/SPIRV-Tools",
-        "tag": "v%VERSION%",
+        "sha": "40eb301f32",
-        "hash": "b17940433ced72e004c5eeffd7dd411b6afcc6a52ee31de6427d88edceb8172369be8ec8bf5b65708a78bf41fdae264d554aa7750b2209831679ab36bc867567",
+        "hash": "58d0fb1047d69373cf24c73e6f78c73a72a6cca3b4df1d9f083b9dcc0962745ef154abf3dbe9b3623b835be20c6ec769431cf11733349f45e7568b3525f707aa",
-        "git_version": "2025.4",
+        "find_args": "MODULE",
         "options": [
             "SPIRV_SKIP_EXECUTABLES ON"
         ]
@@ -128,8 +114,8 @@
     "spirv-headers": {
         "package": "SPIRV-Headers",
         "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "01e0577914",
+        "sha": "4e209d3d7e",
-        "hash": "d0f905311faf7d743de686fdf241dc4cb0a4f08e2184f5a3b3b2946e680db3cd89eeb72954eafe6fa457f93550e27d516575c8709cb134d8aecc0b43064636ce",
+        "hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4",
         "options": [
             "SPIRV_WERROR OFF"
         ]
@@ -146,6 +132,35 @@
             "BUNDLE_SPEEX ON"
         ]
     },
+    "discord-rpc": {
+        "package": "DiscordRPC",
+        "repo": "eden-emulator/discord-rpc",
+        "sha": "1cf7772bb6",
+        "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97"
+    },
+    "simpleini": {
+        "package": "SimpleIni",
+        "repo": "brofield/simpleini",
+        "sha": "09c21bda1d",
+        "hash": "99779ca9b6e040d36558cadf484f9ffdab5b47bcc8fc72e4d33639d1d60c0ceb4410d335ba445d72a4324e455167fd6769d99b459943aa135bec085dff2d4b7c",
+        "find_args": "MODULE"
+    },
+    "sdl2_generic": {
+        "package": "SDL2",
+        "repo": "libsdl-org/SDL",
+        "sha": "54772f345a",
+        "hash": "2a68a0e01c390043aa9d9df63d8a20a52076c88bb460ac4e0f33194ca7d9bc8fadbbcc04e7506872ac4b6354a73fbc267c036f82200da59465789b87c7d9e3a4",
+        "key": "generic",
+        "bundled": true
+    },
+    "sdl2_steamdeck": {
+        "package": "SDL2",
+        "repo": "libsdl-org/SDL",
+        "sha": "cc016b0046",
+        "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b",
+        "key": "steamdeck",
+        "bundled": true
+    },
     "sdl2": {
         "ci": true,
         "package": "SDL2",
@@ -160,43 +175,8 @@
     "catch2": {
         "package": "Catch2",
         "repo": "catchorg/Catch2",
-        "tag": "v%VERSION%",
+        "sha": "644821ce28",
-        "hash": "a95495142f915d6e9c2a23e80fe360343e9097680066a2f9d3037a070ba5f81ee5559a0407cc9e972dc2afae325873f1fc7ea07a64012c0f01aac6e549f03e3f",
+        "hash": "f8795f98acf2c02c0db8e734cc866d5caebab4b4a306e93598b97cb3c0c728dafe8283dce27ffe8d42460e5ae7302f3f32e7e274a7f991b73511ac88eef21b1f",
-        "version": "3.0.1",
+        "version": "3.0.1"
-        "git_version": "3.11.0"
-    },
-    "discord-rpc": {
-        "package": "DiscordRPC",
-        "repo": "eden-emulator/discord-rpc",
-        "sha": "1cf7772bb6",
-        "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97",
-        "find_args": "MODULE"
-    },
-    "simpleini": {
-        "package": "SimpleIni",
-        "repo": "brofield/simpleini",
-        "tag": "v%VERSION%",
-        "hash": "6c198636816a0018adbf7f735d402c64245c6fcd540b7360d4388d46f007f3a520686cdaec4705cb8cb31401b2cb4797a80b42ea5d08a6a5807c0848386f7ca1",
-        "find_args": "MODULE",
-        "git_version": "4.22"
-    },
-    "sdl2_generic": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "tag": "release-%VERSION%",
-        "hash": "d5622d6bb7266f7942a7b8ad43e8a22524893bf0c2ea1af91204838d9b78d32768843f6faa248757427b8404b8c6443776d4afa6b672cd8571a4e0c03a829383",
-        "key": "generic",
-        "bundled": true,
-        "git_version": "2.32.10",
-        "skip_updates": true
-    },
-    "sdl2_steamdeck": {
-        "package": "SDL2",
-        "repo": "libsdl-org/SDL",
-        "sha": "cc016b0046",
-        "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b",
-        "key": "steamdeck",
-        "bundled": true,
-        "skip_updates": "true"
     }
 }

externals/ffmpeg/cpmfile.json

@@ -5,17 +5,17 @@
         "hash": "2a89d664119debbb3c006ab1c48d5d7f26e889f4a65ad2e25c8b0503308295123d5a9c5c78bf683aef5ff09acef8c3fc2837f22d3e8c611528b933bf03bcdd97",
         "bundled": true
     },
-    "ffmpeg-ci": {
+	"ffmpeg-ci": {
         "ci": true,
         "package": "FFmpeg",
         "name": "ffmpeg",
         "repo": "crueter-ci/FFmpeg",
         "version": "8.0",
         "min_version": "4.1",
-        "disabled_platforms": [
+		"disabled_platforms": [
-            "freebsd-amd64",
+			"freebsd-amd64",
-            "solaris-amd64",
+			"solaris-amd64",
             "macos-universal"
-        ]
+		]
     }
 }

externals/libusb/CMakeLists.txt

@@ -6,7 +6,18 @@
 
 include(CPMUtil)
 
-AddJsonPackage(libusb)
+# we love our libraries don't we folks
+if (PLATFORM_SUN)
+    set(libusb_bundled ON)
+else()
+    set(libusb_bundled OFF)
+endif()
+
+# TODO(crueter): Fix on Solaris
+AddJsonPackage(
+    NAME libusb
+    BUNDLED_PACKAGE ${libusb_bundled}
+)
 
 if (NOT libusb_ADDED)
     return()

externals/libusb/cpmfile.json

@@ -1,9 +1,8 @@
 {
-    "libusb": {
+	"libusb": {
-        "repo": "libusb/libusb",
+		"repo": "libusb/libusb",
-        "tag": "v%VERSION%",
+		"sha": "c060e9ce30",
-        "hash": "98c5f7940ff06b25c9aa65aa98e23de4c79a4c1067595f4c73cc145af23a1c286639e1ba11185cd91bab702081f307b973f08a4c9746576dc8d01b3620a3aeb5",
+		"hash": "44647357ba1179020cfa6674d809fc35cf6f89bff1c57252fe3a610110f5013ad678fc6eb5918e751d4384c30e2fe678868dbffc5f85736157e546cb9d10accc",
-        "find_args": "MODULE",
+		"find_args": "MODULE"
-        "git_version": "1.0.29"
+	}
-    }
+}
-}

src/android/app/build.gradle.kts

@@ -57,8 +57,8 @@ android {
     }
 
     defaultConfig {
+        // TODO If this is ever modified, change application_id in strings.xml
         applicationId = "dev.eden.eden_emulator"
-
         minSdk = 28
         targetSdk = 36
         versionName = getGitVersion()
@@ -77,7 +77,7 @@ android {
             cmake {
                 val extraCMakeArgs = (project.findProperty("YUZU_ANDROID_ARGS") as String?)?.split("\\s+".toRegex()) ?: emptyList()
 
-                arguments.addAll(listOf(
+                arguments(
                     "-DENABLE_QT=0", // Don't use QT
                     "-DENABLE_SDL2=0", // Don't use SDL
                     "-DENABLE_WEB_SERVICE=1", // Enable web service
@@ -91,14 +91,13 @@ android {
                     "-DYUZU_TESTS=OFF",
                     "-DDYNARMIC_TESTS=OFF",
                     *extraCMakeArgs.toTypedArray()
-                ))
+                )
 
                 abiFilters("arm64-v8a")
             }
         }
     }
 
-
     val keystoreFile = System.getenv("ANDROID_KEYSTORE_FILE")
     signingConfigs {
         if (keystoreFile != null) {
@@ -119,6 +118,7 @@ android {
 
     // Define build types, which are orthogonal to product flavors.
     buildTypes {
+
         // Signed by release key, allowing for upload to Play Store.
         release {
             signingConfig = if (keystoreFile != null) {
@@ -127,6 +127,7 @@ android {
                 signingConfigs.getByName("default")
             }
 
+            resValue("string", "app_name_suffixed", "Eden")
             isMinifyEnabled = true
             isDebuggable = false
             proguardFiles(
@@ -139,6 +140,7 @@ android {
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         register("relWithDebInfo") {
             isDefault = true
+            resValue("string", "app_name_suffixed", "Eden Debug Release")
             signingConfig = signingConfigs.getByName("default")
             isDebuggable = true
             proguardFiles(
@@ -154,6 +156,7 @@ android {
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
             signingConfig = signingConfigs.getByName("default")
+            resValue("string", "app_name_suffixed", "Eden Debug")
             isDebuggable = true
             isJniDebuggable = true
             versionNameSuffix = "-debug"
@@ -161,62 +164,19 @@ android {
         }
     }
 
-        // this is really annoying but idk any other ways to fix this behavior
-    applicationVariants.all {
-        val variant = this
-        when {
-            variant.flavorName == "legacy" && variant.buildType.name == "debug" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Legacy Debug")
-            }
-            variant.flavorName == "mainline" && variant.buildType.name == "debug" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Debug")
-            }
-            variant.flavorName == "genshinSpoof" && variant.buildType.name == "debug" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Optimized Debug")
-            }
-            variant.flavorName == "legacy" && variant.buildType.name == "relWithDebInfo" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Legacy Debug Release")
-            }
-            variant.flavorName == "mainline" && variant.buildType.name == "relWithDebInfo" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Debug Release")
-            }
-            variant.flavorName == "genshinSpoof" && variant.buildType.name == "relWithDebInfo" -> {
-                variant.resValue("string", "app_name_suffixed", "Eden Optimized Debug Release")
-            }
-        }
-    }
-
     android {
         flavorDimensions.add("version")
         productFlavors {
             create("mainline") {
                 dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden")
+                // No need to set applicationId here
             }
 
             create("genshinSpoof") {
                 dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden Optimized")
+                resValue("string", "app_name_suffixed", "Eden Optimised")
                 applicationId = "com.miHoYo.Yuanshen"
             }
-
-            create("legacy") {
-                dimension = "version"
-                resValue("string", "app_name_suffixed", "Eden Legacy")
-                applicationId = "dev.legacy.eden_emulator"
-
-                externalNativeBuild {
-                    cmake {
-                        arguments.add("-DYUZU_LEGACY=ON")
-                    }
-                }
-
-                sourceSets {
-                    getByName("legacy") {
-                        res.srcDirs("src/main/legacy")
-                    }
-                }
-            }
         }
     }
 

src/common/common_types.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2012 Gekko Emulator
 // SPDX-FileContributor: ShizZy <shizzy247@gmail.com>
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -33,6 +30,7 @@
 
 #include <array>
 #include <cstdint>
+#include <memory>
 
 using u8 = std::uint8_t;   ///< 8-bit unsigned byte
 using u16 = std::uint16_t; ///< 16-bit unsigned short

src/core/arm/nce/arm_nce.cpp

@@ -227,7 +227,7 @@ HaltReason ArmNce::RunThread(Kernel::KThread* thread) {
     if (auto it = post_handlers.find(m_guest_ctx.pc); it != post_handlers.end()) {
         hr = ReturnToRunCodeByTrampoline(thread_params, &m_guest_ctx, it->second);
     } else {
-        hr = ReturnToRunCodeByExceptionLevelChange(m_thread_id, thread_params);  // Android: Use "process handle SIGUSR2 -n true -p true -s false" (and SIGURG) in LLDB when debugging
+        hr = ReturnToRunCodeByExceptionLevelChange(m_thread_id, thread_params);
     }
 
     // Critical section for thread cleanup

src/core/frontend/applets/cabinet.h

@@ -1,14 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 #include <functional>
-#include <memory>
-
 #include "core/frontend/applets/applet.h"
 #include "core/hle/service/nfp/nfp_types.h"
 

src/core/memory/dmnt_cheat_vm.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -8,8 +5,6 @@
 
 #include <variant>
 #include <vector>
-#include <memory>
-
 #include <fmt/printf.h>
 #include "common/common_types.h"
 #include "core/memory/dmnt_cheat_types.h"

src/dynarmic/externals/cpmfile.json

@@ -1,10 +1,9 @@
 {
     "biscuit": {
-        "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
         "version": "0.9.1",
-        "git_version": "0.19.0"
+        "repo": "lioncash/biscuit",
+        "sha": "76b0be8dae",
+        "hash": "47d55ed02d032d6cf3dc107c6c0a9aea686d5f25aefb81d1af91db027b6815bd5add1755505e19d76625feeb17aa2db6cd1668fe0dad2e6a411519bde6ca4489"
     },
     "mcl": {
         "version": "0.1.12",

src/dynarmic/src/dynarmic/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 include(TargetArchitectureSpecificSources)
 
-add_library(dynarmic STATIC
+add_library(dynarmic
     backend/block_range_information.cpp
     backend/block_range_information.h
     backend/exception_handler.h

src/dynarmic/src/dynarmic/common/common_types.h

@@ -1,12 +1,9 @@
 // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-// TODO(crueter): This is identical to root common_types.h
-
 #pragma once
 
 #include <cstdint>
-#include <cstdlib>
 #include <array>
 
 using u8 = std::uint8_t;   ///< 8-bit unsigned byte

src/hid_core/resources/applet_resource.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -8,7 +5,6 @@
 
 #include <array>
 #include <mutex>
-#include <memory>
 
 #include "common/bit_field.h"
 #include "common/common_types.h"

src/hid_core/resources/npad/npad_vibration.h

@@ -1,13 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
 #include <mutex>
-#include <memory>
 
 #include "common/common_types.h"
 #include "core/hle/result.h"

src/hid_core/resources/touch_screen/gesture.h

@@ -1,13 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
 #include <mutex>
-#include <memory>
 
 #include "common/common_types.h"
 #include "core/hle/result.h"

src/hid_core/resources/touch_screen/touch_screen.h

@@ -1,13 +1,9 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #pragma once
 
 #include <mutex>
-#include <memory>
 
 #include "common/common_types.h"
 #include "core/hle/result.h"

src/video_core/buffer_cache/buffer_cache.h

@@ -26,9 +26,7 @@ BufferCache<P>::BufferCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, R
     void(slot_buffers.insert(runtime, NullBufferParams{}));
     gpu_modified_ranges.Clear();
     inline_buffer_id = NULL_BUFFER_ID;
-#ifdef YUZU_LEGACY
+
-    immediately_free = (Settings::values.vram_usage_mode.GetValue() == Settings::VramUsageMode::Aggressive);
-#endif
     if (!runtime.CanReportMemoryUsage()) {
         minimum_memory = DEFAULT_EXPECTED_MEMORY;
         critical_memory = DEFAULT_CRITICAL_MEMORY;
@@ -1380,10 +1378,6 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,
     });
     new_buffer.MarkUsage(copies[0].dst_offset, copies[0].size);
     runtime.CopyBuffer(new_buffer, overlap, copies, true);
-#ifdef YUZU_LEGACY
-    if (immediately_free)
-        runtime.Finish();
-#endif
     DeleteBuffer(overlap_id, true);
 }
 
@@ -1674,12 +1668,7 @@ void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {
     }
 
     Unregister(buffer_id);
-
+    delayed_destruction_ring.Push(std::move(slot_buffers[buffer_id]));
-#ifdef YUZU_LEGACY
-    if (!do_not_mark || !immediately_free)
-#endif
-        delayed_destruction_ring.Push(std::move(slot_buffers[buffer_id]));
-
     slot_buffers.erase(buffer_id);
 
     if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) {

src/video_core/buffer_cache/buffer_cache_base.h

@@ -154,11 +154,7 @@ template <class P>
 class BufferCache : public VideoCommon::ChannelSetupCaches<BufferCacheChannelInfo> {
     // Page size for caching purposes.
     // This is unrelated to the CPU page size and it can be changed as it seems optimal.
-#ifdef YUZU_LEGACY
-    static constexpr u32 CACHING_PAGEBITS = 12;
-#else
     static constexpr u32 CACHING_PAGEBITS = 16;
-#endif
     static constexpr u64 CACHING_PAGESIZE = u64{1} << CACHING_PAGEBITS;
 
     static constexpr bool IS_OPENGL = P::IS_OPENGL;
@@ -172,14 +168,9 @@ class BufferCache : public VideoCommon::ChannelSetupCaches<BufferCacheChannelInf
     static constexpr bool SEPARATE_IMAGE_BUFFERS_BINDINGS = P::SEPARATE_IMAGE_BUFFER_BINDINGS;
     static constexpr bool USE_MEMORY_MAPS_FOR_UPLOADS = P::USE_MEMORY_MAPS_FOR_UPLOADS;
 
-#ifdef YUZU_LEGACY
-    static constexpr s64 TARGET_THRESHOLD = 3_GiB;
-#else
-    static constexpr s64 TARGET_THRESHOLD = 4_GiB;
-#endif
-
     static constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB;
     static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB;
+    static constexpr s64 TARGET_THRESHOLD = 4_GiB;
 
     // Debug Flags.
 
@@ -455,12 +446,7 @@ private:
     Tegra::MaxwellDeviceMemoryManager& device_memory;
 
     Common::SlotVector<Buffer> slot_buffers;
-#ifdef YUZU_LEGACY
+    DelayedDestructionRing<Buffer, 8> delayed_destruction_ring;
-    static constexpr size_t TICKS_TO_DESTROY = 6;
-#else
-    static constexpr size_t TICKS_TO_DESTROY = 8;
-#endif
-    DelayedDestructionRing<Buffer, TICKS_TO_DESTROY> delayed_destruction_ring;
 
     const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{};
 
@@ -492,9 +478,6 @@ private:
     u64 minimum_memory = 0;
     u64 critical_memory = 0;
     BufferId inline_buffer_id;
-#ifdef YUZU_LEGACY
-    bool immediately_free = false;
-#endif
 
     std::array<BufferId, ((1ULL << 34) >> CACHING_PAGEBITS)> page_table;
     Common::ScratchBuffer<u8> tmp_buffer;

src/video_core/host1x/host1x.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -21,15 +18,9 @@ Host1x::~Host1x() = default;
 void Host1x::StartDevice(s32 fd, ChannelType type, u32 syncpt) {
     switch (type) {
     case ChannelType::NvDec:
-#ifdef YUZU_LEGACY
-        std::call_once(nvdec_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneer
-#endif
         devices[fd] = std::make_unique<Tegra::Host1x::Nvdec>(*this, fd, syncpt, frame_queue);
         break;
     case ChannelType::VIC:
-#ifdef YUZU_LEGACY
-        std::call_once(vic_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneer
-#endif
         devices[fd] = std::make_unique<Tegra::Host1x::Vic>(*this, fd, syncpt, frame_queue);
         break;
     default:

src/video_core/host1x/host1x.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -204,10 +201,6 @@ private:
     std::unique_ptr<Common::FlatAllocator<u32, 0, 32>> allocator;
     FrameQueue frame_queue;
     std::unordered_map<s32, std::unique_ptr<CDmaPusher>> devices;
-#ifdef YUZU_LEGACY
-    std::once_flag nvdec_first_init;
-    std::once_flag vic_first_init;
-#endif
 };
 
 } // namespace Tegra::Host1x

src/video_core/texture_cache/texture_cache_base.h

@@ -110,12 +110,7 @@ class TextureCache : public VideoCommon::ChannelSetupCaches<TextureCacheChannelI
 
     static constexpr size_t UNSET_CHANNEL{(std::numeric_limits<size_t>::max)()};
 
-#ifdef YUZU_LEGACY
-    static constexpr s64 TARGET_THRESHOLD = 3_GiB;
-#else
     static constexpr s64 TARGET_THRESHOLD = 4_GiB;
-#endif
-
     static constexpr s64 DEFAULT_EXPECTED_MEMORY = 1_GiB + 125_MiB;
     static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB + 625_MiB;
     static constexpr size_t GC_EMERGENCY_COUNTS = 2;
@@ -484,11 +479,7 @@ private:
     };
     Common::LeastRecentlyUsedCache<LRUItemParams> lru_cache;
 
- #ifdef YUZU_LEGACY
-    static constexpr size_t TICKS_TO_DESTROY = 6;
- #else
     static constexpr size_t TICKS_TO_DESTROY = 8;
-#endif
     DelayedDestructionRing<Image, TICKS_TO_DESTROY> sentenced_images;
     DelayedDestructionRing<ImageView, TICKS_TO_DESTROY> sentenced_image_view;
     DelayedDestructionRing<Framebuffer, TICKS_TO_DESTROY> sentenced_framebuffers;

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -325,6 +325,4 @@ namespace Vulkan {
         return MemoryCommit(allocator, a, info);
     }
 
-
-
 } // namespace Vulkan

src/yuzu/main.cpp

@@ -95,10 +95,9 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
 #include <QUrl>
 #include <QtConcurrent/QtConcurrent>
 
+#ifdef HAVE_SDL2
 #include <QCheckBox>
 #include <QStringLiteral>
-
-#ifdef HAVE_SDL2
 #include <SDL.h> // For SDL ScreenSaver functions
 #endif
 

tools/README.md

@@ -1,21 +0,0 @@
-# Tools
-
-Tools for Eden and other subprojects.
-
-## Third-Party
-
-- [CPMUtil Scripts](./cpm)
-
-## Eden
-
-- `shellcheck.sh`: Ensure POSIX compliance (and syntax sanity) for all tools in this directory and subdirectories.
-- `llvmpipe-run.sh`: Sets environment variables needed to run any command (or Eden) with llvmpipe.
-- `optimize-assets.sh`: Optimize PNG assets with OptiPng.
-- `update-cpm.sh`: Updates CPM.cmake to the latest version.
-- `update-icons.sh`: Rebuild all icons (macOS, Windows, bitmaps) based on the master SVG file (`dist/dev.eden_emu.eden.svg`)
-    * Also optimizes the master SVG
-    * Requires: `png2icns` (libicns), ImageMagick, [`svgo`](https://github.com/svg/svgo)
-- `dtrace-tool.sh`
-- `lanczos_gen.c`
-- `clang-format.sh`: Runs `clang-format` on the entire codebase.
-    * Requires: clang

tools/clang-format.sh

@@ -1,6 +1,3 @@
 #! /bin/sh
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+exec find src -iname *.h -o -iname *.cpp | xargs clang-format-15 -i -style=file:src/.clang-format
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-exec find src -iname "*.h" -o -iname "*.cpp" | xargs clang-format -i -style=file:src/.clang-format

tools/cpm-fetch-all.sh

@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -ex
 
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
@@ -6,12 +6,6 @@
 # SPDX-FileCopyrightText: 2025 crueter
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# provided for workflow compat
+LIBS=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -j 'keys_unsorted | join(" ")' {} \; -printf " ")
 
-# shellcheck disable=SC1091
+tools/cpm-fetch.sh $LIBS
-. tools/cpm/common.sh
-
-chmod +x tools/cpm/fetch.sh
-
-# shellcheck disable=SC2086
-tools/cpm/fetch.sh $LIBS

tools/cpm-fetch.sh

@@ -0,0 +1,236 @@
+#!/bin/bash -e
+
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# SPDX-FileCopyrightText: 2025 crueter
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+[ -z "$CPM_SOURCE_CACHE" ] && 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=$(tr '[:upper:]' '[:lower:]' <<< "$PACKAGE_NAME")
+  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
+
+  mkdir -p "$OUTDIR"
+
+  pushd "$OUTDIR" > /dev/null
+
+  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 [ $(wc -l <<< "$DIRS") -eq 2 ]; then
+    SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
+    mv "$SUBDIR"/* .
+    mv "$SUBDIR"/.* . 2>/dev/null || true
+    rmdir "$SUBDIR"
+  fi
+
+  if grep -e "patches" <<< "$JSON" > /dev/null; then
+    PATCHES=$(jq -r '.patches | join(" ")' <<< "$JSON")
+    for patch in $PATCHES; do
+      patch --binary -p1 < "$ROOTDIR"/.patch/$package/$patch
+    done
+  fi
+
+  popd > /dev/null
+}
+
+ci_package() {
+  REPO=$(jq -r ".repo" <<< "$JSON")
+  EXT=$(jq -r '.extension' <<< "$JSON")
+  [ "$EXT" = null ] && EXT="tar.zst"
+
+  VERSION=$(jq -r ".version" <<< "$JSON")
+
+  NAME=$(jq -r ".name" <<< "$JSON")
+  [ "$NAME" = null ] && NAME="$PACKAGE"
+
+  PACKAGE=$(jq -r ".package | \"$package\"" <<< "$JSON")
+
+  DISABLED=$(jq -j '.disabled_platforms' <<< "$JSON")
+
+  [ "$REPO" = null ] && echo "No repo defined for CI package $package" && return
+
+  echo "-- CI package $PACKAGE"
+
+  for platform in windows-amd64 windows-arm64 android solaris-amd64 freebsd-amd64 linux-amd64 linux-aarch64 macos-universal; 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}"
+    PACKAGE_NAME="$PACKAGE"
+    KEY=$platform
+
+    LOWER_PACKAGE=$(tr '[:upper:]' '[:lower:]' <<< "$PACKAGE_NAME")
+    OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+    [ -d "$OUTDIR" ] && continue
+
+    HASH_ALGO=$(jq -r ".hash_algo" <<< "$JSON")
+    [ "$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
+}
+
+for package in $@
+do
+  # prepare for cancer
+  # TODO(crueter): Fetch json once?
+  JSON=$(find . src -maxdepth 3 -name cpmfile.json -exec jq -r ".\"$package\" | select( . != null )" {} \;)
+
+  [ -z "$JSON" ] && echo "!! No cpmfile definition for $package" && continue
+
+  PACKAGE_NAME=$(jq -r ".package" <<< "$JSON")
+  [ "$PACKAGE_NAME" = null ] && PACKAGE_NAME="$package"
+
+  GIT_HOST=$(jq -r ".git_host" <<< "$JSON")
+  [ "$GIT_HOST" = null ] && GIT_HOST=github.com
+  REPO=$(jq -r ".repo" <<< "$JSON")
+
+  CI=$(jq -r ".ci" <<< "$JSON")
+  if [ "$CI" != null ]; then
+    ci_package
+    continue
+  fi
+
+  VERSION=$(jq -r ".version" <<< "$JSON")
+  GIT_VERSION=$(jq -r ".git_version" <<< "$JSON")
+  TAG=$(jq -r ".tag" <<< "$JSON")
+  SHA=$(jq -r ".sha" <<< "$JSON")
+
+  [ "$GIT_VERSION" = null ] && GIT_VERSION="$VERSION"
+  [ "$GIT_VERSION" = null ] && GIT_VERSION="$TAG"
+
+  # url parsing WOOOHOOHOHOOHOHOH
+  URL=$(jq -r ".url" <<< "$JSON")
+  SHA=$(jq -r ".sha" <<< "$JSON")
+
+  VERSION=$(jq -r ".version" <<< "$JSON")
+  GIT_VERSION=$(jq -r ".git_version" <<< "$JSON")
+
+  if [ "$GIT_VERSION" != null ]; then
+    VERSION_REPLACE="$GIT_VERSION"
+  else
+    VERSION_REPLACE="$VERSION"
+  fi
+
+  TAG=$(jq -r ".tag" <<< "$JSON")
+
+  TAG=$(sed "s/%VERSION%/$VERSION_REPLACE/" <<< $TAG)
+
+  ARTIFACT=$(jq -r ".artifact" <<< "$JSON")
+  ARTIFACT=$(sed "s/%VERSION%/$VERSION_REPLACE/" <<< $ARTIFACT)
+  ARTIFACT=$(sed "s/%TAG%/$TAG/" <<< $ARTIFACT)
+
+  if [ "$URL" != "null" ]; then
+    DOWNLOAD="$URL"
+  elif [ "$REPO" != "null" ]; then
+    GIT_URL="https://$GIT_HOST/$REPO"
+
+    BRANCH=$(jq -r ".branch" <<< "$JSON")
+
+    if [ "$TAG" != "null" ]; then
+      if [ "$ARTIFACT" != "null" ]; then
+        DOWNLOAD="${GIT_URL}/releases/download/${TAG}/${ARTIFACT}"
+      else
+        DOWNLOAD="${GIT_URL}/archive/refs/tags/${TAG}.tar.gz"
+      fi
+    elif [ "$SHA" != "null" ]; then
+      DOWNLOAD="${GIT_URL}/archive/${SHA}.zip"
+    else
+      if [ "$BRANCH" = null ]; then
+        BRANCH=master
+      fi
+
+      DOWNLOAD="${GIT_URL}/archive/refs/heads/${BRANCH}.zip"
+    fi
+  else
+    echo "!! No repo or URL defined for $package"
+    continue
+  fi
+
+  # key parsing
+  KEY=$(jq -r ".key" <<< "$JSON")
+
+  if [ "$KEY" = null ]; then
+    if [ "$SHA" != null ]; then
+      KEY=$(cut -c1-4 - <<< "$SHA")
+    elif [ "$GIT_VERSION" != null ]; then
+      KEY="$GIT_VERSION"
+    elif [ "$TAG" != null ]; then
+      KEY="$TAG"
+    elif [ "$VERSION" != null ]; then
+      KEY="$VERSION"
+    else
+      echo "!! No valid key could be determined for $package. Must define one of: key, sha, tag, version, git_version"
+      continue
+    fi
+  fi
+
+  echo "-- Downloading regular package $package, with key $KEY, from $DOWNLOAD"
+
+  # hash parsing
+  HASH_ALGO=$(jq -r ".hash_algo" <<< "$JSON")
+  [ "$HASH_ALGO" = null ] && HASH_ALGO=sha512
+
+  HASH=$(jq -r ".hash" <<< "$JSON")
+
+  if [ "$HASH" = null ]; then
+    HASH_SUFFIX="${HASH_ALGO}sum"
+    HASH_URL=$(jq -r ".hash_url" <<< "$JSON")
+
+    if [ "$HASH_URL" = null ]; then
+      HASH_URL="${DOWNLOAD}.${HASH_SUFFIX}"
+    fi
+
+    HASH=$(curl "$HASH_URL" -sS -L -o -)
+  fi
+
+  download_package
+done
+
+rm -rf $TMP

tools/cpm-hash.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+SUM=`wget -q https://github.com/$1/archive/$2.zip -O - | sha512sum`
+echo "$SUM" | cut -d " " -f1

tools/cpm/README.md

@@ -1,71 +0,0 @@
-# CPMUtil Tools
-
-These are supplemental shell scripts for CPMUtil aiming to ease maintenance burden for sanity checking, updates, prefetching, formatting, and standard operations done by these shell scripts, all in one common place.
-
-All scripts are POSIX-compliant.
-
-## Meta
-
-These scripts are generally reserved for internal use.
-
-- `common.sh`: Grabs all available cpmfiles and aggregates them together.
-    * Outputs:
-        - `PACKAGES`: The aggregated cpmfile
-        - `LIBS`: The list of individual libraries contained within each cpmfile
-        - `value`: A function that grabs a key from the `JSON` variable (typically the package key)
-- `download.sh`: Utility script to handle downloading of regular and CI packages.
-    * Generally only used by the fetch scripts.
-- `package.sh`: The actual package parser.
-    * Inputs:
-        - `PACKAGE`: The package key
-    * Outputs:
-        - Basically everything. You're best off reading the code rather than me poorly explaining it.
-- `which.sh`: Find which cpmfile a package is located in.
-    * Inputs:
-        - The package key
-- `replace.sh`: Replace a package's cpmfile definition.
-    * Inputs:
-        - `PACKAGE`: The package key
-        - `NEW_JSON`: All keys to replace/add
-    * Keys not found in the new json are not touched. Keys cannot currently be deleted.
-
-## Simple Utilities
-
-These scripts don't really have any functionality, they just help you out a bit yknow?
-
-- `format.sh`: Format all cpmfiles (4-space indent is enforced)
-    * In the future, these scripts will have options for spacing
-- `hash.sh`: Determine the hash of a specific package.
-    * Inputs:
-        - The repository (e.g. fmtlib/fmt)
-        - The sha or tag (e.g. v1.0.1)
-        - `GIT_HOST`: What git host to use (default github.com)
-        - `USE_TAG`: Set to "true" if the second argument is a tag instead of a sha
-        - `ARTIFACT`: The artifact to download, if using a tag. Set to null or empty to use the tag source archive instead
-    * Output: the SHA512 sum of the package
-- `url-hash.sh`: Determine the hash of a URL
-    * Input: the URL
-    * Output: the SHA512 sum of the URL
-
-## Functional Utilities
-
-These modify the CPM cache or cpmfiles. Each allows you to input all the packages to act on, as well as a `<scriptname>-all.sh` that acts upon all available packages.
-
-For the update and hash scripts, set `UPDATE=true` to update the cpmfile with the new version or hash. Beware: if the hash is `cf83e1357...` that means you got a 404 error!
-
-- `fetch.sh`: Prefetch a package according to its cpmfile definition
-    * Packages are fetched to the `.cache/cpm` directory by default, following the CPMUtil default.
-    * Already-fetched packages will be skipped. You can invalidate the entire cache with `rm -rf .cache/cpm`, or invalidate a specific package with e.g. `rm -rf .cache/cpm/packagename` to force a refetch.
-    * In the future, a force option will be added
-    * Note that full prefetching will take a long time depending on your internet, the amount of dependencies, and the size of each dependency.
-- `check-updates.sh`: Check a package for available updates
-    * This only applies to packages that utilize tags.
-    * If the tag is a format string, the `git_version` is acted upon instead.
-    * Setting `FORCE=true` will forcefully update every package and its hash, even if they are on the latest version (`UPDATE` must also be true)
-    * This script generally runs fast.
-    * Packages that should skip updates (e.g. older versions or packages with poorly-made tag structures... looking at you mbedtls) may specify `"skip_updates": true` in their cpmfile definition. This is unnecessary for untagged (e.g. sha or bare URL) packages.
-- `check-hashes.sh`: Check a package's hash
-    * This only applies to packages with hardcoded hashes, NOT ones that use hash URLs.
-    * This script will take a looooooooooooooong time. This is operationally equivalent to a prefetch, and thus checking all hashes will take a while--but it's worth it! Just make sure you're not using dial-up.
-
-You are recommended to run sanity hash checking for every pull request and commit, and weekly update checks.

tools/cpm/check-hash-all.sh

@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC2086
-tools/cpm/check-hash.sh $LIBS

tools/cpm/check-hash.sh

@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# env vars:
-# - UPDATE: fix hashes if needed
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-RETURN=0
-
-for PACKAGE in "$@"
-do
-	export PACKAGE
-	# shellcheck disable=SC1091
-	. tools/cpm/package.sh
-
-    if [ "$CI" != null ]; then
-        continue
-    fi
-
-    [ "$HASH_URL" != null ] && continue
-    [ "$HASH_SUFFIX" != null ] && continue
-
-    echo "-- Package $PACKAGE"
-
-    [ "$HASH" = null ] && echo "-- * Warning: no hash specified" && continue
-
-    export USE_TAG=true
-    ACTUAL=$(tools/cpm/url-hash.sh "$DOWNLOAD")
-
-    # shellcheck disable=SC2028
-    [ "$ACTUAL" != "$HASH" ] && echo "-- * Expected $HASH" && echo "-- * Got      $ACTUAL" && [ "$UPDATE" != "true" ] && RETURN=1
-
-    if [ "$UPDATE" = "true" ] && [ "$ACTUAL" != "$HASH" ]; then
-        # shellcheck disable=SC2034
-        NEW_JSON=$(echo "$JSON" | jq ".hash = \"$ACTUAL\"")
-		export NEW_JSON
-
-		tools/cpm/replace.sh
-    fi
-done
-
-exit $RETURN

tools/cpm/check-updates-all.sh

@@ -1,10 +0,0 @@
-#!/bin/bash -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC2086
-tools/cpm/check-updates.sh $LIBS

tools/cpm/check-updates.sh

@@ -1,90 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# env vars:
-# - UPDATE: update if available
-# - FORCE: forcefully update
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-RETURN=0
-
-filter() {
-	TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\") | not)]") # vulkan
-}
-
-for PACKAGE in "$@"
-do
-	export PACKAGE
-	# shellcheck disable=SC1091
-	. tools/cpm/package.sh
-
-    SKIP=$(value "skip_updates")
-
-    [ "$SKIP" = "true" ] && continue
-
-    [ "$REPO" = null ] && continue
-    [ "$GIT_HOST" != "github.com" ] && continue # TODO
-    # shellcheck disable=SC2153
-    [ "$TAG" = null ] && continue
-
-    echo "-- Package $PACKAGE"
-
-	# TODO(crueter): Support for Forgejo updates w/ forgejo_token
-    # Use gh-cli to avoid ratelimits lmao
-    TAGS=$(gh api --method GET "/repos/$REPO/tags")
-
-    # filter out some commonly known annoyances
-	# TODO add more
-
-    filter vulkan-sdk # vulkan
-    filter yotta # mbedtls
-
-    # ignore betas/alphas (remove if needed)
-	filter alpha
-	filter beta
-	filter rc
-
-	# Add package-specific overrides here, e.g. here for fmt:
-    [ "$PACKAGE" = fmt ] && filter v0.11
-
-    LATEST=$(echo "$TAGS" | jq -r '.[0].name')
-
-    [ "$LATEST" = "$TAG" ] && [ "$FORCE" != "true" ] && echo "-- * Up-to-date" && continue
-
-	RETURN=1
-
-    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 git_version
-        NEW_GIT_VERSION=$(echo "$LATEST" | sed "s/$VERSION_PREFIX//g")
-    fi
-
-    echo "-- * Version $LATEST available, current is $TAG"
-
-    export USE_TAG=true
-    HASH=$(tools/cpm/hash.sh "$REPO" "$LATEST")
-
-    echo "-- * New hash: $HASH"
-
-    if [ "$UPDATE" = "true" ]; then
-		RETURN=0
-
-        if [ "$HAS_REPLACE" = "true" ]; then
-            NEW_JSON=$(echo "$JSON" | jq ".hash = \"$HASH\" | .git_version = \"$NEW_GIT_VERSION\"")
-        else
-            NEW_JSON=$(echo "$JSON" | jq ".hash = \"$HASH\" | .tag = \"$LATEST\"")
-        fi
-
-		export NEW_JSON
-
-		tools/cpm/replace.sh
-    fi
-done
-
-exit $RETURN

tools/cpm/common.sh

@@ -1,32 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-##################################
-# CHANGE THESE FOR YOUR PROJECT! #
-##################################
-
-# Which directories to search
-DIRS=". src"
-
-# How many levels to go (3 is 2 subdirs max)
-MAXDEPTH=3
-
-# shellcheck disable=SC2038
-# shellcheck disable=SC2016
-# shellcheck disable=SC2086
-[ -z "$PACKAGES" ] && PACKAGES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
-
-# For your project you'll want to change the PACKAGES call to include whatever locations you may use (externals, src, etc.)
-# Always include .
-LIBS=$(echo "$PACKAGES" | jq -j 'keys_unsorted | join(" ")')
-
-export PACKAGES
-export LIBS
-export DIRS
-export MAXDEPTH
-
-value() {
-	echo "$JSON" | jq -r ".$1"
-}

tools/cpm/download.sh

@@ -1,100 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# env vars:
-# - UPDATE: fix hashes if needed
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-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
-
-    mkdir -p "$OUTDIR"
-
-	PREVDIR="$PWD"
-    cd "$OUTDIR"
-
-    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"/* .
-        mv "$SUBDIR"/.* . 2>/dev/null || true
-        rmdir "$SUBDIR"
-    fi
-
-    if echo "$JSON" | grep -e "patches" > /dev/null; then
-        PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
-        for patch in $PATCHES; do
-            # shellcheck disable=SC2154
-            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 android solaris-amd64 freebsd-amd64 linux-amd64 linux-aarch64 macos-universal; 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
-
-        LOWER_PACKAGE=$(echo "$PACKAGE_NAME" | tr '[:upper:]' '[:lower:]')
-        OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
-        [ -d "$OUTDIR" ] && continue
-
-        HASH_ALGO=$(value "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
-}

tools/cpm/fetch-all.sh

@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC2086
-tools/cpm/fetch.sh $LIBS

tools/cpm/fetch.sh

@@ -1,36 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[ -z "$CPM_SOURCE_CACHE" ] && CPM_SOURCE_CACHE=$PWD/.cache/cpm
-
-mkdir -p "$CPM_SOURCE_CACHE"
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC1091
-. tools/cpm/download.sh
-
-# shellcheck disable=SC2034
-ROOTDIR="$PWD"
-
-TMP=$(mktemp -d)
-
-# shellcheck disable=SC2034
-for PACKAGE in "$@"
-do
-	export PACKAGE
-	# shellcheck disable=SC1091
-	. tools/cpm/package.sh
-
-    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/format.sh

@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC2086
-FILES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json)
-
-for file in $FILES; do
-    jq --indent 4 < "$file" > "$file".new
-    mv "$file".new "$file"
-done

tools/cpm/hash.sh

@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# usage: hash.sh repo tag-or-sha
-# env vars: GIT_HOST, USE_TAG (use tag instead of sha), ARTIFACT (download artifact with that name instead of src archive)
-
-REPO="$1"
-[ -z "$GIT_HOST" ] && GIT_HOST=github.com
-GIT_URL="https://$GIT_HOST/$REPO"
-
-if [ "$USE_TAG" = "true" ]; then
-    if [ -z "$ARTIFACT" ] || [ "$ARTIFACT" = "null" ]; then
-        URL="${GIT_URL}/archive/refs/tags/$2.tar.gz"
-    else
-        URL="${GIT_URL}/releases/download/$2/${ARTIFACT}"
-    fi
-else
-    URL="${GIT_URL}/archive/$2.zip"
-fi
-
-SUM=$(wget -q "$URL" -O - | sha512sum)
-
-echo "$SUM" | cut -d " " -f1

tools/cpm/package.sh

@@ -1,203 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# env vars:
-# - UPDATE: fix hashes if needed
-
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-[ -z "$PACKAGE" ] && echo "Package was not specified" && exit 0
-
-# shellcheck disable=SC2153
-JSON=$(echo "$PACKAGES" | jq -r ".\"$PACKAGE\" | select( . != null )")
-
-[ -z "$JSON" ] && echo "!! No cpmfile definition for $PACKAGE" && exit 1
-
-# unset stuff
-export PACKAGE_NAME="null"
-export REPO="null"
-export CI="null"
-export GIT_HOST="null"
-export EXT="null"
-export NAME="null"
-export DISABLED="null"
-export TAG="null"
-export ARTIFACT="null"
-export SHA="null"
-export VERSION="null"
-export GIT_VERSION="null"
-export DOWNLOAD="null"
-export URL="null"
-export KEY="null"
-export HASH="null"
-export ORIGINAL_TAG="null"
-export HAS_REPLACE="null"
-export VERSION_REPLACE="null"
-export HASH_URL="null"
-export HASH_SUFFIX="null"
-export HASH_ALGO="null"
-
-########
-# Meta #
-########
-
-REPO=$(value "repo")
-CI=$(value "ci")
-
-PACKAGE_NAME=$(value "package")
-[ "$PACKAGE_NAME" = null ] && PACKAGE_NAME="$PACKAGE"
-
-GIT_HOST=$(value "git_host")
-[ "$GIT_HOST" = null ] && GIT_HOST=github.com
-
-export PACKAGE_NAME
-export REPO
-export CI
-export GIT_HOST
-
-######################
-# CI Package Parsing #
-######################
-
-VERSION=$(value "version")
-
-if [ "$CI" = "true" ]; then
-	EXT=$(value "extension")
-	[ "$EXT" = null ] && EXT="tar.zst"
-
-	NAME=$(value "name")
-	DISABLED=$(echo "$JSON" | jq -j '.disabled_platforms')
-
-	[ "$NAME" = null ] && NAME="$PACKAGE_NAME"
-
-	export EXT
-	export NAME
-	export DISABLED
-	export VERSION
-
-	return 0
-fi
-
-##############
-# Versioning #
-##############
-
-TAG=$(value "tag")
-ARTIFACT=$(value "artifact")
-SHA=$(value "sha")
-GIT_VERSION=$(value "git_version")
-
-[ "$GIT_VERSION" = null ] && GIT_VERSION="$VERSION"
-
-if [ "$GIT_VERSION" != null ]; then
-	VERSION_REPLACE="$GIT_VERSION"
-else
-	VERSION_REPLACE="$VERSION"
-fi
-
-echo "$TAG" | grep -e "%VERSION%" > /dev/null && HAS_REPLACE=true || HAS_REPLACE=false
-ORIGINAL_TAG="$TAG"
-
-TAG=$(echo "$TAG" | sed "s/%VERSION%/$VERSION_REPLACE/g")
-ARTIFACT=$(echo "$ARTIFACT" | sed "s/%VERSION%/$VERSION_REPLACE/g")
-ARTIFACT=$(echo "$ARTIFACT" | sed "s/%TAG%/$TAG/g")
-
-export TAG
-export ARTIFACT
-export SHA
-export VERSION
-export GIT_VERSION
-export ORIGINAL_TAG
-export HAS_REPLACE
-export VERSION_REPLACE
-
-###############
-# URL Parsing #
-###############
-
-URL=$(value "url")
-
-if [ "$URL" != "null" ]; then
-	DOWNLOAD="$URL"
-elif [ "$REPO" != "null" ]; then
-	GIT_URL="https://$GIT_HOST/$REPO"
-
-	BRANCH=$(value "branch")
-
-	if [ "$TAG" != "null" ]; then
-		if [ "$ARTIFACT" != "null" ]; then
-			DOWNLOAD="${GIT_URL}/releases/download/${TAG}/${ARTIFACT}"
-		else
-			DOWNLOAD="${GIT_URL}/archive/refs/tags/${TAG}.tar.gz"
-		fi
-	elif [ "$SHA" != "null" ]; then
-		DOWNLOAD="${GIT_URL}/archive/${SHA}.zip"
-	else
-		if [ "$BRANCH" = null ]; then
-			BRANCH=master
-		fi
-
-		DOWNLOAD="${GIT_URL}/archive/refs/heads/${BRANCH}.zip"
-	fi
-else
-	echo "!! No repo or URL defined for $PACKAGE"
-	exit 1
-fi
-
-export DOWNLOAD
-export URL
-
-###############
-# Key Parsing #
-###############
-
-KEY=$(value "key")
-
-if [ "$KEY" = null ]; then
-	if [ "$SHA" != null ]; then
-		KEY=$(echo "$SHA" | cut -c1-4)
-	elif [ "$GIT_VERSION" != null ]; then
-		KEY="$GIT_VERSION"
-	elif [ "$TAG" != null ]; then
-		KEY="$TAG"
-	elif [ "$VERSION" != null ]; then
-		KEY="$VERSION"
-	else
-		echo "!! No valid key could be determined for $PACKAGE. Must define one of: key, sha, tag, version, git_version"
-		exit 1
-	fi
-fi
-
-export KEY
-
-################
-# Hash Parsing #
-################
-
-HASH_ALGO=$(value "hash_algo")
-[ "$HASH_ALGO" = null ] && HASH_ALGO=sha512
-
-HASH=$(value "hash")
-
-if [ "$HASH" = null ]; then
-	HASH_SUFFIX="${HASH_ALGO}sum"
-	HASH_URL=$(value "hash_url")
-
-	if [ "$HASH_URL" = null ]; then
-		HASH_URL="${DOWNLOAD}.${HASH_SUFFIX}"
-	fi
-
-	HASH=$(curl "$HASH_URL" -Ss -L -o -)
-else
-	HASH_URL=null
-	HASH_SUFFIX=null
-fi
-
-export HASH_URL
-export HASH_SUFFIX
-export HASH
-export HASH_ALGO
-export JSON

tools/cpm/replace.sh

@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Replace a specified package with a modified json.
-
-# env vars:
-# - PACKAGE: The package key to act on
-# - NEW_JSON: The new json to use
-
-[ -z "$PACKAGE" ] && echo "You must provide the PACKAGE environment variable." && return 1
-[ -z "$NEW_JSON" ] && echo "You must provide the NEW_JSON environment variable." && return 1
-
-FILE=$(tools/cpm/which.sh "$PACKAGE")
-
-jq --indent 4 --argjson repl "$NEW_JSON" ".\"$PACKAGE\" *= \$repl" "$FILE" > "$FILE".new
-mv "$FILE".new "$FILE"
-
-echo "-- * -- Updated $FILE"

tools/cpm/url-hash.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-SUM=$(wget -q "$1" -O - | sha512sum)
-echo "$SUM" | cut -d " " -f1

tools/cpm/which.sh

@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: 2025 crueter
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# check which file a package is in
-# shellcheck disable=SC1091
-. tools/cpm/common.sh
-
-# shellcheck disable=SC2086
-JSON=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json -exec grep -l "$1" {} \;)
-
-[ -z "$JSON" ] && echo "!! No cpmfile definition for $1"
-
-echo "$JSON"

tools/dtrace-tool.sh

@@ -1,59 +1,42 @@
 #!/usr/local/bin/bash -ex
-
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 # Basic script to run dtrace sampling over the program (requires Flamegraph)
 # Usage is either running as: ./dtrace-tool.sh pid (then input the pid of the process)
 # Or just run directly with: ./dtrace-tool.sh <command>
-
 FLAMEGRAPH_DIR=".."
-fail() {
+function fail {
-    printf '%s\n' "$1" >&2
+  printf '%s\n' "$1" >&2
-    exit "${2-1}"
+  exit "${2-1}"
 }
-
 [ -f $FLAMEGRAPH_DIR/FlameGraph/stackcollapse.pl ] || fail 'Where is flamegraph?'
 #[ which dtrace ] || fail 'Needs DTrace installed'
-
+read -p "Sampling Hz [800]: " TRACE_CFG_HZ
-read -r "Sampling Hz [800]: " TRACE_CFG_HZ
 if [ -z "${TRACE_CFG_HZ}" ]; then
-    TRACE_CFG_HZ=800
+  TRACE_CFG_HZ=800
 fi
-
+read -p "Sampling time [5] sec: " TRACE_CFG_TIME
-read -r "Sampling time [5] sec: " TRACE_CFG_TIME
 if [ -z "${TRACE_CFG_TIME}" ]; then
-    TRACE_CFG_TIME=5
+  TRACE_CFG_TIME=5
 fi
-
 TRACE_FILE=dtrace-out.user_stacks
 TRACE_FOLD=dtrace-out.fold
 TRACE_SVG=dtrace-out.svg
 ps
-
+if [[ $1 = 'pid' ]]; then
-if [ "$1" = 'pid' ]; then
+  read -p "PID: " TRACE_CFG_PID
-    read -r "PID: " TRACE_CFG_PID
+  sudo echo 'Sudo!'
-    sudo echo 'Sudo!'
 else
-    if [ -f "$1" ] && [ "$1" ]; then
+  [[ -f $1 && $1 ]] || fail 'Usage: ./tools/dtrace-profile.sh <path to program>'
-    	fail 'Usage: ./tools/dtrace-profile.sh <path to program>'
+  echo "Executing: '$@'"
-    fi
+  sudo echo 'Sudo!'
-
+  "$@" &
-    printf "Executing: "
+  TRACE_CFG_PID=$!
-    echo "$@"
-    sudo echo 'Sudo!'
-    "$@" &
-    TRACE_CFG_PID=$!
 fi
-
 TRACE_PROBE="profile-${TRACE_CFG_HZ} /pid == ${TRACE_CFG_PID} && arg1/ { @[ustack()] = count(); } tick-${TRACE_CFG_TIME}s { exit(0); }"
-
 rm -- $TRACE_SVG || echo 'Skip'
-
 sudo dtrace -x ustackframes=100 -Z -n "$TRACE_PROBE" -o $TRACE_FILE 2>/dev/null || exit
-
 perl $FLAMEGRAPH_DIR/FlameGraph/stackcollapse.pl $TRACE_FILE > $TRACE_FOLD || exit
 perl $FLAMEGRAPH_DIR/FlameGraph/flamegraph.pl $TRACE_FOLD > $TRACE_SVG || exit
-
 sudo chmod 0666 $TRACE_FILE
 rm -- $TRACE_FILE $TRACE_FOLD

tools/optimize-assets.sh

@@ -1,9 +1,6 @@
 #!/bin/sh -e
-
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
-
+# Optimizes assets of eden (requires OptiPng)
-# Optimizes assets of Eden (requires OptiPng)
-
 which optipng || exit
-find . -type f -name "*.png" -exec optipng -o7 {} \;
+find . -type f -name *.png -exec optipng -o7 {} \;

tools/reset-submodules.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
+# SPDX-License-Identifier: MIT
+
+git submodule sync
+git submodule foreach --recursive git reset --hard
+git submodule update --init --recursive

tools/shellcheck.sh

@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# fd is slightly faster on NVMe (the syntax sux though)
-if command -v fd > /dev/null; then
-	fd . tools -esh -x shellcheck
-else
-	find tools -name "*.sh" -exec shellcheck -s sh {} \;
-fi

tools/update-cpm.sh

@@ -1,6 +1,3 @@
-#!/bin/sh -e
+#!/bin/sh
 
-# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+wget -O CMakeModules/CPM.cmake https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/get_cpm.cmake
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-wget -O CMakeModules/CPM.cmake https://github.com/cpm-cmake/CPM.cmake/releases/latest/download/CPM.cmake

tools/update-icons.sh

@@ -1,11 +1,8 @@
 #!/bin/sh -e
-
 # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 # Updates main icons for eden
-
+which png2icns || [ which yay && yay libicns ] || exit
-which png2icns || (which yay && yay libicns) || exit
 which magick || exit
 
 export EDEN_SVG_ICO="dist/dev.eden_emu.eden.svg"

tools/url-hash.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+SUM=`wget -q $1 -O - | sha512sum`
+echo "$SUM" | cut -d " " -f1