From e3c0473f88f51d488a915249ce5c1c988157e6bc Mon Sep 17 00:00:00 2001
From: HurricanePootis <hurricanepootis@protonmail.com>
Date: Sun, 31 Mar 2024 18:58:28 -0500
Subject: [PATCH] Fix mbedtls submodule cloning and remove vcpkg as a
 makedepends

---
 .SRCINFO |  7 +++----
 PKGBUILD | 14 ++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d556c5d..6831d26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = suyu-dev-qt6-git
 	pkgdesc = suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6)
-	pkgver = r27269.b6ad090424
-	pkgrel = 3
+	pkgver = r27347.d3f67d1e9c
+	pkgrel = 1
 	url = https://git.suyu.dev/suyu/suyu
 	install = suyu-dev-qt6-git.install
 	arch = x86_64
@@ -22,7 +22,6 @@ pkgbase = suyu-dev-qt6-git
 	makedepends = catch2
 	makedepends = rapidjson
 	makedepends = mbedtls
-	makedepends = vcpkg
 	depends = brotli
 	depends = enet
 	depends = llvm-libs
@@ -60,6 +59,7 @@ pkgbase = suyu-dev-qt6-git
 	source = git+https://git.suyu.dev/suyu/discord-rpc.git
 	source = git+https://github.com/KhronosGroup/Vulkan-Headers.git
 	source = git+https://git.suyu.dev/suyu/sirit.git
+	source = git+https://git.suyu.dev/suyu/mbedtls.git
 	source = git+https://github.com/herumi/xbyak.git
 	source = git+https://github.com/xiph/opus.git
 	source = git+https://github.com/libsdl-org/SDL.git
@@ -105,6 +105,5 @@ pkgbase = suyu-dev-qt6-git
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = SKIP
 
 pkgname = suyu-dev-qt6-git
diff --git a/PKGBUILD b/PKGBUILD
index e9f1bf3..64d6882 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 _pkgname=suyu
 _branch=dev
 pkgname=suyu-dev-qt6-git
-pkgver=r27269.b6ad090424
-pkgrel=3
+pkgver=r27347.d3f67d1e9c
+pkgrel=1
 pkgdesc="suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6)"
 arch=(x86_64)
 url=https://git.suyu.dev/suyu/suyu
@@ -56,7 +56,6 @@ makedepends=(
   catch2
   rapidjson
   mbedtls
-  vcpkg
 )
 options=(!debug lto)
 source=(
@@ -68,6 +67,7 @@ source=(
   git+https://git.suyu.dev/suyu/discord-rpc.git
   git+https://github.com/KhronosGroup/Vulkan-Headers.git
   git+https://git.suyu.dev/suyu/sirit.git
+  git+https://git.suyu.dev/suyu/mbedtls.git
   git+https://github.com/herumi/xbyak.git
   git+https://github.com/xiph/opus.git
   git+https://github.com/libsdl-org/SDL.git
@@ -114,7 +114,6 @@ b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'SKIP'
         'SKIP')
 
 pkgver() {
@@ -124,12 +123,11 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$_pkgname"
-  git submodule init
-  for submodule in {enet,cubeb,dynarmic,libusb,discord-rpc,Vulkan-Headers,sirit,xbyak,opus,SDL,cpp-httplib,ffmpeg,cpp-jwt,libadrenotools,tzdb_to_nx,VulkanMemoryAllocator,breakpad,simpleini,oaknut,Vulkan-Utility-Libraries};
+  for submodule in {enet,cubeb,dynarmic,libusb,discord-rpc,Vulkan-Headers,sirit,mbedtls,xbyak,opus,SDL,cpp-httplib,ffmpeg,cpp-jwt,libadrenotools,tzdb_to_nx,VulkanMemoryAllocator,breakpad,simpleini,oaknut,Vulkan-Utility-Libraries};
   do
-    git config submodule.$submodule.url "${srcdir}"/$submodule
+    git config --file=.gitmodules submodule.$submodule.url "${srcdir}"/$submodule
   done
-  git -c protocol.file.allow=always submodule update
+  git -c protocol.file.allow=always submodule update --init
 
   pushd externals/cubeb
   git config submodule.cmake/sanitizers-cmake.url "${srcdir}"/sanitizers-cmake