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 6DD1B158095 for ; Fri, 9 Sep 2022 13:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFDB8E0869; Fri, 9 Sep 2022 13:49:52 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91559E0869 for ; Fri, 9 Sep 2022 13:49:52 +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 8303E340B25 for ; Fri, 9 Sep 2022 13:49:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBBF1523 for ; Fri, 9 Sep 2022 13:49:49 +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: <1662731381.c927e2cc777459cc6295372c8b7b0ff9001ecd5c.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: c927e2cc777459cc6295372c8b7b0ff9001ecd5c X-VCS-Branch: dev Date: Fri, 9 Sep 2022 13:49:49 +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: 6d143a46-e247-43e8-ad85-9580a93c1aac X-Archives-Hash: 0a3db1ea8e2d441b8d0a113705c0e14a commit: c927e2cc777459cc6295372c8b7b0ff9001ecd5c Author: Samuel Bauer yahoo fr> AuthorDate: Fri Sep 9 13:43:17 2022 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Fri Sep 9 13:49:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c927e2cc games-emulation/yuzu: update live ebuild Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 0860eda94..7fdca80d6 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -49,7 +49,6 @@ DEPEND="${RDEPEND} system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 ) " BDEPEND=" - test? ( =dev-cpp/nlohmann_json-3.8.0 dev-cpp/robin-map dev-util/glslang @@ -74,6 +73,10 @@ src_unpack() { EGIT_SUBMODULES+=('Vulkan-Headers') fi + if use test; then + EGIT_SUBMODULES+=('Catch2') + 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 @@ -104,12 +107,10 @@ src_prepare() { # Unbundle mbedtls: undefined reference to `mbedtls_cipher_cmac' sed -i -e '/mbedtls/d' externals/CMakeLists.txt || die + sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ - -e '1ifind_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/ssl.h)' \ - -e '1ifind_library(MBEDTLS_LIB NAMES mbedtls)' \ - -e '1ifind_library(MBEDX509_LIB NAMES mbedx509)' \ - -e '1ifind_library(MBEDCRYPTO_LIB NAMES mbedcrypto)' \ - src/core/CMakeLists.txt + src/dedicated_room/CMakeLists.txt \ + src/core/CMakeLists.txt || die # Workaround: GenerateSCMRev fails sed -i -e "s/@GIT_BRANCH@/${EGIT_BRANCH:-master}/" \