1 |
commit: 9bb6cd8cb6431aaa98a883a0e672daaad5259a51 |
2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
3 |
AuthorDate: Fri Jan 21 03:39:08 2022 +0000 |
4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
5 |
CommitDate: Fri Jan 21 03:42:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9bb6cd8c |
7 |
|
8 |
games-emulation/citra: rework submodules and dependencies. always use system libfmt |
9 |
|
10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
11 |
|
12 |
games-emulation/citra/citra-9999.ebuild | 33 +++++++++++++++++++++------------ |
13 |
games-emulation/citra/metadata.xml | 1 - |
14 |
2 files changed, 21 insertions(+), 13 deletions(-) |
15 |
|
16 |
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild |
17 |
index 602d34179..b2e44375e 100644 |
18 |
--- a/games-emulation/citra/citra-9999.ebuild |
19 |
+++ b/games-emulation/citra/citra-9999.ebuild |
20 |
@@ -8,12 +8,17 @@ inherit cmake git-r3 xdg |
21 |
DESCRIPTION="A Nintendo 3DS Emulator" |
22 |
HOMEPAGE="https://citra-emu.org" |
23 |
EGIT_REPO_URI="https://github.com/citra-emu/citra" |
24 |
-EGIT_SUBMODULES=( "*" "-boost" "-catch" "-cryptopp" "-enet" "-inih" "-libressl" "-externals/dynarmic/externals/xbyak" "-zstd" ) |
25 |
+EGIT_SUBMODULES=( '*' |
26 |
+ '-boost' '-catch' '-cryptopp' '-cubeb' '-enet' |
27 |
+ '-fmt' '-inih' '-libressl' '-libusb' '-zstd' |
28 |
+ '-externals/dynarmic/externals/fmt' |
29 |
+ '-externals/dynarmic/externals/xbyak' |
30 |
+) |
31 |
|
32 |
LICENSE="GPL-2" |
33 |
SLOT="0" |
34 |
KEYWORDS="" |
35 |
-IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video" |
36 |
+IUSE="cubeb +hle-sound nls +qt5 sdl +telemetry video" |
37 |
|
38 |
DEPEND=" |
39 |
cubeb? ( media-libs/cubeb ) |
40 |
@@ -29,22 +34,21 @@ DEPEND=" |
41 |
media-libs/libsdl2 |
42 |
>=dev-libs/inih-52 |
43 |
) |
44 |
- system-libfmt? ( <=dev-libs/libfmt-8 ) |
45 |
video? ( media-video/ffmpeg ) |
46 |
>=app-arch/zstd-1.4.8 |
47 |
+ >=dev-libs/libfmt-8 |
48 |
>=dev-libs/openssl-1.1 |
49 |
dev-cpp/catch:0 |
50 |
+ dev-cpp/robin-map |
51 |
dev-libs/boost:= |
52 |
dev-libs/crypto++ |
53 |
net-libs/enet:1.3 |
54 |
+ virtual/libusb:1 |
55 |
" |
56 |
RDEPEND="${DEPEND}" |
57 |
REQUIRED_USE="|| ( qt5 sdl )" |
58 |
|
59 |
src_unpack() { |
60 |
- if use system-libfmt; then |
61 |
- EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" ) |
62 |
- fi |
63 |
git-r3_src_unpack |
64 |
|
65 |
cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die |
66 |
@@ -54,6 +58,11 @@ src_unpack() { |
67 |
} |
68 |
|
69 |
src_prepare() { |
70 |
+ # Dynarmic: ensure those are unbundled |
71 |
+ for ext in fmt catch robin-map; do |
72 |
+ rm -rf externals/dynarmic/externals/${ext} || die |
73 |
+ done |
74 |
+ |
75 |
# Do not care about submodules wanted one are already fetched |
76 |
sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die |
77 |
|
78 |
@@ -80,12 +89,12 @@ src_prepare() { |
79 |
src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die |
80 |
sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die |
81 |
|
82 |
- if use system-libfmt; then # Unbundle libfmt |
83 |
- sed -i -e '/fmt/d' externals/CMakeLists.txt || die |
84 |
- sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \ |
85 |
- src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die |
86 |
- sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die |
87 |
- fi |
88 |
+ # Unbundle libfmt |
89 |
+ sed -i -e '/fmt/d' externals/CMakeLists.txt || die |
90 |
+ sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \ |
91 |
+ src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die |
92 |
+ sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die |
93 |
+ sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die |
94 |
|
95 |
# Unbundle zstd |
96 |
sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \ |
97 |
|
98 |
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml |
99 |
index 87cb3dfdc..acd89943b 100644 |
100 |
--- a/games-emulation/citra/metadata.xml |
101 |
+++ b/games-emulation/citra/metadata.xml |
102 |
@@ -8,7 +8,6 @@ |
103 |
<use> |
104 |
<flag name="cubeb">Enables the cubeb audio backend</flag> |
105 |
<flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag> |
106 |
- <flag name="system-libfmt">Use system libfmt</flag> |
107 |
<flag name="telemetry">Enable web services (telemetry, etc.)</flag> |
108 |
<flag name="video">Enable FFmpeg video dumper</flag> |
109 |
</use> |