1 |
commit: 8e03ef5c5b5f2a883a339f754ee41dc7b2398d52 |
2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
3 |
AuthorDate: Tue May 25 17:33:37 2021 +0000 |
4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
5 |
CommitDate: Tue May 25 18:22:46 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8e03ef5c |
7 |
|
8 |
games-emulation/yuzu: sdl detection + cosmetic changes |
9 |
|
10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
11 |
|
12 |
games-emulation/yuzu/yuzu-9999.ebuild | 24 ++++++++++++++---------- |
13 |
1 file changed, 14 insertions(+), 10 deletions(-) |
14 |
|
15 |
diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild |
16 |
index 7db25934a..0f50d353d 100644 |
17 |
--- a/games-emulation/yuzu/yuzu-9999.ebuild |
18 |
+++ b/games-emulation/yuzu/yuzu-9999.ebuild |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 2021 Gentoo Authors |
21 |
+# Copyright 2020-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
EAPI=7 |
25 |
@@ -85,14 +85,17 @@ src_prepare() { |
26 |
# sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt |
27 |
|
28 |
# Unbundle vulkan headers |
29 |
- sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt |
30 |
- sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp |
31 |
+ sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt || die |
32 |
+ sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die |
33 |
|
34 |
# Unbundle discord rapidjson |
35 |
sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' externals/discord-rpc/CMakeLists.txt || die |
36 |
|
37 |
- # media-libs/libsdl2: use 2.0.14 in tree |
38 |
- sed -i 's/2.0.15/2.0.14/' CMakeLists.txt |
39 |
+ # Force disable bundled sdl2, use 2.0.14 in tree |
40 |
+ if use sdl; then |
41 |
+ sed -i '/find_package(SDL2/{s/2.0.15/2.0.14/;s/ QUIET//}' CMakeLists.txt || die |
42 |
+ sed -i '/PS5_RUMBLE/d' src/input_common/sdl/sdl_impl.cpp |
43 |
+ fi |
44 |
|
45 |
cmake_src_prepare |
46 |
} |
47 |
@@ -100,14 +103,15 @@ src_prepare() { |
48 |
src_configure() { |
49 |
local -a mycmakeargs=( |
50 |
-DBUILD_SHARED_LIBS=OFF |
51 |
- -DENABLE_CUBEB=$(usex cubeb ON OFF) |
52 |
+ -DENABLE_CUBEB=$(usex cubeb) |
53 |
-DENABLE_QT=$(usex qt5) |
54 |
-DENABLE_QT_TRANSLATION=$(usex qt5) |
55 |
-DENABLE_SDL2=$(usex sdl) |
56 |
- -DENABLE_WEB_SERVICE=$(usex webservice ON OFF) |
57 |
- -DUSE_DISCORD_PRESENCE=$(usex discord ON OFF) |
58 |
- -DYUZU_ENABLE_BOXCAT=$(usex boxcat ON OFF) |
59 |
- -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine ON OFF) |
60 |
+ -DENABLE_WEB_SERVICE=$(usex webservice) |
61 |
+ -DUSE_DISCORD_PRESENCE=$(usex discord) |
62 |
+ -DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl) |
63 |
+ -DYUZU_ENABLE_BOXCAT=$(usex boxcat) |
64 |
+ -DYUZU_USE_QT_WEB_ENGINE=$(usex webengine) |
65 |
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF |
66 |
) |
67 |
cmake_src_configure |