Gentoo Archives: gentoo-commits

From: Jay Faulkner <jay@×××.cc>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
Date: Fri, 02 Sep 2022 02:11:25
Message-Id: 1662084629.56a16cb2b9804e88b146e69c6c96cb9437c9bf44.jayf@gentoo
1 commit: 56a16cb2b9804e88b146e69c6c96cb9437c9bf44
2 Author: Jay Faulkner <jay <AT> jvf <DOT> cc>
3 AuthorDate: Fri Sep 2 02:09:39 2022 +0000
4 Commit: Jay Faulkner <jay <AT> jvf <DOT> cc>
5 CommitDate: Fri Sep 2 02:10:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56a16cb2
7
8 Revert "games-util/mangohud: version bump to 0.6.8"
9
10 This reverts commit 4636e479e98f107273cecb1565c4198a149d3284.
11
12 Causing pkgcheck failures:
13 games-util/mangohud
14 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 ]
15 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 ]
16 NonsolvableDepsInStable: version 9999: nonsolvable depset(depend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ]
17 NonsolvableDepsInStable: version 9999: nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ]
18 VisibleVcsPkg: version 9999: VCS version visible for KEYWORDS="~amd64", profile default/linux/amd64/17.0/x32 (52 total)
19
20 reverted by instruction of sam_ in #gentoo-guru
21
22 Signed-Off-By: Jay Faulkner <jay <AT> jvf.cc>
23
24 games-util/mangohud/Manifest | 1 -
25 games-util/mangohud/mangohud-0.6.8.ebuild | 100 ------------------------------
26 games-util/mangohud/mangohud-9999.ebuild | 92 ---------------------------
27 3 files changed, 193 deletions(-)
28
29 diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
30 index 97ecf7cc5..16dbf2e48 100644
31 --- a/games-util/mangohud/Manifest
32 +++ b/games-util/mangohud/Manifest
33 @@ -2,4 +2,3 @@ DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba
34 DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e
35 DIST mangohud-0.6.6.1.tar.gz 14839055 BLAKE2B e0e27e62bf688b80611461ecab1bf4cf2c39f8359a9dc2cc1362555bfca55db30a72684da4e07e03970d8e5dee1d26f1d7a1fa30ff47aa86ec653dba273f24cf SHA512 c097dede7e534641f12a9c7f0a2ce049611e17732c7d232251b38d5c50bbcee53b2b22e548ff27f514fa57a45c563d883a1a9382c2c0ee9ac6832a2775e8f221
36 DIST mangohud-0.6.7.1.tar.gz 14834501 BLAKE2B 6fdd91309531f32d663a0bec4f3edd26095781290ce40294f4ea87297855ce210efbc57443710aa180652bc555887519a12166c76dec19cdf3037bbdc384db15 SHA512 7d5250cc6a50215430cc79c7d11ad18219be374966383ab3f6cba9626fa045c973245d74bc32d75649adebf0fdc7acd086f5afdf5e1708e35da1f7a920a54f1d
37 -DIST mangohud-0.6.8.tar.gz 14844076 BLAKE2B 0da41ecac5e608e755cd1f3bbb3cff698e55a59adb3a5e5c42d1b8b19b1c0666c572016c29db11992ff72abaa80b756bbd50687ce17409380e89a2554f13dee1 SHA512 c2344c21dedebce0c56e88db476177eef29bab9e418a3c5ba13d1059d81f3ee23718e2f9257e32f9f62dcaf6554c65cbf36dac691b2bb3c355def2c9de0a52cc
38
39 diff --git a/games-util/mangohud/mangohud-0.6.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild
40 deleted file mode 100644
41 index e77071978..000000000
42 --- a/games-util/mangohud/mangohud-0.6.8.ebuild
43 +++ /dev/null
44 @@ -1,100 +0,0 @@
45 -# Copyright 1999-2022 Gentoo Authors
46 -# Distributed under the terms of the GNU General Public License v2
47 -
48 -EAPI=8
49 -
50 -PYTHON_COMPAT=( python3_{8..10} )
51 -
52 -inherit python-any-r1 meson
53 -
54 -MY_PV=$(ver_cut 1-3)
55 -[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
56 -
57 -DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"
58 -HOMEPAGE="https://github.com/flightlessmango/MangoHud"
59 -
60 -SRC_URI="
61 - https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz
62 -"
63 -
64 -KEYWORDS="~amd64 ~x86"
65 -
66 -LICENSE="MIT"
67 -SLOT="0"
68 -IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia"
69 -
70 -REQUIRED_USE="
71 - || ( X wayland )
72 - xnvctrl? ( video_cards_nvidia )"
73 -
74 -BDEPEND="
75 - app-arch/unzip
76 - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
77 -"
78 -
79 -python_check_deps() {
80 - python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
81 -}
82 -
83 -DEPEND="
84 - ~media-libs/imgui-1.81
85 - dev-libs/spdlog
86 - dev-util/glslang
87 - >=dev-util/vulkan-headers-1.2
88 - media-libs/vulkan-loader
89 - media-libs/libglvnd
90 - x11-libs/libdrm
91 - dbus? ( sys-apps/dbus )
92 - X? ( x11-libs/libX11 )
93 - video_cards_nvidia? (
94 - x11-drivers/nvidia-drivers
95 - xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
96 - )
97 - wayland? ( dev-libs/wayland )
98 -"
99 -
100 -RDEPEND="${DEPEND}"
101 -
102 -S="${WORKDIR}/MangoHud-${PV}"
103 -
104 -PATCHES=(
105 - "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch"
106 -)
107 -
108 -src_unpack() {
109 - default
110 - [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die )
111 -}
112 -
113 -src_prepare() {
114 - default
115 - # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>"
116 - find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \;
117 - find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/g' {} \;
118 -}
119 -
120 -src_configure() {
121 - local emesonargs=(
122 - -Dappend_libdir_mangohud=false
123 - -Duse_system_spdlog=enabled
124 - -Duse_system_vulkan=enabled
125 - -Dinclude_doc=false
126 - $(meson_feature video_cards_nvidia with_nvml)
127 - $(meson_feature xnvctrl with_xnvctrl)
128 - $(meson_feature X with_x11)
129 - $(meson_feature wayland with_wayland)
130 - $(meson_feature dbus with_dbus)
131 - )
132 - meson_src_configure
133 -}
134 -
135 -pkg_postinst() {
136 - if ! use xnvctrl; then
137 - einfo ""
138 - einfo "If mangohud can't get GPU load, or other GPU information,"
139 - einfo "and you have an older Nvidia device."
140 - einfo ""
141 - einfo "Try enabling the 'xnvctrl' useflag."
142 - einfo ""
143 - fi
144 -}
145
146 diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
147 deleted file mode 100644
148 index 1bbdaead5..000000000
149 --- a/games-util/mangohud/mangohud-9999.ebuild
150 +++ /dev/null
151 @@ -1,92 +0,0 @@
152 -# Copyright 1999-2022 Gentoo Authors
153 -# Distributed under the terms of the GNU General Public License v2
154 -
155 -EAPI=8
156 -
157 -PYTHON_COMPAT=( python3_{8..10} )
158 -
159 -inherit git-r3 python-any-r1 meson
160 -
161 -MY_PV=$(ver_cut 1-3)
162 -[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
163 -
164 -DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"
165 -HOMEPAGE="https://github.com/flightlessmango/MangoHud"
166 -
167 -inherit meson git-r3
168 -EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git"
169 -
170 -KEYWORDS="~amd64 ~x86"
171 -
172 -LICENSE="MIT"
173 -SLOT="0"
174 -IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia"
175 -
176 -REQUIRED_USE="
177 - || ( X wayland )
178 - xnvctrl? ( video_cards_nvidia )"
179 -
180 -BDEPEND="
181 - app-arch/unzip
182 - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
183 -"
184 -
185 -python_check_deps() {
186 - python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
187 -}
188 -
189 -DEPEND="
190 - ~media-libs/imgui-1.81
191 - dev-libs/spdlog
192 - dev-util/glslang
193 - >=dev-util/vulkan-headers-1.2
194 - media-libs/vulkan-loader
195 - media-libs/libglvnd
196 - x11-libs/libdrm
197 - dbus? ( sys-apps/dbus )
198 - X? ( x11-libs/libX11 )
199 - video_cards_nvidia? (
200 - x11-drivers/nvidia-drivers
201 - xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
202 - )
203 - wayland? ( dev-libs/wayland )
204 -"
205 -
206 -RDEPEND="${DEPEND}"
207 -
208 -PATCHES=(
209 - "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch"
210 -)
211 -
212 -src_prepare() {
213 - default
214 - # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>"
215 - find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \;
216 - find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/g' {} \;
217 -}
218 -
219 -src_configure() {
220 - local emesonargs=(
221 - -Dappend_libdir_mangohud=false
222 - -Duse_system_spdlog=enabled
223 - -Duse_system_vulkan=enabled
224 - -Dinclude_doc=false
225 - $(meson_feature video_cards_nvidia with_nvml)
226 - $(meson_feature xnvctrl with_xnvctrl)
227 - $(meson_feature X with_x11)
228 - $(meson_feature wayland with_wayland)
229 - $(meson_feature dbus with_dbus)
230 - )
231 - meson_src_configure
232 -}
233 -
234 -pkg_postinst() {
235 - if ! use xnvctrl; then
236 - einfo ""
237 - einfo "If mangohud can't get GPU load, or other GPU information,"
238 - einfo "and you have an older Nvidia device."
239 - einfo ""
240 - einfo "Try enabling the 'xnvctrl' useflag."
241 - einfo ""
242 - fi
243 -}