commit: 56a16cb2b9804e88b146e69c6c96cb9437c9bf44 Author: Jay Faulkner <jay <AT> jvf <DOT> cc> AuthorDate: Fri Sep 2 02:09:39 2022 +0000 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> CommitDate: Fri Sep 2 02:10:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56a16cb2
Revert "games-util/mangohud: version bump to 0.6.8" This reverts commit 4636e479e98f107273cecb1565c4198a149d3284. Causing pkgcheck failures: games-util/mangohud NonsolvableDepsInStable: version 0.6.8: nonsolvable depset(depend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] NonsolvableDepsInStable: version 0.6.8: nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] NonsolvableDepsInStable: version 9999: nonsolvable depset(depend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] NonsolvableDepsInStable: version 9999: nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] VisibleVcsPkg: version 9999: VCS version visible for KEYWORDS="~amd64", profile default/linux/amd64/17.0/x32 (52 total) reverted by instruction of sam_ in #gentoo-guru Signed-Off-By: Jay Faulkner <jay <AT> jvf.cc> games-util/mangohud/Manifest | 1 - games-util/mangohud/mangohud-0.6.8.ebuild | 100 ------------------------------ games-util/mangohud/mangohud-9999.ebuild | 92 --------------------------- 3 files changed, 193 deletions(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index 97ecf7cc5..16dbf2e48 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -2,4 +2,3 @@ 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.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild deleted file mode 100644 index e77071978..000000000 --- a/games-util/mangohud/mangohud-0.6.8.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -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" - -SRC_URI=" - https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz -" - -KEYWORDS="~amd64 ~x86" - -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 - 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}" - -S="${WORKDIR}/MangoHud-${PV}" - -PATCHES=( - "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" -) - -src_unpack() { - default - [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) -} - -src_prepare() { - default - # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>" - find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \; - find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/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 deleted file mode 100644 index 1bbdaead5..000000000 --- a/games-util/mangohud/mangohud-9999.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit git-r3 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" - -inherit meson git-r3 -EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git" - -KEYWORDS="~amd64 ~x86" - -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 - 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}" - -PATCHES=( - "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" -) - -src_prepare() { - default - # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>" - find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \; - find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/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 -}