1 |
commit: 67b8cd8e3eddbaccb77d75ef7535079a2e4950ef |
2 |
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> |
3 |
AuthorDate: Tue May 10 21:27:21 2022 +0000 |
4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
5 |
CommitDate: Tue May 10 21:29:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67b8cd8e |
7 |
|
8 |
games-util/mangohud: make dev-python/mako BDEPEND + remove spdlog patch texts |
9 |
|
10 |
Closes: https://bugs.gentoo.org/843551 |
11 |
Closes: https://bugs.gentoo.org/843554 |
12 |
Closes: https://bugs.gentoo.org/843566 |
13 |
|
14 |
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> |
15 |
|
16 |
...on-build.patch => mangohud-0.6.6-meson-fix-imgui-dep.patch} | 2 +- |
17 |
.../{mangohud-0.6.6.1-r2.ebuild => mangohud-0.6.6.1-r3.ebuild} | 10 +++++----- |
18 |
games-util/mangohud/metadata.xml | 2 +- |
19 |
3 files changed, 7 insertions(+), 7 deletions(-) |
20 |
|
21 |
diff --git a/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch b/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch |
22 |
similarity index 79% |
23 |
rename from games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch |
24 |
rename to games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch |
25 |
index c6aa9e6fd..6d3c9c285 100644 |
26 |
--- a/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch |
27 |
+++ b/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch |
28 |
@@ -8,7 +8,7 @@ |
29 |
|
30 |
-dearimgui_sp = subproject('imgui', default_options: imgui_options) |
31 |
-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') |
32 |
-+dearimgui_dep = dependency('imgui', default_options: imgui_options, fallback : ['imgui', 'imgui_dep']) |
33 |
++dearimgui_dep = dependency('imgui') |
34 |
|
35 |
spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) |
36 |
if not spdlog_dep.found() |
37 |
|
38 |
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
39 |
similarity index 95% |
40 |
rename from games-util/mangohud/mangohud-0.6.6.1-r2.ebuild |
41 |
rename to games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
42 |
index f237f6f88..977a71eef 100644 |
43 |
--- a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild |
44 |
+++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
45 |
@@ -34,10 +34,10 @@ REQUIRED_USE=" |
46 |
|
47 |
BDEPEND=" |
48 |
app-arch/unzip |
49 |
+ dev-python/mako[${PYTHON_USEDEP}] |
50 |
" |
51 |
|
52 |
DEPEND=" |
53 |
- dev-python/mako[${PYTHON_USEDEP}] |
54 |
dev-libs/spdlog |
55 |
dev-util/glslang |
56 |
>=dev-util/vulkan-headers-1.2 |
57 |
@@ -56,10 +56,9 @@ RDEPEND="${DEPEND}" |
58 |
|
59 |
S="${WORKDIR}/MangoHud-${PV}" |
60 |
|
61 |
-PATCHES=( |
62 |
- # "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" |
63 |
- "${FILESDIR}/mangohud-0.6.6-meson-fix-spdlog-dep.patch" |
64 |
-) |
65 |
+# PATCHES=( |
66 |
+# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" |
67 |
+# ) |
68 |
|
69 |
src_unpack() { |
70 |
default |
71 |
@@ -73,6 +72,7 @@ src_unpack() { |
72 |
src_configure() { |
73 |
local emesonargs=( |
74 |
-Dappend_libdir_mangohud=false |
75 |
+ -Duse_system_spdlog=enabled |
76 |
-Duse_system_vulkan=enabled |
77 |
-Dinclude_doc=false |
78 |
$(meson_feature video_cards_nvidia with_nvml) |
79 |
|
80 |
diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml |
81 |
index da9d5549c..53e5027d0 100644 |
82 |
--- a/games-util/mangohud/metadata.xml |
83 |
+++ b/games-util/mangohud/metadata.xml |
84 |
@@ -10,6 +10,6 @@ |
85 |
<bugs-to>https://github.com/flightlessmango/MangoHud/issues</bugs-to> |
86 |
</upstream> |
87 |
<use> |
88 |
- <flag name="xnvctrl">"Use XNVctrl as fall back for older Nvidia devices."</flag> |
89 |
+ <flag name="xnvctrl">Use XNVctrl as fall back for older Nvidia devices.</flag> |
90 |
</use> |
91 |
</pkgmetadata> |