| 1 |
commit: a1a706a47ee68cfd0bc551bdde9365920b8f1d00 |
| 2 |
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> |
| 3 |
AuthorDate: Mon May 9 20:50:44 2022 +0000 |
| 4 |
Commit: Adel KARA SLIMANE <adel <AT> karaslimane <DOT> com> |
| 5 |
CommitDate: Mon May 9 21:06:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1a706a4 |
| 7 |
|
| 8 |
games-util/mangohud: remove mutlilib build |
| 9 |
|
| 10 |
It needs mutlilib for spdlog (::gentoo) and imgui (::guru) |
| 11 |
that are unavailable for now |
| 12 |
|
| 13 |
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> |
| 14 |
|
| 15 |
....6.6.1-r1.ebuild => mangohud-0.6.6.1-r2.ebuild} | 24 ++++++++++++---------- |
| 16 |
1 file changed, 13 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild |
| 19 |
similarity index 81% |
| 20 |
rename from games-util/mangohud/mangohud-0.6.6.1-r1.ebuild |
| 21 |
rename to games-util/mangohud/mangohud-0.6.6.1-r2.ebuild |
| 22 |
index d9a0a388b..f237f6f88 100644 |
| 23 |
--- a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild |
| 24 |
+++ b/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild |
| 25 |
@@ -5,7 +5,7 @@ EAPI=8 |
| 26 |
|
| 27 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 28 |
|
| 29 |
-inherit python-r1 distutils-r1 meson-multilib |
| 30 |
+inherit python-r1 distutils-r1 meson |
| 31 |
|
| 32 |
MY_PV=$(ver_cut 1-3) |
| 33 |
[ -n "$(ver_cut 4)" ] && MY_PV_REV="-$(ver_cut 4)" |
| 34 |
@@ -39,24 +39,27 @@ BDEPEND=" |
| 35 |
DEPEND=" |
| 36 |
dev-python/mako[${PYTHON_USEDEP}] |
| 37 |
dev-libs/spdlog |
| 38 |
- dev-util/glslang[${MULTILIB_USEDEP}] |
| 39 |
+ dev-util/glslang |
| 40 |
>=dev-util/vulkan-headers-1.2 |
| 41 |
- media-libs/vulkan-loader[${MULTILIB_USEDEP}] |
| 42 |
- media-libs/libglvnd[$MULTILIB_USEDEP] |
| 43 |
- dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 44 |
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) |
| 45 |
+ media-libs/vulkan-loader |
| 46 |
+ media-libs/libglvnd |
| 47 |
+ dbus? ( sys-apps/dbus ) |
| 48 |
+ X? ( x11-libs/libX11 ) |
| 49 |
video_cards_nvidia? ( |
| 50 |
- x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] |
| 51 |
+ x11-drivers/nvidia-drivers |
| 52 |
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) |
| 53 |
) |
| 54 |
- wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) |
| 55 |
+ wayland? ( dev-libs/wayland ) |
| 56 |
" |
| 57 |
|
| 58 |
RDEPEND="${DEPEND}" |
| 59 |
|
| 60 |
S="${WORKDIR}/MangoHud-${PV}" |
| 61 |
|
| 62 |
-# PATCHES=( "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" ) |
| 63 |
+PATCHES=( |
| 64 |
+ # "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" |
| 65 |
+ "${FILESDIR}/mangohud-0.6.6-meson-fix-spdlog-dep.patch" |
| 66 |
+) |
| 67 |
|
| 68 |
src_unpack() { |
| 69 |
default |
| 70 |
@@ -67,10 +70,9 @@ src_unpack() { |
| 71 |
mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die |
| 72 |
} |
| 73 |
|
| 74 |
-multilib_src_configure() { |
| 75 |
+src_configure() { |
| 76 |
local emesonargs=( |
| 77 |
-Dappend_libdir_mangohud=false |
| 78 |
- -Duse_system_spdlog=enabled |
| 79 |
-Duse_system_vulkan=enabled |
| 80 |
-Dinclude_doc=false |
| 81 |
$(meson_feature video_cards_nvidia with_nvml) |
Archives