From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8BEC1158090 for ; Tue, 10 May 2022 07:49:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAD8EE08EC; Tue, 10 May 2022 07:49:21 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFE20E08EC for ; Tue, 10 May 2022 07:49:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98B6434144B for ; Tue, 10 May 2022 07:49:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E54452F9 for ; Tue, 10 May 2022 07:49:18 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1652130415.a1a706a47ee68cfd0bc551bdde9365920b8f1d00.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-util/mangohud/mangohud-0.6.6.1-r1.ebuild games-util/mangohud/mangohud-0.6.6.1-r2.ebuild X-VCS-Directories: games-util/mangohud/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: a1a706a47ee68cfd0bc551bdde9365920b8f1d00 X-VCS-Branch: master Date: Tue, 10 May 2022 07:49:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 348f965e-4c8a-47f6-9d88-ddf505bcfaf4 X-Archives-Hash: ef705116d7e1e5093a6389bfa54ecad0 commit: a1a706a47ee68cfd0bc551bdde9365920b8f1d00 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon May 9 20:50:44 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon May 9 21:06:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1a706a4 games-util/mangohud: remove mutlilib build It needs mutlilib for spdlog (::gentoo) and imgui (::guru) that are unavailable for now Signed-off-by: Adel KARA SLIMANE zegrapher.com> ....6.6.1-r1.ebuild => mangohud-0.6.6.1-r2.ebuild} | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild similarity index 81% rename from games-util/mangohud/mangohud-0.6.6.1-r1.ebuild rename to games-util/mangohud/mangohud-0.6.6.1-r2.ebuild index d9a0a388b..f237f6f88 100644 --- a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild +++ b/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit python-r1 distutils-r1 meson-multilib +inherit python-r1 distutils-r1 meson MY_PV=$(ver_cut 1-3) [ -n "$(ver_cut 4)" ] && MY_PV_REV="-$(ver_cut 4)" @@ -39,24 +39,27 @@ BDEPEND=" DEPEND=" dev-python/mako[${PYTHON_USEDEP}] dev-libs/spdlog - dev-util/glslang[${MULTILIB_USEDEP}] + dev-util/glslang >=dev-util/vulkan-headers-1.2 - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - media-libs/libglvnd[$MULTILIB_USEDEP] - dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + media-libs/vulkan-loader + media-libs/libglvnd + dbus? ( sys-apps/dbus ) + X? ( x11-libs/libX11 ) video_cards_nvidia? ( - x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] + x11-drivers/nvidia-drivers xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) ) - wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + wayland? ( dev-libs/wayland ) " RDEPEND="${DEPEND}" S="${WORKDIR}/MangoHud-${PV}" -# PATCHES=( "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" ) +PATCHES=( + # "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" + "${FILESDIR}/mangohud-0.6.6-meson-fix-spdlog-dep.patch" +) src_unpack() { default @@ -67,10 +70,9 @@ src_unpack() { mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die } -multilib_src_configure() { +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)