From 67b8cd8e3eddbaccb77d75ef7535079a2e4950ef Mon Sep 17 00:00:00 2001 From: Adel KARA SLIMANE Date: Tue, 10 May 2022 23:27:21 +0200 Subject: [PATCH] games-util/mangohud: make dev-python/mako BDEPEND + remove spdlog patch texts Closes: https://bugs.gentoo.org/843551 Closes: https://bugs.gentoo.org/843554 Closes: https://bugs.gentoo.org/843566 Signed-off-by: Adel KARA SLIMANE --- ....patch => mangohud-0.6.6-meson-fix-imgui-dep.patch} | 2 +- ...ud-0.6.6.1-r2.ebuild => mangohud-0.6.6.1-r3.ebuild} | 10 +++++----- games-util/mangohud/metadata.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename games-util/mangohud/files/{mangonhud-0.6.6-meson-build.patch => mangohud-0.6.6-meson-fix-imgui-dep.patch} (79%) rename games-util/mangohud/{mangohud-0.6.6.1-r2.ebuild => mangohud-0.6.6.1-r3.ebuild} (95%) 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 similarity index 79% rename from games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch rename to games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch index c6aa9e6fdb..6d3c9c2852 100644 --- 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 @@ -8,7 +8,7 @@ -dearimgui_sp = subproject('imgui', default_options: imgui_options) -dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') -+dearimgui_dep = dependency('imgui', default_options: imgui_options, fallback : ['imgui', 'imgui_dep']) ++dearimgui_dep = dependency('imgui') spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) if not spdlog_dep.found() diff --git a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild similarity index 95% rename from games-util/mangohud/mangohud-0.6.6.1-r2.ebuild rename to games-util/mangohud/mangohud-0.6.6.1-r3.ebuild index f237f6f88f..977a71eeff 100644 --- a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild +++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild @@ -34,10 +34,10 @@ REQUIRED_USE=" BDEPEND=" app-arch/unzip + dev-python/mako[${PYTHON_USEDEP}] " DEPEND=" - dev-python/mako[${PYTHON_USEDEP}] dev-libs/spdlog dev-util/glslang >=dev-util/vulkan-headers-1.2 @@ -56,10 +56,9 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/MangoHud-${PV}" -PATCHES=( - # "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" - "${FILESDIR}/mangohud-0.6.6-meson-fix-spdlog-dep.patch" -) +# PATCHES=( +# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" +# ) src_unpack() { default @@ -73,6 +72,7 @@ src_unpack() { src_configure() { local emesonargs=( -Dappend_libdir_mangohud=false + -Duse_system_spdlog=enabled -Duse_system_vulkan=enabled -Dinclude_doc=false $(meson_feature video_cards_nvidia with_nvml) diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml index da9d5549c5..53e5027d00 100644 --- a/games-util/mangohud/metadata.xml +++ b/games-util/mangohud/metadata.xml @@ -10,6 +10,6 @@ https://github.com/flightlessmango/MangoHud/issues - "Use XNVctrl as fall back for older Nvidia devices." + Use XNVctrl as fall back for older Nvidia devices.