Fix mbedtls submodule cloning and remove vcpkg as a makedepends

This commit is contained in:
HurricanePootis 2024-03-31 18:58:28 -05:00
parent 900c2245c3
commit e3c0473f88
2 changed files with 9 additions and 12 deletions

View file

@ -1,7 +1,7 @@
pkgbase = suyu-dev-qt6-git pkgbase = suyu-dev-qt6-git
pkgdesc = suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6) pkgdesc = suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6)
pkgver = r27269.b6ad090424 pkgver = r27347.d3f67d1e9c
pkgrel = 3 pkgrel = 1
url = https://git.suyu.dev/suyu/suyu url = https://git.suyu.dev/suyu/suyu
install = suyu-dev-qt6-git.install install = suyu-dev-qt6-git.install
arch = x86_64 arch = x86_64
@ -22,7 +22,6 @@ pkgbase = suyu-dev-qt6-git
makedepends = catch2 makedepends = catch2
makedepends = rapidjson makedepends = rapidjson
makedepends = mbedtls makedepends = mbedtls
makedepends = vcpkg
depends = brotli depends = brotli
depends = enet depends = enet
depends = llvm-libs 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://git.suyu.dev/suyu/discord-rpc.git
source = git+https://github.com/KhronosGroup/Vulkan-Headers.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/sirit.git
source = git+https://git.suyu.dev/suyu/mbedtls.git
source = git+https://github.com/herumi/xbyak.git source = git+https://github.com/herumi/xbyak.git
source = git+https://github.com/xiph/opus.git source = git+https://github.com/xiph/opus.git
source = git+https://github.com/libsdl-org/SDL.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
b2sums = SKIP b2sums = SKIP
b2sums = SKIP
pkgname = suyu-dev-qt6-git pkgname = suyu-dev-qt6-git

View file

@ -4,8 +4,8 @@
_pkgname=suyu _pkgname=suyu
_branch=dev _branch=dev
pkgname=suyu-dev-qt6-git pkgname=suyu-dev-qt6-git
pkgver=r27269.b6ad090424 pkgver=r27347.d3f67d1e9c
pkgrel=3 pkgrel=1
pkgdesc="suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6)" pkgdesc="suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch with QT6)"
arch=(x86_64) arch=(x86_64)
url=https://git.suyu.dev/suyu/suyu url=https://git.suyu.dev/suyu/suyu
@ -56,7 +56,6 @@ makedepends=(
catch2 catch2
rapidjson rapidjson
mbedtls mbedtls
vcpkg
) )
options=(!debug lto) options=(!debug lto)
source=( source=(
@ -68,6 +67,7 @@ source=(
git+https://git.suyu.dev/suyu/discord-rpc.git git+https://git.suyu.dev/suyu/discord-rpc.git
git+https://github.com/KhronosGroup/Vulkan-Headers.git git+https://github.com/KhronosGroup/Vulkan-Headers.git
git+https://git.suyu.dev/suyu/sirit.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/herumi/xbyak.git
git+https://github.com/xiph/opus.git git+https://github.com/xiph/opus.git
git+https://github.com/libsdl-org/SDL.git git+https://github.com/libsdl-org/SDL.git
@ -114,7 +114,6 @@ b2sums=('SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP' 'SKIP'
'SKIP'
'SKIP') 'SKIP')
pkgver() { pkgver() {
@ -124,12 +123,11 @@ pkgver() {
prepare() { prepare() {
cd "$srcdir/$_pkgname" cd "$srcdir/$_pkgname"
git submodule init 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};
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};
do do
git config submodule.$submodule.url "${srcdir}"/$submodule git config --file=.gitmodules submodule.$submodule.url "${srcdir}"/$submodule
done done
git -c protocol.file.allow=always submodule update git -c protocol.file.allow=always submodule update --init
pushd externals/cubeb pushd externals/cubeb
git config submodule.cmake/sanitizers-cmake.url "${srcdir}"/sanitizers-cmake git config submodule.cmake/sanitizers-cmake.url "${srcdir}"/sanitizers-cmake