From 40533cc0b25627c2d4e2f90143fa6f9f4e6c1e43 Mon Sep 17 00:00:00 2001 From: Adel KARA SLIMANE Date: Wed, 7 Sep 2022 22:54:32 +0200 Subject: [PATCH] games-util/mangohud: improve ebuilds + add 0.6.8 and 9999 Fixed pkgcheck warnings Signed-off-by: Adel KARA SLIMANE --- games-util/mangohud/Manifest | 1 + .../mangohud/mangohud-0.6.6.1-r3.ebuild | 6 +- games-util/mangohud/mangohud-0.6.7.1.ebuild | 6 +- games-util/mangohud/mangohud-0.6.8.ebuild | 103 ++++++++++++++++++ games-util/mangohud/mangohud-9999.ebuild | 103 ++++++++++++++++++ 5 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 games-util/mangohud/mangohud-0.6.8.ebuild create mode 100644 games-util/mangohud/mangohud-9999.ebuild diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index 16dbf2e48f..97ecf7cc55 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -2,3 +2,4 @@ DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST mangohud-0.6.6.1.tar.gz 14839055 BLAKE2B e0e27e62bf688b80611461ecab1bf4cf2c39f8359a9dc2cc1362555bfca55db30a72684da4e07e03970d8e5dee1d26f1d7a1fa30ff47aa86ec653dba273f24cf SHA512 c097dede7e534641f12a9c7f0a2ce049611e17732c7d232251b38d5c50bbcee53b2b22e548ff27f514fa57a45c563d883a1a9382c2c0ee9ac6832a2775e8f221 DIST mangohud-0.6.7.1.tar.gz 14834501 BLAKE2B 6fdd91309531f32d663a0bec4f3edd26095781290ce40294f4ea87297855ce210efbc57443710aa180652bc555887519a12166c76dec19cdf3037bbdc384db15 SHA512 7d5250cc6a50215430cc79c7d11ad18219be374966383ab3f6cba9626fa045c973245d74bc32d75649adebf0fdc7acd086f5afdf5e1708e35da1f7a920a54f1d +DIST mangohud-0.6.8.tar.gz 14844076 BLAKE2B 0da41ecac5e608e755cd1f3bbb3cff698e55a59adb3a5e5c42d1b8b19b1c0666c572016c29db11992ff72abaa80b756bbd50687ce17409380e89a2554f13dee1 SHA512 c2344c21dedebce0c56e88db476177eef29bab9e418a3c5ba13d1059d81f3ee23718e2f9257e32f9f62dcaf6554c65cbf36dac691b2bb3c355def2c9de0a52cc diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild index 99f91b86a1..9dc290fbcc 100644 --- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild +++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 meson @@ -67,11 +67,11 @@ S="${WORKDIR}/MangoHud-${PV}" src_unpack() { default - [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) + [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) unpack imgui-${IMGUI_VER}.tar.gz unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip - mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die + mv "${WORKDIR}/imgui-${IMGUI_VER}" "${S}/subprojects/imgui" || die } src_configure() { diff --git a/games-util/mangohud/mangohud-0.6.7.1.ebuild b/games-util/mangohud/mangohud-0.6.7.1.ebuild index 3e0b6e177f..71d738e087 100644 --- a/games-util/mangohud/mangohud-0.6.7.1.ebuild +++ b/games-util/mangohud/mangohud-0.6.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit python-any-r1 meson @@ -69,11 +69,11 @@ S="${WORKDIR}/MangoHud-${PV}" src_unpack() { default - [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) + [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) unpack imgui-${IMGUI_VER}.tar.gz unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip - mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die + mv "${WORKDIR}/imgui-${IMGUI_VER}" "${S}/subprojects/imgui" || die } src_configure() { diff --git a/games-util/mangohud/mangohud-0.6.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild new file mode 100644 index 0000000000..0325714a55 --- /dev/null +++ b/games-util/mangohud/mangohud-0.6.8.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit python-any-r1 meson + +MY_PV=$(ver_cut 1-3) +[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" + +DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more" +HOMEPAGE="https://github.com/flightlessmango/MangoHud" + +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" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia" + +REQUIRED_USE=" + || ( X wayland ) + xnvctrl? ( video_cards_nvidia )" + +BDEPEND=" + app-arch/unzip + $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') +" + +python_check_deps() { + python_has_version "dev-python/mako[${PYTHON_USEDEP}]" +} + +DEPEND=" + ~media-libs/imgui-1.81[opengl,vulkan] + dev-libs/spdlog + dev-util/glslang + >=dev-util/vulkan-headers-1.2 + media-libs/vulkan-loader + media-libs/libglvnd + x11-libs/libdrm + dbus? ( sys-apps/dbus ) + X? ( x11-libs/libX11 ) + video_cards_nvidia? ( + x11-drivers/nvidia-drivers + xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) + ) + wayland? ( dev-libs/wayland ) +" + +RDEPEND="${DEPEND}" + +[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}" + +PATCHES=( + "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" +) + +src_unpack() { + default + [[ $PV == 9999 ]] && git-r3_src_unpack + [[ $PV != 9999 && -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) +} + +src_prepare() { + default + # replace all occurences of "#include " to "#include " + find . -type f -exec sed -i 's/#include /#include /g' {} \; + find . -type f -exec sed -i 's/#include "imgui.h"/#include /g' {} \; +} + +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) + $(meson_feature xnvctrl with_xnvctrl) + $(meson_feature X with_x11) + $(meson_feature wayland with_wayland) + $(meson_feature dbus with_dbus) + ) + meson_src_configure +} + +pkg_postinst() { + if ! use xnvctrl; then + einfo "" + einfo "If mangohud can't get GPU load, or other GPU information," + einfo "and you have an older Nvidia device." + einfo "" + einfo "Try enabling the 'xnvctrl' useflag." + einfo "" + fi +} diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild new file mode 100644 index 0000000000..0325714a55 --- /dev/null +++ b/games-util/mangohud/mangohud-9999.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit python-any-r1 meson + +MY_PV=$(ver_cut 1-3) +[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" + +DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more" +HOMEPAGE="https://github.com/flightlessmango/MangoHud" + +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" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia" + +REQUIRED_USE=" + || ( X wayland ) + xnvctrl? ( video_cards_nvidia )" + +BDEPEND=" + app-arch/unzip + $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') +" + +python_check_deps() { + python_has_version "dev-python/mako[${PYTHON_USEDEP}]" +} + +DEPEND=" + ~media-libs/imgui-1.81[opengl,vulkan] + dev-libs/spdlog + dev-util/glslang + >=dev-util/vulkan-headers-1.2 + media-libs/vulkan-loader + media-libs/libglvnd + x11-libs/libdrm + dbus? ( sys-apps/dbus ) + X? ( x11-libs/libX11 ) + video_cards_nvidia? ( + x11-drivers/nvidia-drivers + xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) + ) + wayland? ( dev-libs/wayland ) +" + +RDEPEND="${DEPEND}" + +[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}" + +PATCHES=( + "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" +) + +src_unpack() { + default + [[ $PV == 9999 ]] && git-r3_src_unpack + [[ $PV != 9999 && -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) +} + +src_prepare() { + default + # replace all occurences of "#include " to "#include " + find . -type f -exec sed -i 's/#include /#include /g' {} \; + find . -type f -exec sed -i 's/#include "imgui.h"/#include /g' {} \; +} + +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) + $(meson_feature xnvctrl with_xnvctrl) + $(meson_feature X with_x11) + $(meson_feature wayland with_wayland) + $(meson_feature dbus with_dbus) + ) + meson_src_configure +} + +pkg_postinst() { + if ! use xnvctrl; then + einfo "" + einfo "If mangohud can't get GPU load, or other GPU information," + einfo "and you have an older Nvidia device." + einfo "" + einfo "Try enabling the 'xnvctrl' useflag." + einfo "" + fi +}