[cmake] CPMUtil rewrite of the day number 852 (#4130)

Composite PR for several changes to CPMUtil, most notably:
- https://git.crueter.xyz/CMake/CPMUtil/pulls/19
- https://git.crueter.xyz/CMake/CPMUtil/pulls/22
- https://git.crueter.xyz/CMake/CPMUtil/pulls/24
- https://git.crueter.xyz/CMake/CPMUtil/pulls/25

These contain a lot of changes that generally simplify control flow and improve ease-of-use. Read those descriptions and patchsets for more info.

Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4130
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>

1 files changed, 45 insertions, 79 deletions

diff --git a/cpmfile.json b/cpmfile.json
index 5bfb7ebb63..cac6c357b0 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -3,11 +3,10 @@
         "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
         "min_version": "0.9.1",
         "repo": "lioncash/biscuit",
-        "tag": "v%VERSION%",
-        "version": "0.19.0"
+        "version": "v0.19.0"
     },
     "boost": {
-        "artifact": "%TAG%-cmake.tar.xz",
+        "artifact": "%VERSION%-cmake.tar.xz",
         "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
         "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
         "min_version": "1.57",
@@ -16,15 +15,13 @@
             "0001-clang-cl.patch"
         ],
         "repo": "boostorg/boost",
-        "tag": "boost-%VERSION%",
-        "version": "1.90.0"
+        "version": "boost-1.90.0"
     },
     "boost_headers": {
         "bundled": true,
         "hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507",
         "repo": "boostorg/headers",
-        "tag": "boost-%VERSION%",
-        "version": "1.90.0"
+        "version": "boost-1.90.0"
     },
     "catch2": {
         "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
@@ -34,8 +31,7 @@
             "0001-solaris-isnan-fix.patch"
         ],
         "repo": "catchorg/Catch2",
-        "tag": "v%VERSION%",
-        "version": "3.13.0"
+        "version": "v3.13.0"
     },
     "cpp-jwt": {
         "find_args": "CONFIG",
@@ -48,8 +44,7 @@
             "0001-fix-missing-decl.patch"
         ],
         "repo": "arun11299/cpp-jwt",
-        "sha": "7f24eb4c32",
-        "version": "1.5.1"
+        "version": "7f24eb4c32"
     },
     "cubeb": {
         "find_args": "CONFIG",
@@ -61,31 +56,26 @@
             "BUNDLE_SPEEX ON"
         ],
         "repo": "mozilla/cubeb",
-        "sha": "fa02160712",
-        "version": "0.0.0"
+        "version": "fa02160712"
     },
     "discord-rpc": {
         "find_args": "MODULE",
         "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
         "package": "DiscordRPC",
         "repo": "eden-emulator/discord-rpc",
-        "sha": "0d8b2d6a37",
-        "version": "3.4.1"
+        "version": "0d8b2d6a37"
     },
     "enet": {
         "find_args": "MODULE",
         "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
         "min_version": "1.3",
         "repo": "lsalzman/enet",
-        "tag": "v%VERSION%",
-        "version": "1.3.18"
+        "version": "v1.3.18"
     },
     "ffmpeg": {
-        "bundled": true,
         "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
         "repo": "FFmpeg/FFmpeg",
-        "sha": "c7b5f1537d",
-        "version": "8.0.1"
+        "version": "c7b5f1537d"
     },
     "ffmpeg-ci": {
         "ci": true,
@@ -99,23 +89,20 @@
         "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"
+        "version": "61dce5ae18"
     },
     "gamemode": {
         "find_args": "MODULE",
         "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
         "min_version": "1.7",
         "repo": "FeralInteractive/gamemode",
-        "sha": "ce6fe122f3",
-        "version": "1.8.2"
+        "version": "ce6fe122f3"
     },
     "httplib": {
         "find_args": "MODULE GLOBAL",
@@ -128,23 +115,20 @@
             "0001-mingw.patch"
         ],
         "repo": "yhirose/cpp-httplib",
-        "tag": "v%VERSION%",
-        "version": "0.46.0"
+        "version": "v0.46.0"
     },
     "lagoon": {
         "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e",
         "repo": "loongson-community/lagoon",
-        "tag": "%VERSION%",
         "version": "1.0.0"
     },
     "libadrenotools": {
         "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
         "patches": [
-            "0001-linkerns-cpm.patch"
+            "0001-use-cpmfile-def-for-linkernsbypass.patch"
         ],
         "repo": "eden-emulator/libadrenotools",
-        "sha": "8ba23b42d7",
-        "version": "1.0.0"
+        "version": "8ba23b42d7"
     },
     "libusb": {
         "find_args": "MODULE",
@@ -153,53 +137,52 @@
             "0001-netbsd-gettime.patch"
         ],
         "repo": "libusb/libusb",
-        "tag": "v%VERSION%",
-        "version": "1.0.29"
+        "version": "v1.0.29"
+    },
+    "linkernsbypass": {
+        "bundled": "true",
+        "hash": "bbe3f1f08e2bc7172b36e8f052912cc374289fc9a8e5a39ae7547a0c232de8f57ba24883451896b7a9a5d1be0e4de5c5b0f70c2022eda18d7d5a754847521800",
+        "repo": "bylaws/liblinkernsbypass",
+        "version": "aa3975893d"
     },
     "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"
+        "version": "ebb370ca83"
     },
     "moltenvk": {
         "artifact": "MoltenVK-macOS.tar",
         "bundled": true,
         "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
         "repo": "V380-Ori/Ryujinx.MoltenVK",
-        "tag": "v%VERSION%-ryujinx",
-        "version": "1.4.1"
+        "version": "v1.4.1-ryujinx"
     },
     "nlohmann": {
         "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
         "min_version": "3.8",
         "package": "nlohmann_json",
         "repo": "nlohmann/json",
-        "tag": "v%VERSION%",
-        "version": "3.12.0"
+        "version": "v3.12.0"
     },
     "oaknut": {
         "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856",
         "min_version": "2.0.1",
         "repo": "eden-emulator/oaknut",
-        "tag": "v%VERSION%",
-        "version": "2.0.3"
+        "version": "v2.0.3"
     },
     "oboe": {
         "bundled": true,
         "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
         "repo": "google/oboe",
-        "tag": "%VERSION%",
         "version": "1.10.0"
     },
     "openssl": {
@@ -210,8 +193,7 @@
             "0001-add-bundled-cert.patch"
         ],
         "repo": "openssl/openssl",
-        "tag": "openssl-%VERSION%",
-        "version": "3.6.2"
+        "version": "openssl-3.6.2"
     },
     "openssl-ci": {
         "ci": true,
@@ -234,7 +216,6 @@
             "0004-use-shell-wrapper.patch"
         ],
         "repo": "jimmy-park/openssl-cmake",
-        "tag": "%VERSION%",
         "version": "3.6.2"
     },
     "opus": {
@@ -250,8 +231,7 @@
             "0002-no-install.patch"
         ],
         "repo": "xiph/opus",
-        "sha": "a3f0ec02b3",
-        "version": "1.5.2"
+        "version": "a3f0ec02b3"
     },
     "quazip": {
         "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
@@ -264,16 +244,14 @@
         ],
         "package": "QuaZip-Qt6",
         "repo": "stachenov/quazip",
-        "sha": "2e95c9001b",
-        "version": "1.5"
+        "version": "2e95c9001b"
     },
     "sdl3": {
         "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
         "min_version": "3.2.10",
         "package": "SDL3",
         "repo": "libsdl-org/SDL",
-        "tag": "release-%VERSION%",
-        "version": "3.4.8"
+        "version": "release-3.4.8"
     },
     "sdl3-ci": {
         "ci": true,
@@ -288,19 +266,16 @@
         "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
         "package": "SimpleIni",
         "repo": "brofield/simpleini",
-        "tag": "v%VERSION%",
-        "version": "4.25"
+        "version": "v4.25"
     },
     "sirit": {
-        "artifact": "sirit-source-%VERSION%.tar.zst",
         "find_args": "CONFIG",
+        "hash": "b7cd6885acae3fc8698288d19febba0dd45e4a02a2b6563d2eb995a988d0847046e8d16a5dea7e0bf832b4321bcec134cdbafc553f6ede039e4cf34525c5dce5",
         "options": [
             "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
         ],
         "repo": "eden-emulator/sirit",
-        "tag": "v%VERSION%",
-        "version": "1.0.5",
-        "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293"
+        "version": "v1.0.5"
     },
     "sirit-ci": {
         "ci": true,
@@ -310,13 +285,13 @@
         "version": "1.0.5"
     },
     "spirv-headers": {
-        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
+        "hash": "d624371dd455c66a300344c89812598ffe11b5eedba555779f789e85c29dc67317741858c60e0744a1e6755cc0d2759b8659f0674f4cc31479c4cb6fc25ed23b",
         "options": [
             "SPIRV_WERROR OFF"
         ],
         "package": "SPIRV-Headers",
         "repo": "KhronosGroup/SPIRV-Headers",
-        "sha": "04f10f650d"
+        "version": "vulkan-sdk-1.4.341.0"
     },
     "tzdb": {
         "artifact": "%VERSION%.tar.gz",
@@ -324,7 +299,6 @@
         "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
         "package": "nx_tzdb",
         "repo": "eden-emu/tzdb_to_nx",
-        "tag": "%VERSION%",
         "version": "230326"
     },
     "unordered-dense": {
@@ -336,46 +310,40 @@
             "0001-avoid-memset-when-clearing-an-empty-table.patch"
         ],
         "repo": "martinus/unordered_dense",
-        "sha": "7b55cab841",
-        "version": "4.8.1"
+        "version": "7b55cab841"
     },
     "vulkan-headers": {
         "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
         "min_version": "1.4.317",
         "package": "VulkanHeaders",
         "repo": "KhronosGroup/Vulkan-Headers",
-        "tag": "v%VERSION%",
-        "version": "1.4.345"
+        "version": "v1.4.345"
     },
     "vulkan-memory-allocator": {
         "find_args": "CONFIG",
         "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
         "package": "VulkanMemoryAllocator",
         "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
-        "tag": "v%VERSION%",
-        "version": "3.3.0"
+        "version": "v3.3.0"
     },
     "vulkan-utility-libraries": {
         "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
         "package": "VulkanUtilityLibraries",
         "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "tag": "v%VERSION%",
-        "version": "1.4.345"
+        "version": "v1.4.345"
     },
     "vulkan-validation-layers": {
-        "artifact": "android-binaries-%VERSION%.zip",
+        "artifact": "android-binaries-%NUMERIC_VERSION%.zip",
         "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753",
-        "package": "VVL",
+        "numeric_version": "1.4.341.0",
         "repo": "KhronosGroup/Vulkan-ValidationLayers",
-        "tag": "vulkan-sdk-%VERSION%",
-        "version": "1.4.341.0"
+        "version": "vulkan-sdk-%NUMERIC_VERSION%"
     },
     "xbyak": {
         "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
         "package": "xbyak",
         "repo": "herumi/xbyak",
-        "tag": "v%VERSION%",
-        "version": "7.35.2"
+        "version": "v7.35.2"
     },
     "zlib": {
         "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
@@ -386,8 +354,7 @@
         ],
         "package": "ZLIB",
         "repo": "madler/zlib",
-        "tag": "v%VERSION%",
-        "version": "1.3.2"
+        "version": "v1.3.2"
     },
     "zstd": {
         "find_args": "MODULE",
@@ -397,8 +364,7 @@
             "ZSTD_BUILD_SHARED OFF"
         ],
         "repo": "facebook/zstd",
-        "sha": "b8d6101fba",
         "source_subdir": "build/cmake",
-        "version": "1.5.7"
+        "version": "b8d6101fba"
     }
 }