From 319842954f240483c94eed24bfb9be5987d186fc Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 1 Sep 2025 18:42:56 +0000 Subject: [PATCH 1/3] [cmake] fix gh dependencies Signed-off-by: lizzie --- .patch/unordered_dense/0001-cmake.patch | 22 ++++++++++++++++++++++ externals/cpmfile.json | 7 +++---- src/dynarmic/externals/cpmfile.json | 5 ++++- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 .patch/unordered_dense/0001-cmake.patch diff --git a/.patch/unordered_dense/0001-cmake.patch b/.patch/unordered_dense/0001-cmake.patch new file mode 100644 index 0000000000..39e7794b1f --- /dev/null +++ b/.patch/unordered_dense/0001-cmake.patch @@ -0,0 +1,22 @@ +From e59d30b7b12e1d04cc2fc9c6219e35bda447c17e Mon Sep 17 00:00:00 2001 +From: Lizzie <159065448+Lizzie841@users.noreply.github.com> +Date: Fri, 16 May 2025 04:12:13 +0100 +Subject: [PATCH] Update CMakeLists.txt + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5f4c4f..c5c6f31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ target_include_directories( + + target_compile_features(unordered_dense INTERFACE cxx_std_17) + +-if(_unordered_dense_is_toplevel_project) ++if(_unordered_dense_is_toplevel_project OR UNORDERED_DENSE_INSTALL) + # locations are provided by GNUInstallDirs + install( + TARGETS unordered_dense diff --git a/externals/cpmfile.json b/externals/cpmfile.json index effcbcc01f..8165e850dc 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -74,14 +74,13 @@ }, "xbyak_sun": { "package": "xbyak", - "repo": "Lizzie841/xbyak", - "sha": "51f507b0b3", - "hash": "4a29a3c2f97f7d5adf667a21a008be03c951fb6696b0d7ba27e7e4afa037bc76eb5e059bb84860e01baf741d4d3ac851b840cd54c99d038812fbe0f1fa6d38a4", + "repo": "herumi/xbyak", + "sha": "9bb219333a", "bundled": true }, "xbyak": { "package": "xbyak", - "repo": "Lizzie841/xbyak", + "repo": "herumi/xbyak", "sha": "4e44f4614d", "hash": "5824e92159e07fa36a774aedd3b3ef3541d0241371d522cffa4ab3e1f215fa5097b1b77865b47b2481376c704fa079875557ea463ca63d0a7fd6a8a20a589e70", "bundled": true diff --git a/src/dynarmic/externals/cpmfile.json b/src/dynarmic/externals/cpmfile.json index b934856af2..d1b471ebd9 100644 --- a/src/dynarmic/externals/cpmfile.json +++ b/src/dynarmic/externals/cpmfile.json @@ -16,12 +16,15 @@ }, "unordered-dense": { "package": "unordered_dense", - "repo": "Lizzie841/unordered_dense", + "repo": "martinus/unordered_dense", "sha": "e59d30b7b1", "hash": "71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0", "find_args": "CONFIG", "options": [ "UNORDERED_DENSE_INSTALL OFF" + ], + "patches": [ + "0001-cmake.patch", ] }, "zycore": { -- 2.39.5 From 05afd02027872971cda9fc6b649823d1f39d6ab1 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 1 Sep 2025 18:44:17 +0000 Subject: [PATCH 2/3] fix Signed-off-by: lizzie --- .patch/{unordered_dense => unordered-dense}/0001-cmake.patch | 0 src/dynarmic/externals/cpmfile.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .patch/{unordered_dense => unordered-dense}/0001-cmake.patch (100%) diff --git a/.patch/unordered_dense/0001-cmake.patch b/.patch/unordered-dense/0001-cmake.patch similarity index 100% rename from .patch/unordered_dense/0001-cmake.patch rename to .patch/unordered-dense/0001-cmake.patch diff --git a/src/dynarmic/externals/cpmfile.json b/src/dynarmic/externals/cpmfile.json index d1b471ebd9..cebcdf5232 100644 --- a/src/dynarmic/externals/cpmfile.json +++ b/src/dynarmic/externals/cpmfile.json @@ -24,7 +24,7 @@ "UNORDERED_DENSE_INSTALL OFF" ], "patches": [ - "0001-cmake.patch", + "0001-cmake.patch" ] }, "zycore": { -- 2.39.5 From 9019bfa799c3516abff3f7e0bd5eff777d64fd4f Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 1 Sep 2025 18:51:17 +0000 Subject: [PATCH 3/3] fix sun hash Signed-off-by: lizzie --- externals/cpmfile.json | 1 + 1 file changed, 1 insertion(+) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 8165e850dc..bbc6b056c1 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -76,6 +76,7 @@ "package": "xbyak", "repo": "herumi/xbyak", "sha": "9bb219333a", + "hash": "303165d45c8c19387ec49d9fda7d7a4e0d86d4c0153898c23f25ce2d58ece567f44c0bbbfe348239b933edb6e1a1e34f4bc1c0ab3a285bee5da0e548879387b0", "bundled": true }, "xbyak": { -- 2.39.5