1 |
commit: d0f5a28c627b5f533d99e7a86096910367e8010a |
2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
3 |
AuthorDate: Tue Sep 27 17:17:03 2022 +0000 |
4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
5 |
CommitDate: Tue Sep 27 17:18:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0f5a28c |
7 |
|
8 |
games-emulation/citra: do not unbundle catch |
9 |
|
10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
11 |
|
12 |
games-emulation/citra/citra-9999.ebuild | 16 ++++++---------- |
13 |
1 file changed, 6 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild |
16 |
index 2473246b9..fe1319afe 100644 |
17 |
--- a/games-emulation/citra/citra-9999.ebuild |
18 |
+++ b/games-emulation/citra/citra-9999.ebuild |
19 |
@@ -9,7 +9,7 @@ DESCRIPTION="A Nintendo 3DS Emulator" |
20 |
HOMEPAGE="https://citra-emu.org" |
21 |
EGIT_REPO_URI="https://github.com/citra-emu/citra" |
22 |
EGIT_SUBMODULES=( |
23 |
- 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv' |
24 |
+ 'catch2' 'discord-rpc' 'dynarmic' 'libyuv' |
25 |
'lodepng' 'nihstro' 'soundtouch' 'xbyak' |
26 |
) |
27 |
|
28 |
@@ -36,22 +36,21 @@ RDEPEND=" |
29 |
video? ( media-video/ffmpeg:= ) |
30 |
>=dev-libs/openssl-1.1:= |
31 |
app-arch/zstd |
32 |
- dev-cpp/catch:0 |
33 |
dev-libs/boost:= |
34 |
dev-libs/crypto++:= |
35 |
dev-libs/teakra |
36 |
net-libs/enet:1.3= |
37 |
virtual/libusb:1 |
38 |
" |
39 |
-DEPEND="${RDEPEND} |
40 |
- dev-cpp/cpp-httplib |
41 |
+DEPEND="${RDEPEND}" |
42 |
+BDEPEND="dev-cpp/cpp-httplib |
43 |
dev-cpp/cpp-jwt |
44 |
dev-cpp/robin-map" |
45 |
REQUIRED_USE="|| ( qt5 sdl )" |
46 |
|
47 |
src_unpack() { |
48 |
- if use system-libfmt; then |
49 |
- EGIT_SUBMODULES+=( '-fmt' ) |
50 |
+ if ! use system-libfmt; then |
51 |
+ EGIT_SUBMODULES+=( 'fmt' ) |
52 |
fi |
53 |
git-r3_src_unpack |
54 |
|
55 |
@@ -63,7 +62,7 @@ src_unpack() { |
56 |
|
57 |
src_prepare() { |
58 |
# Dynarmic: ensure those are unbundled |
59 |
- for ext in fmt catch robin-map; do |
60 |
+ for ext in fmt robin-map; do |
61 |
rm -rf externals/dynarmic/externals/${ext} || die |
62 |
done |
63 |
|
64 |
@@ -124,8 +123,6 @@ src_prepare() { |
65 |
src/core/CMakeLists.txt || die |
66 |
sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die |
67 |
|
68 |
- # Unbundle catch -- Wait for catch>=3 |
69 |
- |
70 |
# Unbundle cubeb |
71 |
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die |
72 |
if use cubeb; then |
73 |
@@ -140,7 +137,6 @@ src_prepare() { |
74 |
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die |
75 |
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die |
76 |
|
77 |
- # TODO unbundle xbyak (wait for 5.96 in ytree) |
78 |
cmake_src_prepare |
79 |
} |