commit: 71547053737487b311e5d89204217fecc0827b88
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 17:58:42 2024 +0000
Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 17:59:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=71547053
games-util/mangohud: add multilib support
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/mangohud-0.7.0-r1.ebuild | 21 ++++++++++-----------
games-util/mangohud/mangohud-9999.ebuild | 20 ++++++++++----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
index f6022d6d7a..8a3f925da9 100644
--- a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson
+inherit python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -55,21 +55,20 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- ~media-libs/imgui-1.81[opengl,vulkan]
+ ~media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
- dev-libs/spdlog
dev-util/glslang
media-fonts/lato
- media-libs/vulkan-loader
- media-libs/libglvnd
- x11-libs/libdrm
- dbus? ( sys-apps/dbus )
- X? ( x11-libs/libX11 )
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ x11-libs/libdrm[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
video_cards_nvidia? (
- x11-drivers/nvidia-drivers
+ x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland )
+ wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
@@ -112,7 +111,7 @@ src_prepare() {
find . -type f -exec sed -i
's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
}
-src_configure() {
+multilib_src_configure() {
# disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
diff --git a/games-util/mangohud/mangohud-9999.ebuild
b/games-util/mangohud/mangohud-9999.ebuild
index 31854ad3e4..8bfb3ae515 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson
+inherit python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -62,20 +62,20 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- ~media-libs/imgui-1.81[opengl,vulkan]
+ ~media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
- media-libs/vulkan-loader
- media-libs/libglvnd
- x11-libs/libdrm
- dbus? ( sys-apps/dbus )
- X? ( x11-libs/libX11 )
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ x11-libs/libdrm[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
video_cards_nvidia? (
- x11-drivers/nvidia-drivers
+ x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland )
+ wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
@@ -125,7 +125,7 @@ src_prepare() {
find . -type f -exec sed -i
's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
}
-src_configure() {
+multilib_src_configure() {
# disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
