From 7530ac4acddced2c4c66476b1750a20093a56ac7 Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 19 Oct 2025 21:09:35 -0400 Subject: [PATCH] fix remaining zip references Signed-off-by: crueter --- cpmfile.json | 8 ++++---- externals/cpmfile.json | 14 +++++++------- externals/ffmpeg/cpmfile.json | 2 +- src/dynarmic/externals/cpmfile.json | 6 +++--- src/qt_common/externals/cpmfile.json | 4 ++-- tools/cpm/README.md | 5 +++++ tools/cpm/package.sh | 4 ++-- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cpmfile.json b/cpmfile.json index e9e53ed326..abb80c1dd7 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -36,7 +36,7 @@ "name": "lz4", "repo": "lz4/lz4", "sha": "ebb370ca83", - "hash": "43600e87b35256005c0f2498fa56a77de6783937ba4cfce38c099f27c03188d097863e8a50c5779ca0a7c63c29c4f7ed0ae526ec798c1fd2e3736861b62e0a37", + "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab", "source_subdir": "build/cmake" }, "nlohmann": { @@ -62,7 +62,7 @@ "zstd": { "repo": "facebook/zstd", "sha": "b8d6101fba", - "hash": "a6c8e5272214fd3e65e03ae4fc375f452bd2f646623886664ee23e239e35751cfc842db4d34a84a8039d89fc8f76556121f2a4ae350d017bdff5e22150f9c3de", + "hash": "cc5ad4b119a9c2ea57f0b71eeff01113bb506e0d17000159c5409cb8236d22e38c52d5e9e97e7947a4bf1b2dfc44b6c503ab2d9aedbd59458435c6a2849cb029", "version": "1.5", "source_subdir": "build/cmake", "find_args": "MODULE", @@ -74,7 +74,7 @@ "package": "Opus", "repo": "crueter/opus", "sha": "ab19c44fad", - "hash": "79d0d015b19e74ce6076197fc32b86fe91d724a0b5a79e86adfc4bdcb946ece384e252adbbf742b74d03040913b70bb0e9556eafa59ef20e42d2f3f4d6f2859a", + "hash": "d632e8f83c5d3245db404bcb637113f9860bf16331498ba2c8e77979d1febee6b52d8b1da448e7d54eeac373e912cd55e3e300fc6c242244923323280dc43fbe", "version": "1.3", "find_args": "MODULE", "options": [ @@ -84,7 +84,7 @@ "boost_headers": { "repo": "boostorg/headers", "sha": "95930ca8f5", - "hash": "d1dece16f3b209109de02123c537bfe1adf07a62b16c166367e7e5d62e0f7c323bf804c89b3192dd6871bc58a9d879d25a1cc3f7b9da0e497cf266f165816e2a", + "hash": "8a07d7a6f0065587d3005a83481a794704ae22e773b9f336fbd89ed230aaa7b4c86c03edcbae30bba8b3e20839c3131eaa2dceac037ef811533ef4eadc53b15b", "bundled": true }, "llvm-mingw": { diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 242f582ba2..6056a5be24 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -36,7 +36,7 @@ "version": "1.4", "repo": "crueter/cpp-jwt", "sha": "9eaea6328f", - "hash": "e237d92c59ebbf0dc8ac0bae3bc80340e1e9cf430e1c1c9638443001118e16de2b3e9036ac4b98105427667b0386d97831415170b68c432438dcad9ef8052de7", + "hash": "35b0b2bfb143585c7b2bd6dc6ca7df5ae5c6e2681000b2ebca077b0ac4bc1e6b6afbe1ce8e47f6d2edad12fcc6404f677acc2ad205661d819b8821ce6f4823fd", "find_args": "CONFIG", "options": [ "CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF" @@ -70,7 +70,7 @@ "libadrenotools": { "repo": "bylaws/libadrenotools", "sha": "8fae8ce254", - "hash": "c74fa855f0edebbf25c9bce40b00966daa2447bfc5e15f0cf1a95f86cbf70fc6b02590707edbde16328a0a2a4fb9a1fc419d2dfc22a4a4150971be91892d4edb", + "hash": "db4a74ce15559c75e01d1868a90701519b655d77f2a343bbee283a42f8332dc9046960fb022dc969f205e457348a3f99cb8be6e1cd91264d2ae1235294b9f9b2", "patches": [ "0001-linkerns-cpm.patch" ] @@ -125,7 +125,7 @@ "package": "SPIRV-Tools", "repo": "crueter/SPIRV-Tools", "sha": "2fa2d44485", - "hash": "45b198be1d09974ccb2438e8bfa5683f23a0421b058297c28eacfd77e454ec2cf87e77850eddd202efff34b004d8d6b4d12e9615e59bd72be904c196f5eb2169", + "hash": "3124bbddf7bd44f11445edeca6786b5bba9fb314f27dc087d0bbd9951b0936884ece2b9b40b75cfc8e31ab10ba55854e73aa63df835c40423b1c81dd47b1437d", "git_version": "2025.4", "options": [ "SPIRV_SKIP_EXECUTABLES ON" @@ -138,7 +138,7 @@ "package": "SPIRV-Headers", "repo": "KhronosGroup/SPIRV-Headers", "sha": "01e0577914", - "hash": "d0f905311faf7d743de686fdf241dc4cb0a4f08e2184f5a3b3b2946e680db3cd89eeb72954eafe6fa457f93550e27d516575c8709cb134d8aecc0b43064636ce", + "hash": "e2b90e95b6f492e640cd27c090d7072f0d03c8fc7382be67cbe176fc8f3fdd78b59f5f0b906198e09808fde645427f409cb9ab8fe4843de7f7dc5b510d454a0a", "options": [ "SPIRV_WERROR OFF" ] @@ -146,7 +146,7 @@ "cubeb": { "repo": "mozilla/cubeb", "sha": "fa02160712", - "hash": "82d808356752e4064de48c8fecbe7856715ade1e76b53937116bf07129fc1cc5b3de5e4b408de3cd000187ba8dc32ca4109661cb7e0355a52e54bd81b9be1c61", + "hash": "8a4bcb2f83ba590f52c66626e895304a73eb61928dbc57777e1822e55378e3568366f17f9da4b80036cc2ef4ea9723c32abf6e7d9bbe00fb03654f0991596ab0", "find_args": "CONFIG", "options": [ "USE_SANITIZERS OFF", @@ -181,7 +181,7 @@ "package": "DiscordRPC", "repo": "eden-emulator/discord-rpc", "sha": "1cf7772bb6", - "hash": "e9b35e6f2c075823257bcd59f06fe7bb2ccce1976f44818d2e28810435ef79c712a3c4f20f40da41f691342a4058cf86b078eb7f9d9e4dae83c0547c21ec4f97", + "hash": "9a6c35887dcacceb4ba1bf3141edb73b05b2abc719a8d81dad9cb9dd5b039ce203946787335d9d738af669c10cf2534638b645635a22096fc28dcae2475e0cbe", "find_args": "MODULE" }, "simpleini": { @@ -206,7 +206,7 @@ "package": "SDL2", "repo": "libsdl-org/SDL", "sha": "cc016b0046", - "hash": "34d5ef58da6a4f9efa6689c82f67badcbd741f5a4f562a9c2c30828fa839830fb07681c5dc6a7851520e261c8405a416ac0a2c2513b51984fb3b4fa4dcb3e20b", + "hash": "b8d9873446cdb922387471df9968e078714683046674ef0d0edddf8e25da65a539a3bae83d635496b970237f90b07b36a69f8d7855d450de59311d6d6e8c3dbc", "key": "steamdeck", "bundled": true, "skip_updates": "true" diff --git a/externals/ffmpeg/cpmfile.json b/externals/ffmpeg/cpmfile.json index a4933da275..b06008f68a 100644 --- a/externals/ffmpeg/cpmfile.json +++ b/externals/ffmpeg/cpmfile.json @@ -2,7 +2,7 @@ "ffmpeg": { "repo": "FFmpeg/FFmpeg", "sha": "c2184b65d2", - "hash": "2a89d664119debbb3c006ab1c48d5d7f26e889f4a65ad2e25c8b0503308295123d5a9c5c78bf683aef5ff09acef8c3fc2837f22d3e8c611528b933bf03bcdd97", + "hash": "007b1ccdd4d3ea3324835258d9a255103253bd66edb442b12d9c60dca85149cad52136a3b3120e5094115b6a3d9e80eeacbf9c07e5ffafc9ac459614d5fa3b22", "bundled": true }, "ffmpeg-ci": { diff --git a/src/dynarmic/externals/cpmfile.json b/src/dynarmic/externals/cpmfile.json index 3479b7982b..f1fd47d556 100644 --- a/src/dynarmic/externals/cpmfile.json +++ b/src/dynarmic/externals/cpmfile.json @@ -10,7 +10,7 @@ "version": "0.1.12", "repo": "azahar-emu/mcl", "sha": "7b08d83418", - "hash": "f943bac39c1879986decad7a442ff4288eaeca4a2907684c7914e115a55ecc43c2782ded85c0835763fe04e40d5c82220ce864423e489e648e408a84f54dc4f3", + "hash": "9c6ba624cb22ef622f78046a82abb99bf5026284ba17dfacaf46ac842cbd3b0f515f5ba45a1598c7671318a78a2e648db72ce8d10e7537f34e39800bdcb57694", "options": [ "MCL_INSTALL OFF" ], @@ -22,14 +22,14 @@ "package": "zycore", "repo": "zyantific/zycore-c", "sha": "75a36c45ae", - "hash": "15aa399f39713e042c4345bc3175c82f14dca849fde2a21d4f591f62c43e227b70d868d8bb86beb5f4eb68b1d6bd3792cdd638acf89009e787e3d10ee7401924" + "hash": "e1cf9bdd3163b6429eba94d0f9f82e343de33b77a838748f598c719913c9f91c502b818e37b716e174b55a3a26cdf39d665c4b50a548255973ac287c0e554fb6" }, "zydis": { "package": "zydis", "version": "4", "repo": "zyantific/zydis", "sha": "c2d2bab025", - "hash": "7b48f213ff7aab2926f8c9c65195959143bebbfb2b9a25051ffd8b8b0f1baf1670d9739781de674577d955925f91ac89376e16b476a03828c84e2fd765d45020", + "hash": "3808773593536f78d3ddaf4cf712101d3fb6d981c6cc55555ad686a9adbe3397a727f62f561e8d8755bdcd88a763777da30281cc2924fc160b0386c3f99f5bd9", "options": [ "ZYDIS_BUILD_TOOLS OFF", "ZYDIS_BUILD_EXAMPLES OFF", diff --git a/src/qt_common/externals/cpmfile.json b/src/qt_common/externals/cpmfile.json index 3b8cec0def..8d90fdc77c 100644 --- a/src/qt_common/externals/cpmfile.json +++ b/src/qt_common/externals/cpmfile.json @@ -3,7 +3,7 @@ "package": "QuaZip-Qt6", "repo": "crueter/quazip-qt6", "sha": "f838774d63", - "hash": "9f629a438699801244a106c8df6d5f8f8d19e80df54f530a89403a10c8c4e37a6e95606bbdd307f23636961e8ce34eb37a2186d589a1f227ac9c8e2c678e326e", + "hash": "e8f950f47c1f358e2666f08517a9b5b06980677540d3836384e2c27ff5bb129b218f1502b03fdb207d7fd4cd56893f0a0d9094ba8309f19a49cb11e3bb911594", "version": "1.3", "options": [ "QUAZIP_INSTALL OFF" @@ -13,6 +13,6 @@ "package": "frozen", "repo": "serge-sans-paille/frozen", "sha": "61dce5ae18", - "hash": "1ae3d073e659c1f24b2cdd76379c90d6af9e06bc707d285a4fafce05f7a4c9e592ff208c94a9ae0f0d07620b3c6cec191f126b03d70ad4dfa496a86ed5658a6d" + "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c" } } diff --git a/tools/cpm/README.md b/tools/cpm/README.md index aba68ce599..a28c5d37cf 100755 --- a/tools/cpm/README.md +++ b/tools/cpm/README.md @@ -4,6 +4,11 @@ These are supplemental shell scripts for CPMUtil aiming to ease maintenance burd All scripts are POSIX-compliant. If something doesn't work on your shell, ensure it's POSIX-compliant. * If your shell doesn't support `$(...)` syntax, you've got bigger problems to worry about. + +- [Meta](#meta) +- [Simple Utilities](#simple-utilities) +- [Functional Utilities](#functional-utilities) + ## Meta diff --git a/tools/cpm/package.sh b/tools/cpm/package.sh index b1c2095b39..79c71c18a7 100755 --- a/tools/cpm/package.sh +++ b/tools/cpm/package.sh @@ -131,13 +131,13 @@ elif [ "$REPO" != "null" ]; then DOWNLOAD="${GIT_URL}/archive/refs/tags/${TAG}.tar.gz" fi elif [ "$SHA" != "null" ]; then - DOWNLOAD="${GIT_URL}/archive/${SHA}.zip" + DOWNLOAD="${GIT_URL}/archive/${SHA}.tar.gz" else if [ "$BRANCH" = null ]; then BRANCH=master fi - DOWNLOAD="${GIT_URL}/archive/refs/heads/${BRANCH}.zip" + DOWNLOAD="${GIT_URL}/archive/refs/heads/${BRANCH}.tar.gz" fi else echo "!! No repo or URL defined for $PACKAGE"