From 5fc09eaa127067c78f6699e7f91bb36c29d5535c Mon Sep 17 00:00:00 2001 From: Kostadin Shishmanov Date: Fri, 15 May 2026 17:13:56 +0300 Subject: [PATCH] games-util/mangohud: sync live ebuild Signed-off-by: Kostadin Shishmanov --- games-util/mangohud/Manifest | 2 - games-util/mangohud/mangohud-9999.ebuild | 58 ++++++++++++------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index 2382f3efb0..bc2182b30c 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -7,5 +7,3 @@ DIST mangohud-0.8.2.tar.gz 14934235 BLAKE2B 2fbf57fb4b68ba808f8b99cbdf0606a618e9 DIST mangohud-0.8.3.tar.gz 14947932 BLAKE2B 37b96e8ea4b64c4f295bdd065f63cbe0c02615f551c0561f5be9059246f0639e0acff74a9f826289e609bb63ef41875a707de6ebdb5e7d65ad9a1eafd67640a9 SHA512 90ae828e378d5f901c98a30432aee1187fe2b9defdf5415c920f6f5d572799a0d7f49462457fea01bfb11f0c77a3eb00bbd015bd508cf1e0cbc1f24da4fee1c7 DIST vulkan-headers-1.2.158-2-meson-wrap.zip 1107 BLAKE2B 35e4bb1f7410a009243fe7d4a4ba6cede7f01e0b56ad6ff72ad30c00c2452bd6d2a4fb44ab92c296147e2506a92acc6de1f817cb5433b96d66652cbcd8885595 SHA512 30cbbb90580399839e1bba8881b9b8cc33fdeead93f37d5f3398c9d53fb3ab050ca2562fd68f376fa4ee0825ee3787f560d70d55a170c780dd575ff2eeb66efd DIST vulkan-headers-1.2.158.tar.gz 831647 BLAKE2B 792d7e895e27c4a8fbc93fc4d9c9e696d2ceb946e745709c050c0693b77afbeb6411a4267fc59508ddeb58167d469349fedc1c5d4b4a7415b590c97248b244bc SHA512 f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 -DIST vulkan-headers-1.3.283-1-meson-wrap.zip 1219 BLAKE2B 48efb687335a478e16396114d13177b91aba5b4fd321d155d028c404d39d4968a74b3911bbfcfebd6288bc922f52e4b761ee348df4d772a45e57a60d302e5641 SHA512 45aab78ea50b280610bdb6ba704388a16f159ddab1d19ae503e58edaee403f979027a18bf0303780e63e63d807368d1911388a5b5c2da42bb5ca89b5d8d47d85 -DIST vulkan-headers-1.3.283.tar.gz 2271437 BLAKE2B 641baef95972c88ba1e5369b3522db3db223f1191e423e7d8938d20d132276ade8afc6611efad25a1cf0434a7a0bada6a52ac0a74af809cde96e55ec6b06671d SHA512 48a863b8b9c9131c65253071e3b45fc35b98db241d2a1737969f5ae9a4d0a7e0fda37c7fe8f956fec549fcde4999b038faaede7e54066076386bad2794d311f8 diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild index 73a2474d24..0002194bc4 100644 --- a/games-util/mangohud/mangohud-9999.ebuild +++ b/games-util/mangohud/mangohud-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,49 +7,41 @@ PYTHON_COMPAT=( python3_{12..14} ) inherit flag-o-matic python-single-r1 meson-multilib toolchain-funcs -MY_PV=$(ver_cut 1-3) -[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" - DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more" HOMEPAGE="https://github.com/flightlessmango/MangoHud" -# Check subprojects/vulkan-headers.wrap for both of these values -VK_HEADERS_VER="1.3.283" -VK_HEADERS_MESON_WRAP_VER="1" +# Check subprojects/vulkan-headers.wrap for this value +VK_HEADERS_VER="1.4.346" SRC_URI=" https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz - -> vulkan-headers-${VK_HEADERS_VER}.tar.gz - https://github.com/mesonbuild/wrapdb/releases/download/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}_patch.zip - -> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip + -> Vulkan-Headers-${VK_HEADERS_VER}.tar.gz + https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/v${VK_HEADERS_VER}.tar.gz + -> Vulkan-Utility-Libraries-${VK_HEADERS_VER}.tar.gz " if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git" else - SRC_URI+=" - https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz - -> ${P}.tar.gz - " + SRC_URI+="https://github.com/flightlessmango/MangoHud/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" S="${WORKDIR}/MangoHud-${PV}" fi LICENSE="MIT" SLOT="0" -IUSE="+dbus debug +X xnvctrl wayland mangoapp mangohudctl mangoplot video_cards_nvidia video_cards_amdgpu test" -RESTRICT="!test? ( test )" +IUSE="+dbus +X xnvctrl wayland mangoapp mangohudctl mangoplot video_cards_nvidia test" +RESTRICT="test" # tests aren't enabled upstream REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( X wayland ) - xnvctrl? ( video_cards_nvidia ) + xnvctrl? ( video_cards_nvidia X ) mangoapp? ( X ) " BDEPEND=" - app-arch/unzip dev-util/glslang test? ( dev-util/cmocka ) $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]') @@ -57,11 +49,10 @@ BDEPEND=" DEPEND=" ${PYTHON_DEPS} - =media-libs/imgui-1.91.6*:=[opengl,vulkan,${MULTILIB_USEDEP}] - =media-libs/implot-0.16*:=[${MULTILIB_USEDEP}] dev-libs/spdlog:=[${MULTILIB_USEDEP}] dev-libs/libfmt:=[${MULTILIB_USEDEP}] - dev-cpp/nlohmann_json + =media-libs/imgui-1.91.6*:=[${MULTILIB_USEDEP}] + =media-libs/implot-0.16*:=[${MULTILIB_USEDEP}] x11-libs/libxkbcommon:=[${MULTILIB_USEDEP}] dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) @@ -71,9 +62,8 @@ DEPEND=" ) wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) mangoapp? ( - =media-libs/imgui-1.91.6*[glfw] + =media-libs/imgui-1.91.6*[glfw,opengl] media-libs/glfw[X(+)?,wayland(+)?] - media-libs/glew ) " @@ -95,21 +85,32 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-system-imgui.patch" + "${FILESDIR}/${PN}-0.8.3-system-imgui.patch" ) src_unpack() { default - [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) - if [[ $PV == 9999 ]]; then git-r3_src_unpack fi - unpack vulkan-headers-${VK_HEADERS_VER}.tar.gz - unpack vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip + unpack Vulkan-Headers-${VK_HEADERS_VER}.tar.gz + unpack Vulkan-Utility-Libraries-${VK_HEADERS_VER}.tar.gz +} + +src_prepare() { + default + mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || die + mv "${WORKDIR}/Vulkan-Utility-Libraries-${VK_HEADERS_VER}" "${S}/subprojects/" || die + + pushd subprojects || die + mv packagefiles/vulkan-headers/* Vulkan-Headers-${VK_HEADERS_VER} || die + mv packagefiles/vulkan-utility-libraries/* Vulkan-Utility-Libraries-${VK_HEADERS_VER} || die + # save some space when using FEATURES=installsources + rm -rf "*.wrap" "{packagefiles/imgui-0.16}" || die + popd || die } multilib_src_configure() { @@ -131,6 +132,7 @@ multilib_src_configure() { $(meson_use mangoapp mangoapp) $(meson_use mangohudctl mangohudctl) $(meson_feature mangoplot mangoplot) + $(meson_feature test tests) ) meson_src_configure }