From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7ADA15800D for ; Mon, 3 Jul 2023 15:53:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 077F2E0849; Mon, 3 Jul 2023 15:53:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2054E0849 for ; Mon, 3 Jul 2023 15:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD770340DE2 for ; Mon, 3 Jul 2023 15:53:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B7C18DC for ; Mon, 3 Jul 2023 15:53:46 +0000 (UTC) From: "Samuel Bauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Samuel Bauer" Message-ID: <1688399572.1a6b571d506d5f7aee259a49a42370e3d82e8be3.samuel.bauer@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/yuzu/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-emulation/yuzu/yuzu-9999.ebuild X-VCS-Directories: games-emulation/yuzu/ X-VCS-Committer: samuel.bauer X-VCS-Committer-Name: Samuel Bauer X-VCS-Revision: 1a6b571d506d5f7aee259a49a42370e3d82e8be3 X-VCS-Branch: dev Date: Mon, 3 Jul 2023 15:53:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e408eff-8731-4511-ade9-dd11f12b72f9 X-Archives-Hash: b798d3c4a3404fd47b239cc309404273 commit: 1a6b571d506d5f7aee259a49a42370e3d82e8be3 Author: Samuel Bauer yahoo fr> AuthorDate: Mon Jul 3 15:52:52 2023 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Mon Jul 3 15:52:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a6b571d games-emulation/yuzu-9999: update submodules Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 71ccdae2e..6b5af1f7c 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -8,7 +8,7 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org" EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline" -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -16,13 +16,12 @@ LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT !system-vulkan? ( Apache-2.0 )" SLOT="0" KEYWORDS="" -IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine +webservice" +IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-libfmt +system-vulkan test webengine +webservice" RDEPEND=" =app-arch/zstd-1.5 >=dev-libs/inih-52 - >=dev-libs/libfmt-9:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= >=net-libs/enet-1.3 @@ -33,7 +32,6 @@ RDEPEND=" sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) - dev-util/spirv-headers qt5? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 @@ -47,11 +45,13 @@ RDEPEND=" sdl? ( >=media-libs/libsdl2-2.0.18 ) + system-libfmt? ( >=dev-libs/libfmt-9:= ) " DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt system-vulkan? ( >=dev-util/vulkan-headers-1.3.246 ) + dev-util/spirv-headers ) test? ( >dev-cpp/catch-3:0 ) " BDEPEND=" @@ -92,9 +92,6 @@ src_prepare() { # temporary fix sed -i -e '/Werror/d' src/CMakeLists.txt || die - # Allow skip submodule downloading - rm .gitmodules || die - # Unbundle inih sed -i -e '/^if.*inih/,/^endif()/d' externals/CMakeLists.txt || die sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \ @@ -137,9 +134,13 @@ src_prepare() { # LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9 sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die + if ! use system-libfmt; then # libfmt >= 9 + sed -i '/fmt.*REQUIRED/d' CMakeLists.txt || die + fi + # Allow compiling using older glslang - if has_version '