From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1440172-garchives=archives.gentoo.org@lists.gentoo.org>
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 1BC3D158094
for <garchives@archives.gentoo.org>; Tue, 27 Sep 2022 17:19:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D035DE0A7E;
Tue, 27 Sep 2022 17:19:16 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7BA43E0A80
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 17:19:16 +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 7AB4234116B
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 17:19:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 038AC5B1
for <gentoo-commits@lists.gentoo.org>; Tue, 27 Sep 2022 17:19:14 +0000 (UTC)
From: "Samuel Bauer" <samuel.bauer@yahoo.fr>
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" <samuel.bauer@yahoo.fr>
Message-ID: <1664299131.d0f5a28c627b5f533d99e7a86096910367e8010a.samuel.bauer@gentoo>
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/
X-VCS-Repository: repo/proj/guru
X-VCS-Files: games-emulation/citra/citra-9999.ebuild
X-VCS-Directories: games-emulation/citra/
X-VCS-Committer: samuel.bauer
X-VCS-Committer-Name: Samuel Bauer
X-VCS-Revision: d0f5a28c627b5f533d99e7a86096910367e8010a
X-VCS-Branch: dev
Date: Tue, 27 Sep 2022 17:19:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 29818ce8-2a05-490d-88a7-8f7e4cf3a434
X-Archives-Hash: 36a0d8286d5adbebbf2a93ff0e9fc71d
commit: d0f5a28c627b5f533d99e7a86096910367e8010a
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Sep 27 17:17:03 2022 +0000
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Sep 27 17:18:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0f5a28c
games-emulation/citra: do not unbundle catch
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 2473246b9..fe1319afe 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
EGIT_SUBMODULES=(
- 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv'
+ 'catch2' 'discord-rpc' 'dynarmic' 'libyuv'
'lodepng' 'nihstro' 'soundtouch' 'xbyak'
)
@@ -36,22 +36,21 @@ RDEPEND="
video? ( media-video/ffmpeg:= )
>=dev-libs/openssl-1.1:=
app-arch/zstd
- dev-cpp/catch:0
dev-libs/boost:=
dev-libs/crypto++:=
dev-libs/teakra
net-libs/enet:1.3=
virtual/libusb:1
"
-DEPEND="${RDEPEND}
- dev-cpp/cpp-httplib
+DEPEND="${RDEPEND}"
+BDEPEND="dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
- if use system-libfmt; then
- EGIT_SUBMODULES+=( '-fmt' )
+ if ! use system-libfmt; then
+ EGIT_SUBMODULES+=( 'fmt' )
fi
git-r3_src_unpack
@@ -63,7 +62,7 @@ src_unpack() {
src_prepare() {
# Dynarmic: ensure those are unbundled
- for ext in fmt catch robin-map; do
+ for ext in fmt robin-map; do
rm -rf externals/dynarmic/externals/${ext} || die
done
@@ -124,8 +123,6 @@ src_prepare() {
src/core/CMakeLists.txt || die
sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
- # Unbundle catch -- Wait for catch>=3
-
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
if use cubeb; then
@@ -140,7 +137,6 @@ src_prepare() {
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
- # TODO unbundle xbyak (wait for 5.96 in ytree)
cmake_src_prepare
}