1 |
commit: bf6f782336f42305c3410009e9801d097595cb19 |
2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
3 |
AuthorDate: Fri Sep 23 04:20:32 2022 +0000 |
4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
5 |
CommitDate: Fri Sep 23 04:20:32 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf6f7823 |
7 |
|
8 |
games-emulation/citra: updates |
9 |
|
10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
11 |
|
12 |
games-emulation/citra/citra-9999.ebuild | 32 +++++++++++++++++++++----------- |
13 |
1 file changed, 21 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild |
16 |
index d5e0f2d1b..4f7d825b2 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 |
- 'discord-rpc' 'dynarmic' 'libyuv' |
24 |
+ 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv' |
25 |
'lodepng' 'nihstro' 'soundtouch' 'xbyak' |
26 |
) |
27 |
|
28 |
@@ -18,7 +18,7 @@ SLOT="0" |
29 |
KEYWORDS="" |
30 |
IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video" |
31 |
|
32 |
-DEPEND=" |
33 |
+RDEPEND=" |
34 |
cubeb? ( media-libs/cubeb ) |
35 |
!hle-sound? ( media-libs/fdk-aac ) |
36 |
hle-sound? ( media-video/ffmpeg[fdk] ) |
37 |
@@ -43,13 +43,15 @@ DEPEND=" |
38 |
net-libs/enet:1.3= |
39 |
virtual/libusb:1 |
40 |
" |
41 |
-RDEPEND="${DEPEND} |
42 |
+DEPEND="${RDEPEND} |
43 |
+ dev-cpp/cpp-httplib |
44 |
+ dev-cpp/cpp-jwt |
45 |
dev-cpp/robin-map" |
46 |
REQUIRED_USE="|| ( qt5 sdl )" |
47 |
|
48 |
src_unpack() { |
49 |
- if ! use system-libfmt; then |
50 |
- EGIT_SUBMODULES+=( 'fmt' ) |
51 |
+ if use system-libfmt; then |
52 |
+ EGIT_SUBMODULES+=( '-fmt' ) |
53 |
fi |
54 |
git-r3_src_unpack |
55 |
|
56 |
@@ -122,12 +124,7 @@ src_prepare() { |
57 |
src/core/CMakeLists.txt || die |
58 |
sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die |
59 |
|
60 |
- # Unbundle catch |
61 |
- sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/dynarmic/tests/CMakeLists.txt || die |
62 |
- sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/dynarmic/tests/CMakeLists.txt || die |
63 |
- sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die |
64 |
- sed -i -e '/catch/d' externals/CMakeLists.txt externals/dynarmic/externals/CMakeLists.txt || die |
65 |
- grep -rl 'include <catch.hpp>' externals/dynarmic | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die |
66 |
+ # Unbundle catch -- Wait for catch>=3 |
67 |
|
68 |
# Unbundle cubeb |
69 |
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die |
70 |
@@ -135,6 +132,18 @@ src_prepare() { |
71 |
sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die |
72 |
fi |
73 |
|
74 |
+ # Unbundle cpp-httplib |
75 |
+ sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die |
76 |
+ sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die |
77 |
+ |
78 |
+ # Unbundle cpp-jwt |
79 |
+ sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die |
80 |
+ sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die |
81 |
+ |
82 |
+ # Alias for sdl |
83 |
+ #sed -i -e '/find_package(SDL2/aadd_library(SDL2::SDL2 ALIAS SDL2)' CMakeLists.txt || die |
84 |
+ sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die |
85 |
+ |
86 |
# TODO unbundle xbyak (wait for 5.96 in ytree) |
87 |
cmake_src_prepare |
88 |
} |
89 |
@@ -151,6 +160,7 @@ src_configure() { |
90 |
-DENABLE_WEB_SERVICE=$(usex telemetry) |
91 |
-DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF) |
92 |
-DUSE_SYSTEM_BOOST=ON |
93 |
+ -DUSE_SYSTEM_SDL2=ON |
94 |
) |
95 |
cmake_src_configure |