From 79d4e60692098d1a2ab71e074405e13af65c2bf4 Mon Sep 17 00:00:00 2001
From: SSimco <37044560+SSimco@users.noreply.github.com>
Date: Sat, 30 Aug 2025 14:25:25 +0300
Subject: [PATCH] cleanup submodules

---
 .gitmodules                                   |  9 ++++---
 dependencies/ZArchive                         |  2 +-
 dependencies/libucontext/CMakeLists.txt       | 24 +++++++++----------
 dependencies/libucontext/{libucontext => src} |  0
 4 files changed, 17 insertions(+), 18 deletions(-)
 rename dependencies/libucontext/{libucontext => src} (100%)

diff --git a/.gitmodules b/.gitmodules
index 1fda607a..16b37c29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "dependencies/ZArchive"]
 	path = dependencies/ZArchive
-	url = https://github.com/SSimco/ZArchive
+	url = https://github.com/Exzap/ZArchive
 	shallow = true
 [submodule "dependencies/cubeb"]
 	path = dependencies/cubeb
@@ -21,12 +21,11 @@
 [submodule "dependencies/xbyak_aarch64"]
 	path = dependencies/xbyak_aarch64
 	url = https://github.com/fujitsu/xbyak_aarch64
-[submodule "dependencies/cpuid"]
-	path = dependencies/cpuid
-	url = https://github.com/SSimco/cpuid
 [submodule "dependencies/libadrenotools"]
 	path = dependencies/libadrenotools
 	url = https://github.com/bylaws/libadrenotools
+	shallow = true
 [submodule "dependencies/libucontext/libucontext"]
-	path = dependencies/libucontext/libucontext
+	path = dependencies/libucontext/src
 	url = https://github.com/kaniini/libucontext
+	shallow = true
diff --git a/dependencies/ZArchive b/dependencies/ZArchive
index c50b5d22..965b66c8 160000
--- a/dependencies/ZArchive
+++ b/dependencies/ZArchive
@@ -1 +1 @@
-Subproject commit c50b5d222bb599be9287664c835c2a820aa5342a
+Subproject commit 965b66c8d67b6b7e30fd63b3b75aa91a99ff303b
diff --git a/dependencies/libucontext/CMakeLists.txt b/dependencies/libucontext/CMakeLists.txt
index 6a62f5bb..940b670e 100644
--- a/dependencies/libucontext/CMakeLists.txt
+++ b/dependencies/libucontext/CMakeLists.txt
@@ -16,15 +16,15 @@ add_library(libucontext)
 target_sources(
     libucontext
     PRIVATE
-        libucontext/arch/${ARCH}/getcontext.S
-        libucontext/arch/${ARCH}/setcontext.S
-        libucontext/arch/${ARCH}/swapcontext.S
+        src/arch/${ARCH}/getcontext.S
+        src/arch/${ARCH}/setcontext.S
+        src/arch/${ARCH}/swapcontext.S
 )
 
 if(${ARCH} STREQUAL "mips" OR ${ARCH} STREQUAL "mips64")
-    target_sources(libucontext PRIVATE libucontext/arch/${ARCH}/makecontext.S)
+    target_sources(libucontext PRIVATE src/arch/${ARCH}/makecontext.S)
 else()
-    target_sources(libucontext PRIVATE libucontext/arch/${ARCH}/makecontext.c)
+    target_sources(libucontext PRIVATE src/arch/${ARCH}/makecontext.c)
 endif()
 
 set(ARCH_WITH_STARTCONTEXT
@@ -36,9 +36,9 @@ set(ARCH_WITH_STARTCONTEXT
 )
 
 if(${ARCH} IN_LIST ARCH_WITH_STARTCONTEXT)
-    target_sources(libucontext PRIVATE libucontext/arch/${ARCH}/startcontext.S)
+    target_sources(libucontext PRIVATE src/arch/${ARCH}/startcontext.S)
 else()
-    target_sources(libucontext PRIVATE libucontext/arch/${ARCH}/trampoline.c)
+    target_sources(libucontext PRIVATE src/arch/${ARCH}/trampoline.c)
 endif()
 
 set(ARCH_WITH_RETFROMSYSCALL "ppc" "ppc64")
@@ -46,7 +46,7 @@ set(ARCH_WITH_RETFROMSYSCALL "ppc" "ppc64")
 if(${ARCH} IN_LIST ARCH_WITH_RETFROMSYSCALL)
     target_sources(
         libucontext
-        PRIVATE libucontext/arch/${ARCH}/retfromsyscall.c
+        PRIVATE src/arch/${ARCH}/retfromsyscall.c
     )
 endif()
 
@@ -55,12 +55,12 @@ if(FREESTANDING)
     target_compile_definitions(libucontext PRIVATE FREESTANDING)
     target_include_directories(
         libucontext
-        PUBLIC libucontext/arch/${ARCH}/include
+        PUBLIC src/arch/${ARCH}/include
     )
 else()
     target_include_directories(
         libucontext
-        PUBLIC libucontext/arch/common/include
+        PUBLIC src/arch/common/include
     )
 endif()
 
@@ -70,6 +70,6 @@ endif()
 
 target_compile_definitions(libucontext PRIVATE _DEFAULT_SOURCE)
 
-target_include_directories(libucontext PRIVATE libucontext/arch/common)
+target_include_directories(libucontext PRIVATE src/arch/common)
 
-target_include_directories(libucontext PUBLIC libucontext/include)
+target_include_directories(libucontext PUBLIC src/include)
diff --git a/dependencies/libucontext/libucontext b/dependencies/libucontext/src
similarity index 100%
rename from dependencies/libucontext/libucontext
rename to dependencies/libucontext/src