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 7B302158091 for ; Tue, 7 Jun 2022 13:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD0CCE077C; Tue, 7 Jun 2022 13:09:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BC8FE077C for ; Tue, 7 Jun 2022 13:09:47 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78B0C341930 for ; Tue, 7 Jun 2022 13:09:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F85B456 for ; Tue, 7 Jun 2022 13:09:15 +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: <1654607331.2e9401b34dced04f1c864ca57842a02d8db80778.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: 2e9401b34dced04f1c864ca57842a02d8db80778 X-VCS-Branch: dev Date: Tue, 7 Jun 2022 13:09:15 +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: 9a50687f-fdcd-4d17-b0dd-b9342550074d X-Archives-Hash: a956928a7e207f17e028576d8a9198fa commit: 2e9401b34dced04f1c864ca57842a02d8db80778 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Jun 7 12:57:56 2022 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Tue Jun 7 13:08:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2e9401b3 games-emulation/yuzu: support gentoo vulkan Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index e4a73c5ad..a4857f0c9 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -20,15 +20,15 @@ KEYWORDS="" IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice" RDEPEND=" - >=app-arch/lz4-1.8:= >=app-arch/zstd-1.5 - >=dev-libs/boost-1.73:=[context] >=dev-libs/libfmt-8:= >=dev-libs/openssl-1.1:= - >=media-libs/opus-1.3.1 >=media-video/ffmpeg-4.3:= - >=sys-libs/zlib-1.2 + app-arch/lz4:= + dev-libs/boost:=[context] + media-libs/opus net-libs/mbedtls[cmac] + sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) qt5? ( @@ -43,9 +43,7 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-util/spirv-headers - system-vulkan? ( - >=dev-util/vulkan-headers-1.2.198 - ) + system-vulkan? ( dev-util/vulkan-headers ) " BDEPEND=" >=dev-cpp/catch-2.13:0 @@ -68,12 +66,11 @@ src_unpack() { EGIT_SUBMODULES+=('discord-rpc') fi - if !use system-vulkan; then + if use !system-vulkan; then EGIT_SUBMODULES+=('Vulkan-Headers') fi git-r3_src_unpack - # Do not fetch via sources because this file always changes use compatibility-list && curl https://api.yuzu-emu.org/gamedb/ > "${S}"/compatibility_list.json } @@ -96,6 +93,8 @@ src_prepare() { if use system-vulkan; then # Unbundle vulkan headers sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt || die + # available only in >=vulkan-headers-1.3.213 + sed -i -e '/VK_ERROR_COMPRESSION_EXHAUSTED_EXT/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die fi # Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac' @@ -113,9 +112,6 @@ src_prepare() { -e "s/@GIT_DESC@/$(git describe --always --long)/" \ src/common/scm_rev.cpp.in || die - # Use system SPIRV headers - sed -i -e '/SPIRV/d' externals/sirit/CMakeLists.txt || die - if ! use discord; then sed -i -e '/discord-rpc/d' externals/CMakeLists.txt || die else @@ -142,6 +138,7 @@ src_configure() { -DENABLE_QT_TRANSLATION=$(usex qt5) -DENABLE_SDL2=$(usex sdl) -DENABLE_WEB_SERVICE=$(usex webservice) + -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON # Use system SPIRV headers -DUSE_DISCORD_PRESENCE=$(usex discord) -DYUZU_USE_BUNDLED_OPUS=OFF -DYUZU_USE_EXTERNAL_SDL2=OFF