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 25303158087 for ; Sun, 16 Jan 2022 04:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F083B2BC06C; Sun, 16 Jan 2022 04:03:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6B9E12BC06C for ; Sun, 16 Jan 2022 04:03:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E3E77342A87 for ; Sun, 16 Jan 2022 04:03:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4599224E for ; Sun, 16 Jan 2022 04:03:01 +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: <1642305747.b00e62a18c6be01c5693346c8f448bffbf768828.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: b00e62a18c6be01c5693346c8f448bffbf768828 X-VCS-Branch: dev Date: Sun, 16 Jan 2022 04:03:01 +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: 626ca416-095d-4b0b-8aa1-4f4a33f90f69 X-Archives-Hash: cefbbd4b239e34e99f9e02894ac280a4 commit: b00e62a18c6be01c5693346c8f448bffbf768828 Author: Samuel Bauer yahoo fr> AuthorDate: Sun Jan 16 04:02:27 2022 +0000 Commit: Samuel Bauer yahoo fr> CommitDate: Sun Jan 16 04:02:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b00e62a1 games-emulation/yuzu: unbundle cubeb, rework submodules Signed-off-by: Samuel Bauer yahoo.fr> games-emulation/yuzu/yuzu-9999.ebuild | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 76869251c..c194b8c19 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -8,11 +8,10 @@ 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=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-opus' '-SDL' - '-externals/sirit/externals/SPIRV-Headers' ) -# TODO '-xbyak' wait for bump in tree -# TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output -# media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... +EGIT_SUBMODULES=( '-*' 'dynarmic' 'soundtouch' 'sirit' 'mbedtls' 'xbyak' 'externals/cpp-httplib' ) +# Soundtouch cannot be unbundled -> custom version +# Dynarmic is heavily tweaked to emulate switch cpu non sense to unbundle +# TODO wait 'xbyak' for bump in tree, require 5.96 # TODO many submodules produce static libraries which forces to unset BUILD_SHARED_LIBS # this may be better to generate shared libraries and install them under /usr/$(get_libdir)/yuzu @@ -32,6 +31,7 @@ RDEPEND=" >=media-video/ffmpeg-4.3:= >=sys-libs/zlib-1.2 virtual/libusb:1 + cubeb? ( media-libs/cubeb ) qt5? ( >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5 @@ -67,12 +67,12 @@ pkg_setup() { } src_unpack() { - if ! use discord; then - EGIT_SUBMODULES+=('-discord-rpc') + if use discord; then + EGIT_SUBMODULES+=('discord-rpc') fi - if use system-vulkan; then - EGIT_SUBMODULES+=('-Vulkan-Headers') + if !use system-vulkan; then + EGIT_SUBMODULES+=('Vulkan-Headers') fi git-r3_src_unpack @@ -121,6 +121,10 @@ src_prepare() { externals/discord-rpc/CMakeLists.txt || die fi + # Unbundle cubeb + use cubeb && sed -i '$afind_package(Threads REQUIRED)' CMakeLists.txt || die + sed -i '/cubeb/d' externals/CMakeLists.txt || die + cmake_src_prepare }