From cca68da715a5f3dc3a66eb95beabe7b389acb9e7 Mon Sep 17 00:00:00 2001 From: Fijxu Date: Mon, 11 Mar 2024 00:29:18 -0300 Subject: [PATCH] upgpkg: dev-2 --- .SRCINFO | 9 ++++----- PKGBUILD | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 754c357..e52db9d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,11 @@ pkgbase = suyu-dev-git pkgdesc = suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch) - pkgver = r27175.bd5bdbe6c7 + pkgver = r27175.bd5bdbe6c pkgrel = 1 url = https://gitlab.com/suyu-emu/suyu install = suyu-dev-git.install arch = x86_64 - license = GPL-2.0-or-later - makedepends = brotli + license = GPL-3.0-or-later makedepends = boost makedepends = clang makedepends = cmake @@ -23,6 +22,8 @@ pkgbase = suyu-dev-git makedepends = vulkan-utility-libraries makedepends = catch2 makedepends = rapidjson + makedepends = mbedtls + depends = brotli depends = enet depends = llvm-libs depends = gcc-libs @@ -55,7 +56,6 @@ pkgbase = suyu-dev-git source = git+https://github.com/mozilla/cubeb.git source = git+https://gitlab.com/suyu-emu/dynarmic.git source = git+https://github.com/bylaws/libadrenotools.git - source = git+https://gitlab.com/suyu-emu/mbedtls.git source = git+https://github.com/brofield/simpleini.git source = git+https://gitlab.com/suyu-emu/sirit.git source = git+https://github.com/KhronosGroup/SPIRV-Headers.git @@ -77,6 +77,5 @@ pkgbase = suyu-dev-git b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = SKIP pkgname = suyu-dev-git diff --git a/PKGBUILD b/PKGBUILD index a2c7d0d..6549e72 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,15 +3,16 @@ _pkgname=suyu _branch=dev pkgname=suyu-dev-git -pkgver=r27175.bd5bdbe6c7 +pkgver=r27175.bd5bdbe6c pkgrel=1 pkgdesc="suyu is the afterlife the world's most popular, open-source, Nintendo Switch emulator (dev branch)" arch=(x86_64) url=https://gitlab.com/suyu-emu/suyu -license=(GPL-2.0-or-later) +license=(GPL-3.0-or-later) provides=('suyu') install=$pkgname.install depends=( + brotli enet llvm-libs gcc-libs @@ -36,7 +37,6 @@ depends=( zlib ) makedepends=( - brotli boost clang cmake @@ -53,6 +53,7 @@ makedepends=( vulkan-utility-libraries catch2 rapidjson + mbedtls ) options=(!debug lto) source=( @@ -63,7 +64,6 @@ source=( git+https://github.com/mozilla/cubeb.git git+https://gitlab.com/suyu-emu/dynarmic.git git+https://github.com/bylaws/libadrenotools.git - git+https://gitlab.com/suyu-emu/mbedtls.git git+https://github.com/brofield/simpleini.git git+https://gitlab.com/suyu-emu/sirit.git git+https://github.com/KhronosGroup/SPIRV-Headers.git @@ -85,7 +85,6 @@ b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' 'SKIP') pkgver() { @@ -101,7 +100,6 @@ prepare() { git config submodule.cubeb.url "${srcdir}"/cubeb git config submodule.dynarmic.url "${srcdir}"/dynarmic git config submodule.libadrenotools.url "${srcdir}"/libadrenotools - git config submodule.mbedtls.url "${srcdir}"/mbedtls git config submodule.simpleini.url "${srcdir}"/simpleini git config submodule.sirit.url "${srcdir}"/sirit git config submodule.tzdb_to_nx.url "${srcdir}"/tzdb_to_nx @@ -126,14 +124,17 @@ prepare() { } build() { + if [[ $CXXFLAGS == *"-flto"* ]]; then + flags+=("-DSUYU_ENABLE_LTO=ON") + fi export CXXFLAGS+=' -Wno-switch' cmake -S suyu -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_REPOSITORY=suyu-emu/suyu \ -DBUILD_TAG=${_branch}-${pkgver} \ - -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ - -DENABLE_QT6=OFF \ + -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF \ + -DENABLE_QT6=ON \ -DENABLE_QT_TRANSLATION=ON \ -DENABLE_SDL2=ON \ -DENABLE_WEB_SERVICE=ON \ @@ -154,6 +155,7 @@ build() { -DSUYU_USE_QT_MULTIMEDIA=ON \ -DSUYU_USE_QT_WEB_ENGINE=ON \ -DSUYU_TESTS=OFF \ + "${flags[@]}" \ -Wno-dev cmake --build build }