From f50505004b666b555b8bf7b9aae1932c549772ef Mon Sep 17 00:00:00 2001 From: Maxime Gauduin Date: Wed, 20 Dec 2023 20:42:21 +0100 Subject: [PATCH] upgpkg: 1657-1 --- .SRCINFO | 16 +++++++++------- PKGBUILD | 26 ++++++++++++++++++-------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c007331..57c6820 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = yuzu pkgdesc = Nintendo Switch emulator - pkgver = 1641 + pkgver = 1657 pkgrel = 1 url = https://yuzu-emu.org/ arch = x86_64 @@ -8,12 +8,13 @@ pkgbase = yuzu makedepends = boost makedepends = clang makedepends = cmake + makedepends = ffmpeg makedepends = git makedepends = glslang makedepends = llvm makedepends = ninja makedepends = nlohmann-json - makedepends = qt6-tools + makedepends = qt5-tools makedepends = shaderc makedepends = spirv-headers makedepends = vulkan-headers @@ -27,7 +28,6 @@ pkgbase = yuzu depends = libboost_context.so depends = libcrypto.so depends = libfmt.so - depends = libINIReader.so depends = libopus.so depends = libspeexdsp.so depends = libssl.so @@ -36,13 +36,13 @@ pkgbase = yuzu depends = libva.so depends = libzstd.so depends = lz4 - depends = qt6-base - depends = qt6-multimedia - depends = qt6-webengine + depends = qt5-base + depends = qt5-multimedia + depends = qt5-webengine depends = sdl2 depends = zlib options = !debug - source = git+https://github.com/yuzu-emu/yuzu-mainline.git#tag=cf42a4a716606ed224f9bed05d9009317cc35a42 + source = git+https://github.com/yuzu-emu/yuzu-mainline.git#tag=3cff46c983b4e256f13269fdebc25d766c995e72 source = git+https://github.com/arsenm/sanitizers-cmake.git source = git+https://github.com/yhirose/cpp-httplib.git source = git+https://github.com/arun11299/cpp-jwt.git @@ -52,6 +52,7 @@ pkgbase = yuzu source = yuzu-mbedtls::git+https://github.com/yuzu-emu/mbedtls.git source = git+https://github.com/brofield/simpleini.git source = yuzu-sirit::git+https://github.com/yuzu-emu/sirit.git + source = git+https://github.com/KhronosGroup/SPIRV-Headers.git source = git+https://github.com/eggert/tz.git source = git+https://github.com/lat9nq/tzdb_to_nx.git source = git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git @@ -70,5 +71,6 @@ pkgbase = yuzu b2sums = SKIP b2sums = SKIP b2sums = SKIP + b2sums = SKIP pkgname = yuzu diff --git a/PKGBUILD b/PKGBUILD index 69d6430..a17a8c8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Alexandre Bouvier pkgname=yuzu -pkgver=1641 +pkgver=1657 pkgrel=1 pkgdesc='Nintendo Switch emulator' arch=(x86_64) @@ -19,7 +19,6 @@ depends=( libboost_context.so libcrypto.so libfmt.so - libINIReader.so libopus.so libspeexdsp.so libssl.so @@ -28,9 +27,9 @@ depends=( libva.so libzstd.so lz4 - qt6-base - qt6-multimedia - qt6-webengine + qt5-base + qt5-multimedia + qt5-webengine sdl2 zlib ) @@ -38,18 +37,19 @@ makedepends=( boost clang cmake + ffmpeg git glslang llvm ninja nlohmann-json - qt6-tools + qt5-tools shaderc spirv-headers vulkan-headers ) options=(!debug) -_tag=cf42a4a716606ed224f9bed05d9009317cc35a42 +_tag=3cff46c983b4e256f13269fdebc25d766c995e72 source=( git+https://github.com/yuzu-emu/yuzu-mainline.git#tag=${_tag} git+https://github.com/arsenm/sanitizers-cmake.git @@ -61,6 +61,7 @@ source=( yuzu-mbedtls::git+https://github.com/yuzu-emu/mbedtls.git git+https://github.com/brofield/simpleini.git yuzu-sirit::git+https://github.com/yuzu-emu/sirit.git + git+https://github.com/KhronosGroup/SPIRV-Headers.git git+https://github.com/eggert/tz.git git+https://github.com/lat9nq/tzdb_to_nx.git git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git @@ -79,6 +80,7 @@ b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'SKIP') prepare() { @@ -105,6 +107,11 @@ prepare() { git config submodule.externals/tz/tz.url "${srcdir}"/tz git -c protocol.file.allow=always submodule update popd + + pushd externals/sirit + git config submodule.externals/SPIRV-Headers.url "${srcdir}"/SPIRV-Headers + git -c protocol.file.allow=always submodule update + popd } pkgver() { @@ -113,13 +120,14 @@ pkgver() { } build() { + export CXXFLAGS+=' -Wno-switch' cmake -S yuzu-mainline -B build -G Ninja \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline \ -DBUILD_TAG=${pkgver} \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ - -DENABLE_QT6=ON \ + -DENABLE_QT6=OFF \ -DENABLE_QT_TRANSLATION=ON \ -DENABLE_SDL2=ON \ -DENABLE_WEB_SERVICE=ON \ @@ -128,6 +136,7 @@ build() { -DTITLE_BAR_FORMAT_RUNNING="yuzu | ${pkgver} | {}" \ -DUSE_DISCORD_PRESENCE=OFF \ -DYUZU_CHECK_SUBMODULES=OFF \ + -DYUZU_DOWNLOAD_TIME_ZONE_DATA=ON \ -DYUZU_USE_BUNDLED_FFMPEG=OFF \ -DYUZU_USE_BUNDLED_QT=OFF \ -DYUZU_USE_BUNDLED_SDL2=OFF \ @@ -144,6 +153,7 @@ build() { package() { DESTDIR="${pkgdir}" cmake --install build + install -Dm644 yuzu-mainline/dist/72-yuzu-input.rules -t "${pkgdir}"/usr/lib/udev/rules.d/ } # vim: ts=2 sw=2 et: