Gentoo Archives: gentoo-commits

From: Haelwenn Monnier <contact@×××××××××.me>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/yuzu/
Date: Sun, 07 Aug 2022 09:13:18
Message-Id: 1659607443.ed2626d52f3bc7cb417b446b420d2130e7df2bf3.lanodan@gentoo
1 commit: ed2626d52f3bc7cb417b446b420d2130e7df2bf3
2 Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
3 AuthorDate: Thu Aug 4 10:04:03 2022 +0000
4 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
5 CommitDate: Thu Aug 4 10:04:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed2626d5
7
8 games-emulation/yuzu: new flag for test, disable test in snapshot
9
10 Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
11
12 games-emulation/yuzu/yuzu-0_p20220725.ebuild | 2 +-
13 games-emulation/yuzu/yuzu-9999.ebuild | 8 +++++---
14 2 files changed, 6 insertions(+), 4 deletions(-)
15
16 diff --git a/games-emulation/yuzu/yuzu-0_p20220725.ebuild b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
17 index 5e5df4fd6..8bc53d5fc 100644
18 --- a/games-emulation/yuzu/yuzu-0_p20220725.ebuild
19 +++ b/games-emulation/yuzu/yuzu-0_p20220725.ebuild
20 @@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
21 >=dev-util/vulkan-headers-1.3.216
22 "
23 BDEPEND="
24 - >=dev-cpp/catch-2.13:0
25 >=dev-cpp/nlohmann_json-3.8.0
26 dev-cpp/robin-map
27 dev-util/glslang
28 @@ -104,6 +103,7 @@ src_configure() {
29 -DENABLE_SDL2=$(usex sdl)
30 -DENABLE_WEB_SERVICE=$(usex webservice)
31 -DUSE_DISCORD_PRESENCE=$(usex discord)
32 + -DYUZU_TESTS=OFF
33 -DYUZU_USE_BUNDLED_OPUS=OFF
34 -DYUZU_USE_EXTERNAL_SDL2=OFF
35 -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
36
37 diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
38 index 5ec1e0537..953cae7e0 100644
39 --- a/games-emulation/yuzu/yuzu-9999.ebuild
40 +++ b/games-emulation/yuzu/yuzu-9999.ebuild
41 @@ -16,7 +16,7 @@ LICENSE="|| ( Apache-2.0 GPL-2+ ) 0BSD BSD GPL-2+ ISC MIT
42 !system-vulkan? ( Apache-2.0 )"
43 SLOT="0"
44 KEYWORDS=""
45 -IUSE="+compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"
46 +IUSE="+compatibility-list +cubeb discord +qt5 sdl +system-vulkan test webengine +webservice"
47
48 RDEPEND="
49 <net-libs/mbedtls-3.1[cmac]
50 @@ -48,13 +48,14 @@ DEPEND="${RDEPEND}
51 system-vulkan? ( >=dev-util/vulkan-headers-1.3.216 )
52 "
53 BDEPEND="
54 - >=dev-cpp/catch-2.13:0
55 + test? ( <dev-cpp/catch-3:0 )
56 >=dev-cpp/nlohmann_json-3.8.0
57 dev-cpp/robin-map
58 dev-util/glslang
59 discord? ( >=dev-libs/rapidjson-1.1.0 )
60 "
61 REQUIRED_USE="|| ( qt5 sdl )"
62 +RESTRICT="!test? ( test )"
63
64 pkg_setup() {
65 if tc-is-gcc; then
66 @@ -131,7 +132,7 @@ src_prepare() {
67 sed -i '/sirit/d' externals/CMakeLists.txt || die
68
69 # Unbundle cpp-httplib
70 - sed -i -e '/^ # cpp-httplib/,/^ endif()/d' externals/CMakeLists.txt || die
71 + sed -i -e '/^ # httplib/,/^ endif()/d' externals/CMakeLists.txt || die
72
73 # Unbundle enet
74 sed -i -e '/enet/d' externals/CMakeLists.txt || die
75 @@ -152,6 +153,7 @@ src_configure() {
76 -DENABLE_SDL2=$(usex sdl)
77 -DENABLE_WEB_SERVICE=$(usex webservice)
78 -DUSE_DISCORD_PRESENCE=$(usex discord)
79 + -DYUZU_TESTS=$(usex test)
80 -DYUZU_USE_BUNDLED_OPUS=OFF
81 -DYUZU_USE_EXTERNAL_SDL2=OFF
82 -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)