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 F2AC2158094 for ; Tue, 26 Jul 2022 02:20:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2F8FE1007; Tue, 26 Jul 2022 02:20:40 +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 8AF7CE0FC9 for ; Tue, 26 Jul 2022 02:20:40 +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 85786340FF0 for ; Tue, 26 Jul 2022 02:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8606551 for ; Tue, 26 Jul 2022 02:20:37 +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: <1658802016.13d0c8a4d073dc627af6daa8a3159c67cddac797.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: 13d0c8a4d073dc627af6daa8a3159c67cddac797 X-VCS-Branch: dev Date: Tue, 26 Jul 2022 02:20:37 +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: 6b2ffd4d-33e0-47f7-9cdf-f5e5d2e7b2d9 X-Archives-Hash: 30896f8b8d4b7ed543f3f6219bb99967 commit: 13d0c8a4d073dc627af6daa8a3159c67cddac797 Author: Samuel Bauer yahoo fr> AuthorDate: Tue Jul 26 02:06:43 2022 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Tue Jul 26 02:20:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13d0c8a4 games-emulation/yuzu: unbundle sirit cpp-httplib Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index fcab95295..55be65914 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -8,10 +8,9 @@ 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=( '-*' 'cpp-httplib' 'dynarmic' 'soundtouch' 'sirit' 'xbyak' ) -# Soundtouch cannot be unbundled -> custom version -# Dynarmic is intended to be tailored on purpose, not to be generic -# TODO wait 'xbyak' for bump in tree, require 5.96 +EGIT_SUBMODULES=( '-*' 'dynarmic' 'xbyak' ) +# Dynarmic is not intended to be generic, it is tweaked to fit emulated processor +# TODO wait 'xbyak' waiting version bump. see #860816 LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT !system-vulkan? ( Apache-2.0 )" @@ -20,14 +19,15 @@ KEYWORDS="" IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice" RDEPEND=" + =app-arch/zstd-1.5 >=dev-libs/libfmt-8:= >=dev-libs/openssl-1.1:= >=media-video/ffmpeg-4.3:= app-arch/lz4:= dev-libs/boost:=[context] + dev-libs/sirit media-libs/opus - net-libs/mbedtls[cmac] sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) @@ -42,7 +42,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - dev-util/spirv-headers + dev-libs/cpp-httplib system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 ) " BDEPEND=" @@ -125,13 +125,19 @@ src_prepare() { use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die sed -i '/cubeb/d' externals/CMakeLists.txt || die + # Unbundle sirit + sed -i '/sirit/d' externals/CMakeLists.txt || die + + # Unbundle cpp-httplib + sed -i -e '/^ # cpp-httplib/,/^ endif()/d' externals/CMakeLists.txt || die + cmake_src_prepare } src_configure() { local -a mycmakeargs=( # Libraries are private and rely on circular dependency resolution. - -DBUILD_SHARED_LIBS=OFF + -DBUILD_SHARED_LIBS=OFF # dynarmic -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=$(usex compatibility-list) -DENABLE_CUBEB=$(usex cubeb) @@ -139,7 +145,6 @@ 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