diff --git a/.patch/libadrenotools/0001-linkerns-cpm.patch b/.patch/libadrenotools/0001-linkerns-cpm.patch deleted file mode 100644 index 8c5abe28e5..0000000000 --- a/.patch/libadrenotools/0001-linkerns-cpm.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16c6092..9e75548 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,14 @@ project(adrenotools LANGUAGES CXX C) - - set(GEN_INSTALL_TARGET OFF CACHE BOOL "") - --add_subdirectory(lib/linkernsbypass) -+include(CPM) -+set(CPM_USE_LOCAL_PACKAGES OFF) -+ -+CPMAddPackage( -+ NAME linkernsbypass -+ URL "https://github.com/bylaws/liblinkernsbypass/archive/aa3975893d.zip" -+ URL_HASH SHA512=43d3d146facb7ec99d066a9b8990369ab7b9eec0d5f9a67131b0a0744fde0af27d884ca1f2a272cd113718a23356530ed97703c8c0659c4c25948d50c106119e -+) - - set(LIB_SOURCES src/bcenabler.cpp - src/driver.cpp diff --git a/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch b/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch new file mode 100644 index 0000000000..965975cda5 --- /dev/null +++ b/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch @@ -0,0 +1,26 @@ +From 52bbc5af6523daa22ad62fe4b84bc8d623d11a53 Mon Sep 17 00:00:00 2001 +From: crueter +Date: Fri, 26 Jun 2026 01:09:40 -0400 +Subject: [PATCH] use cpmfile def for linkernsbypass + +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16c6092..85b242c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,8 @@ project(adrenotools LANGUAGES CXX C) + + set(GEN_INSTALL_TARGET OFF CACHE BOOL "") + +-add_subdirectory(lib/linkernsbypass) ++include(CPMUtil) ++AddJsonPackage(linkernsbypass) + + set(LIB_SOURCES src/bcenabler.cpp + src/driver.cpp +-- +2.54.0 + diff --git a/cpmfile.json b/cpmfile.json index 02a7c3cecb..822734ee08 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -140,7 +140,7 @@ "libadrenotools": { "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265", "patches": [ - "0001-linkerns-cpm.patch" + "0001-use-cpmfile-def-for-linkernsbypass.patch" ], "repo": "eden-emulator/libadrenotools", "sha": "8ba23b42d7", @@ -156,6 +156,12 @@ "tag": "v%VERSION%", "version": "1.0.29" }, + "linkernsbypass": { + "hash": "bbe3f1f08e2bc7172b36e8f052912cc374289fc9a8e5a39ae7547a0c232de8f57ba24883451896b7a9a5d1be0e4de5c5b0f70c2022eda18d7d5a754847521800", + "repo": "bylaws/liblinkernsbypass", + "sha": "aa3975893d", + "version": "0.0.0" + }, "llvm-mingw": { "artifact": "clang-rt-builtins.tar.zst", "git_host": "git.eden-emu.dev", @@ -294,13 +300,13 @@ "sirit": { "artifact": "sirit-source-%VERSION%.tar.zst", "find_args": "CONFIG", + "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293", "options": [ "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON" ], "repo": "eden-emulator/sirit", "tag": "v%VERSION%", - "version": "1.0.5", - "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293" + "version": "1.0.5" }, "sirit-ci": { "ci": true,