* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-05-05 4:07 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2022-05-05 4:07 UTC (permalink / raw
To: gentoo-commits
commit: 91e7bc3da242cddbc57a644c87d01e48cca18270
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Tue May 3 21:57:57 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue May 3 21:59:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=91e7bc3d
media-libs/imgui: fix ebuild
Closes: https://bugs.gentoo.org/839315
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
...d-0.6.6.1.ebuild => mangohud-0.6.6.1-r1.ebuild} | 24 +++++++++++-----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.6.6.1.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
similarity index 85%
rename from games-util/mangohud/mangohud-0.6.6.1.ebuild
rename to games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
index ae6a20b76..f6f2e4aaf 100644
--- a/games-util/mangohud/mangohud-0.6.6.1.ebuild
+++ b/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 meson-multilib
+inherit python-r1 distutils-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[ -n "$(ver_cut 4)" ] && MY_PV_REV="-$(ver_cut 4)"
@@ -13,7 +13,7 @@ MY_PV=$(ver_cut 1-3)
IMGUI_VER="1.81"
IMGUI_MESON_WRAP_VER="1"
-DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more."
+DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"
HOMEPAGE="https://github.com/flightlessmango/MangoHud"
SRC_URI="
@@ -22,7 +22,7 @@ SRC_URI="
https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
SLOT="0"
@@ -34,9 +34,12 @@ REQUIRED_USE="
BDEPEND="
app-arch/unzip
+"
+
+DEPEND="
dev-python/mako[${PYTHON_USEDEP}]
- dev-libs/spdlog
- dev-util/glslang
+ dev-libs/spdlog[${MULTILIB_USEDEP}]
+ dev-util/glslang[${MULTILIB_USEDEP}]
>=dev-util/vulkan-headers-1.2
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
media-libs/libglvnd[$MULTILIB_USEDEP]
@@ -49,24 +52,21 @@ BDEPEND="
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
"
-RDEPEND="${BDEPEND}"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/MangoHud-${PV}"
+# PATCHES=( "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" )
+
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
}
-src_prepare() {
- default
- eapply "${FILESDIR}/mangonhud-0.6.6-meson-build.patch"
-}
-
multilib_src_configure() {
local emesonargs=(
-Dappend_libdir_mangohud=false
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-05-09 18:44 Andrew Ammerlaan
0 siblings, 0 replies; 23+ messages in thread
From: Andrew Ammerlaan @ 2022-05-09 18:44 UTC (permalink / raw
To: gentoo-commits
commit: df151128206ef2e4de535a3f4f3749bb17edfa9f
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 18:25:12 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 9 18:25:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=df151128
games-util/mangohud: fix spdlog dep
spdlog explicitly describes itself as header-only,
so we don't need the MULTILIB_USEDEP (which is causing
CI to fail)
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-util/mangohud/mangohud-0.6.6.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
index f6f2e4aaf..d9a0a388b 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.6.6.1-r1.ebuild
@@ -38,7 +38,7 @@ BDEPEND="
DEPEND="
dev-python/mako[${PYTHON_USEDEP}]
- dev-libs/spdlog[${MULTILIB_USEDEP}]
+ dev-libs/spdlog
dev-util/glslang[${MULTILIB_USEDEP}]
>=dev-util/vulkan-headers-1.2
media-libs/vulkan-loader[${MULTILIB_USEDEP}]
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-05-10 7:49 Florian Schmaus
0 siblings, 0 replies; 23+ messages in thread
From: Florian Schmaus @ 2022-05-10 7:49 UTC (permalink / raw
To: gentoo-commits
commit: a1a706a47ee68cfd0bc551bdde9365920b8f1d00
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Mon May 9 20:50:44 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <adel.ks <AT> 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)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-05-12 9:14 Andrew Ammerlaan
0 siblings, 0 replies; 23+ messages in thread
From: Andrew Ammerlaan @ 2022-05-12 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 547bceacc87d20ff565d1fbdcc3e2322aa0ef8c9
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Wed May 11 18:31:40 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 11 18:33:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=547bceac
games-util/mangohud: inherit python-any-r1 and add libdrm as dep
Closes: https://bugs.gentoo.org/843734
Closes: https://bugs.gentoo.org/843737
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 977a71eef..ca29f2673 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 distutils-r1 meson
+inherit python-any-r1 distutils-r1 meson
MY_PV=$(ver_cut 1-3)
[ -n "$(ver_cut 4)" ] && MY_PV_REV="-$(ver_cut 4)"
@@ -43,6 +43,7 @@ DEPEND="
>=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? (
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-05-12 9:14 Andrew Ammerlaan
0 siblings, 0 replies; 23+ messages in thread
From: Andrew Ammerlaan @ 2022-05-12 9:14 UTC (permalink / raw
To: gentoo-commits
commit: f7289cf91664bed749fdac2ff6ac6ed7615f8911
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Wed May 11 19:06:04 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed May 11 19:06:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f7289cf9
games-util/mangohud: properly uses python-any-r1 eclass
Using https://projects.gentoo.org/python/guide/any.html
Thanks @ionenwks @arthurzam
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
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 ca29f2673..99f91b86a 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
@@ -5,10 +5,10 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 distutils-r1 meson
+inherit python-any-r1 meson
MY_PV=$(ver_cut 1-3)
-[ -n "$(ver_cut 4)" ] && MY_PV_REV="-$(ver_cut 4)"
+[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
IMGUI_VER="1.81"
IMGUI_MESON_WRAP_VER="1"
@@ -34,9 +34,13 @@ REQUIRED_USE="
BDEPEND="
app-arch/unzip
- dev-python/mako[${PYTHON_USEDEP}]
+ $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
"
+python_check_deps() {
+ python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+}
+
DEPEND="
dev-libs/spdlog
dev-util/glslang
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-07-23 17:36 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2022-07-23 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 809624148bd026884a0625d3ee2c6082b351d283
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Fri Jul 22 17:38:38 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul 22 17:39:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=80962414
games-util/mangohud: version bump to 0.6.7.1
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/Manifest | 1 +
games-util/mangohud/mangohud-0.6.7.1.ebuild | 103 ++++++++++++++++++++++++++++
2 files changed, 104 insertions(+)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index c00c83d44..16dbf2e48 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,3 +1,4 @@
DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c
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
diff --git a/games-util/mangohud/mangohud-0.6.7.1.ebuild b/games-util/mangohud/mangohud-0.6.7.1.ebuild
new file mode 100644
index 000000000..3e0b6e177
--- /dev/null
+++ b/games-util/mangohud/mangohud-0.6.7.1.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..10} )
+
+inherit python-any-r1 meson
+
+MY_PV=$(ver_cut 1-3)
+[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
+
+IMGUI_VER="1.81"
+IMGUI_MESON_WRAP_VER="1"
+
+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
+ https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
+"
+
+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="
+ 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}"
+
+# We do not enable this patch for now until imgui ebuild supports multilib
+
+# 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 )
+
+ 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
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-09-06 1:06 Ronny Gutbrod
0 siblings, 0 replies; 23+ messages in thread
From: Ronny Gutbrod @ 2022-09-06 1:06 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2022-09-08 1:46 Ronny Gutbrod
0 siblings, 0 replies; 23+ messages in thread
From: Ronny Gutbrod @ 2022-09-08 1:46 UTC (permalink / raw
To: gentoo-commits
commit: 40533cc0b25627c2d4e2f90143fa6f9f4e6c1e43
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Wed Sep 7 20:54:32 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Sep 7 20:55:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=40533cc0
games-util/mangohud: improve ebuilds + add 0.6.8 and 9999
Fixed pkgcheck warnings
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/Manifest | 1 +
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 6 ++--
games-util/mangohud/mangohud-0.6.7.1.ebuild | 6 ++--
...hud-0.6.6.1-r3.ebuild => mangohud-0.6.8.ebuild} | 40 ++++++++++++----------
...ohud-0.6.6.1-r3.ebuild => mangohud-9999.ebuild} | 40 ++++++++++++----------
5 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index 16dbf2e48..97ecf7cc5 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 99f91b86a..9dc290fbc 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 3e0b6e177..71d738e08 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.6.1-r3.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild
similarity index 65%
copy from games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
copy to games-util/mangohud/mangohud-0.6.8.ebuild
index 99f91b86a..0325714a5 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.6.8.ebuild
@@ -3,26 +3,23 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+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)"
-IMGUI_VER="1.81"
-IMGUI_MESON_WRAP_VER="1"
-
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
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
-"
-
-KEYWORDS="~amd64 ~x86"
+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"
@@ -42,6 +39,7 @@ python_check_deps() {
}
DEPEND="
+ ~media-libs/imgui-1.81[opengl,vulkan]
dev-libs/spdlog
dev-util/glslang
>=dev-util/vulkan-headers-1.2
@@ -59,19 +57,23 @@ DEPEND="
RDEPEND="${DEPEND}"
-S="${WORKDIR}/MangoHud-${PV}"
+[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}"
-# PATCHES=(
-# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch"
-# )
+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 )
+ [[ $PV == 9999 ]] && git-r3_src_unpack
+ [[ $PV != 9999 && -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
+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() {
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-9999.ebuild
similarity index 65%
copy from games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
copy to games-util/mangohud/mangohud-9999.ebuild
index 99f91b86a..0325714a5 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -3,26 +3,23 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+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)"
-IMGUI_VER="1.81"
-IMGUI_MESON_WRAP_VER="1"
-
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
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
-"
-
-KEYWORDS="~amd64 ~x86"
+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"
@@ -42,6 +39,7 @@ python_check_deps() {
}
DEPEND="
+ ~media-libs/imgui-1.81[opengl,vulkan]
dev-libs/spdlog
dev-util/glslang
>=dev-util/vulkan-headers-1.2
@@ -59,19 +57,23 @@ DEPEND="
RDEPEND="${DEPEND}"
-S="${WORKDIR}/MangoHud-${PV}"
+[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}"
-# PATCHES=(
-# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch"
-# )
+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 )
+ [[ $PV == 9999 ]] && git-r3_src_unpack
+ [[ $PV != 9999 && -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
+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() {
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
2022-09-26 10:05 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
@ 2022-09-26 10:05 ` Andrew Ammerlaan
0 siblings, 0 replies; 23+ messages in thread
From: Andrew Ammerlaan @ 2022-09-26 10:05 UTC (permalink / raw
To: gentoo-commits
commit: e710bbacb4ba08fd4ff7c417696d2014d2d568af
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 10:00:28 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 10:05:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e710bbac
games-util/mangohud: shorten description
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 2 +-
games-util/mangohud/mangohud-0.6.7.1.ebuild | 2 +-
games-util/mangohud/mangohud-0.6.8.ebuild | 2 +-
games-util/mangohud/mangohud-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
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 9dc290fbc..5f2d8c1a3 100644
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
@@ -13,7 +13,7 @@ MY_PV=$(ver_cut 1-3)
IMGUI_VER="1.81"
IMGUI_MESON_WRAP_VER="1"
-DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"
+DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more"
HOMEPAGE="https://github.com/flightlessmango/MangoHud"
SRC_URI="
diff --git a/games-util/mangohud/mangohud-0.6.7.1.ebuild b/games-util/mangohud/mangohud-0.6.7.1.ebuild
index 71d738e08..e731319c3 100644
--- a/games-util/mangohud/mangohud-0.6.7.1.ebuild
+++ b/games-util/mangohud/mangohud-0.6.7.1.ebuild
@@ -13,7 +13,7 @@ MY_PV=$(ver_cut 1-3)
IMGUI_VER="1.81"
IMGUI_MESON_WRAP_VER="1"
-DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"
+DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more"
HOMEPAGE="https://github.com/flightlessmango/MangoHud"
SRC_URI="
diff --git a/games-util/mangohud/mangohud-0.6.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild
index 0325714a5..f16c7e660 100644
--- a/games-util/mangohud/mangohud-0.6.8.ebuild
+++ b/games-util/mangohud/mangohud-0.6.8.ebuild
@@ -10,7 +10,7 @@ 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"
+DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more"
HOMEPAGE="https://github.com/flightlessmango/MangoHud"
if [[ ${PV} == 9999 ]]; then
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 0325714a5..f16c7e660 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -10,7 +10,7 @@ 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"
+DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more"
HOMEPAGE="https://github.com/flightlessmango/MangoHud"
if [[ ${PV} == 9999 ]]; then
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2023-08-21 12:43 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2023-08-21 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 1d43421aeb6380583dbe599cecf80afdf2e3dc77
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sun Aug 20 00:38:29 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sun Aug 20 00:42:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d43421a
games-util/mangohud: drop 0.6.6.1-r3, 0.6.7.1, 0.6.8, 9999
No longer compile due to vulkan-headers being too new
and mangohud not updating for the changes and just
deciding to stick with an old version due to lack
of ressources
Closes: https://bugs.gentoo.org/904698
Closes: https://bugs.gentoo.org/912573
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/Manifest | 5 --
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 101 ------------------------
games-util/mangohud/mangohud-0.6.7.1.ebuild | 103 -------------------------
games-util/mangohud/mangohud-0.6.8.ebuild | 103 -------------------------
games-util/mangohud/mangohud-9999.ebuild | 103 -------------------------
5 files changed, 415 deletions(-)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index 867a36648d..b02ce6d837 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,8 +1,3 @@
-DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c
-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
DIST mangohud-0.6.9.1.tar.gz 14853039 BLAKE2B e34674dc6877249bdfa8929fec1b337876f6d69c42e5c35c37813adca67232084178247d8bef1bf9c0471f9966474df27b25564644dea55e90b3b3c6b9fbf4d1 SHA512 540fb4d1c5494e1305553600f76c57ba75c465df4b76ddbe1f15c418fa9a7e26c66be7ce64a13bfd7c5073bcb985cd28b2876252cdff7c43793d22a40eb78a87
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
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
deleted file mode 100644
index 1882b9076e..0000000000
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1 meson
-
-MY_PV=$(ver_cut 1-3)
-[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
-
-IMGUI_VER="1.81"
-IMGUI_MESON_WRAP_VER="1"
-
-DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system 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
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
-"
-
-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="
- 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 )
-
- 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
-}
-
-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-0.6.7.1.ebuild b/games-util/mangohud/mangohud-0.6.7.1.ebuild
deleted file mode 100644
index 5ff3040e0a..0000000000
--- a/games-util/mangohud/mangohud-0.6.7.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1 meson
-
-MY_PV=$(ver_cut 1-3)
-[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
-
-IMGUI_VER="1.81"
-IMGUI_MESON_WRAP_VER="1"
-
-DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system 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
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip
-"
-
-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="
- 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}"
-
-# We do not enable this patch for now until imgui ebuild supports multilib
-
-# 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 )
-
- 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
-}
-
-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-0.6.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild
deleted file mode 100644
index ea02869ef8..0000000000
--- a/games-util/mangohud/mangohud-0.6.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1 meson
-
-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"
-
-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 <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 ea02869ef8..0000000000
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1 meson
-
-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"
-
-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 <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
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2023-08-21 12:43 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2023-08-21 12:43 UTC (permalink / raw
To: gentoo-commits
commit: d54b8300d11abba6dfecb37f0270680cf28e51b4
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sun Aug 20 00:36:07 2023 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sun Aug 20 00:42:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d54b8300
games-util/mangohud: add 0.6.9.1
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/Manifest | 3 +
games-util/mangohud/mangohud-0.6.9.1.ebuild | 119 ++++++++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index 97ecf7cc55..867a36648d 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -3,3 +3,6 @@ DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c3881
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
+DIST mangohud-0.6.9.1.tar.gz 14853039 BLAKE2B e34674dc6877249bdfa8929fec1b337876f6d69c42e5c35c37813adca67232084178247d8bef1bf9c0471f9966474df27b25564644dea55e90b3b3c6b9fbf4d1 SHA512 540fb4d1c5494e1305553600f76c57ba75c465df4b76ddbe1f15c418fa9a7e26c66be7ce64a13bfd7c5073bcb985cd28b2876252cdff7c43793d22a40eb78a87
+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
diff --git a/games-util/mangohud/mangohud-0.6.9.1.ebuild b/games-util/mangohud/mangohud-0.6.9.1.ebuild
new file mode 100644
index 0000000000..754d21788d
--- /dev/null
+++ b/games-util/mangohud/mangohud-0.6.9.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1 meson
+
+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"
+
+VK_HEADERS_VER="1.2.158"
+VK_HEADERS_MESON_WRAP_VER="2"
+
+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
+ https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
+ -> vulkan-headers-${VK_HEADERS_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch
+ -> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
+ "
+ 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
+ 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
+ if [[ $PV != 9999 ]]; then
+
+ [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die )
+
+ unpack vulkan-headers-${VK_HEADERS_VER}.tar.gz
+ unpack vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
+ mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || die
+ else
+ git-r3_src_unpack
+ fi
+}
+
+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
+ -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
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2023-08-23 17:33 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2023-08-23 17:33 UTC (permalink / raw
To: gentoo-commits
commit: b783b445cc48a09958b0f734865cfe7c27209603
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Tue Aug 22 18:15:30 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Aug 22 18:15:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b783b445
games-util/mangohud: add nlohmann_json dep
Closes: https://bugs.gentoo.org/912747
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/mangohud-0.6.9.1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/games-util/mangohud/mangohud-0.6.9.1.ebuild b/games-util/mangohud/mangohud-0.6.9.1.ebuild
index 754d21788d..34baf3dabe 100644
--- a/games-util/mangohud/mangohud-0.6.9.1.ebuild
+++ b/games-util/mangohud/mangohud-0.6.9.1.ebuild
@@ -33,7 +33,7 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia"
+IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu"
REQUIRED_USE="
|| ( X wayland )
@@ -50,6 +50,7 @@ python_check_deps() {
DEPEND="
~media-libs/imgui-1.81[opengl,vulkan]
+ dev-cpp/nlohmann_json
dev-libs/spdlog
dev-util/glslang
media-libs/vulkan-loader
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-02-07 10:10 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2024-02-07 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 007ed1306557352091482b32f406f06cf96e0bbf
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 20:56:08 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Feb 6 20:59:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=007ed130
games-util/mangohud-0.7.0-r1: fix build error because of system spdlog
* @AdelKS to my knowladge dosen't exist anyway to add submodule using
git-r3 so probably 9999 need to drop
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/Manifest | 2 ++
.../mangohud/{mangohud-0.7.0.ebuild => mangohud-0.7.0-r1.ebuild} | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index d9d337f7d4..4d69654697 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,5 +1,7 @@
DIST implot-0.16-1-meson-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7
DIST implot-0.16.tar.gz 137983 BLAKE2B aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7 SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa9bbbb91ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919
DIST mangohud-0.7.0.tar.gz 14892372 BLAKE2B 436a7834743aac3f95d55031194fddd79861061010cf5eb25e81cf5eceacf4015b607a191931a85715ca0d58c8e314841d536ce83e7767a39869ab789d376c7a SHA512 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7
+DIST spdlog-1.8.5-1-wrap.zip 2211 BLAKE2B 709d961280d83a82bbd440bdf4bafd7692227ecef38dbfc5380d971c41168017f927972855617cdd1cd36a1b8d1ed7fbb94c50a16265d593cfd132195a6cd5ab SHA512 580c724059306191a2e0decbb733ffa9e667354edb6cb08a72afb7ca4f2ef6eb2d52952a59ede631f3097394373f412179adc3aaf522067980a67bfa03c71b49
+DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
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
diff --git a/games-util/mangohud/mangohud-0.7.0.ebuild b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
similarity index 88%
rename from games-util/mangohud/mangohud-0.7.0.ebuild
rename to games-util/mangohud/mangohud-0.7.0-r1.ebuild
index 4735f458e9..67a1c765e9 100644
--- a/games-util/mangohud/mangohud-0.7.0.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -15,12 +15,15 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud"
VK_HEADERS_VER="1.2.158"
VK_HEADERS_MESON_WRAP_VER="2"
+SPDLOG_VER="1.8.5"
SRC_URI="
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
-> vulkan-headers-${VK_HEADERS_VER}.tar.gz
https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch
-> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
+ https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip
"
if [[ ${PV} == 9999 ]]; then
@@ -93,6 +96,10 @@ src_unpack() {
unpack vulkan-headers-${VK_HEADERS_VER}.tar.gz
unpack vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || die
+ # fix build error by using specify version of spdlog
+ unpack spdlog-${SPDLOG_VER}.tar.gz
+ unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+ mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
}
src_prepare() {
@@ -107,7 +114,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
-Dappend_libdir_mangohud=false
- -Duse_system_spdlog=enabled
+ -Duse_system_spdlog=disabled
-Dinclude_doc=false
$(meson_feature video_cards_nvidia with_nvml)
$(meson_feature xnvctrl with_xnvctrl)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-02-07 10:10 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2024-02-07 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 8d4c451d2aa0b9df348d983bf5028b0bc199e38f
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 01:41:44 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 01:43:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d4c451d
games-util/mangohud: propragate spdlog fix to 9999
* improve comments for spdlog fix
* add myself as proxy mantainer
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/Manifest | 2 ++
games-util/mangohud/mangohud-0.7.0-r1.ebuild | 4 +++-
games-util/mangohud/mangohud-9999.ebuild | 12 ++++++++++--
games-util/mangohud/metadata.xml | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index 4d69654697..ad59a61752 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,6 +1,8 @@
DIST implot-0.16-1-meson-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7
DIST implot-0.16.tar.gz 137983 BLAKE2B aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7 SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa9bbbb91ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919
DIST mangohud-0.7.0.tar.gz 14892372 BLAKE2B 436a7834743aac3f95d55031194fddd79861061010cf5eb25e81cf5eceacf4015b607a191931a85715ca0d58c8e314841d536ce83e7767a39869ab789d376c7a SHA512 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7
+DIST spdlog-1.13.0-1-wrap.zip 2959 BLAKE2B 13744264cfab96ff51f033300182b8937959e7bf74851d7cff26b7e9c05109518b0623a71bfc326951d86c43d104a1bb1700cd45e69ebd41683726e9764f630b SHA512 59c5d50ee1c14a1b43aa3000a591d9fd2bc4c9ff043b23d25be896ca9a34c1c392c26240ed58a5e877231c09fd1b28012f58b3c403d0370cf5dd9169587a8de4
+DIST spdlog-1.13.0.tar.gz 264003 BLAKE2B 8ffeec847f082a0932f406ab44b4653661fdbe95a15f7b736367ee6d8f45ab36ca2182a9e9c6fba5c0688ab5436c16932b130541a8532cc2e5f4980e6340b929 SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340
DIST spdlog-1.8.5-1-wrap.zip 2211 BLAKE2B 709d961280d83a82bbd440bdf4bafd7692227ecef38dbfc5380d971c41168017f927972855617cdd1cd36a1b8d1ed7fbb94c50a16265d593cfd132195a6cd5ab SHA512 580c724059306191a2e0decbb733ffa9e667354edb6cb08a72afb7ca4f2ef6eb2d52952a59ede631f3097394373f412179adc3aaf522067980a67bfa03c71b49
DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
DIST vulkan-headers-1.2.158-2-meson-wrap.zip 1107 BLAKE2B 35e4bb1f7410a009243fe7d4a4ba6cede7f01e0b56ad6ff72ad30c00c2452bd6d2a4fb44ab92c296147e2506a92acc6de1f817cb5433b96d66652cbcd8885595 SHA512 30cbbb90580399839e1bba8881b9b8cc33fdeead93f37d5f3398c9d53fb3ab050ca2562fd68f376fa4ee0825ee3787f560d70d55a170c780dd575ff2eeb66efd
diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
index 67a1c765e9..f6022d6d7a 100644
--- a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -96,7 +96,8 @@ src_unpack() {
unpack vulkan-headers-${VK_HEADERS_VER}.tar.gz
unpack vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || die
- # fix build error by using specify version of spdlog
+
+ # fix build error by using upstream submodule version of spdlog
unpack spdlog-${SPDLOG_VER}.tar.gz
unpack spdlog-${SPDLOG_VER}-1-wrap.zip
mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
@@ -112,6 +113,7 @@ src_prepare() {
}
src_configure() {
+ # disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
-Duse_system_spdlog=disabled
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 3fba65ec23..31854ad3e4 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -18,6 +18,7 @@ VK_HEADERS_MESON_WRAP_VER="2"
IMPLOT_VER="0.16"
IMPLOT_MESON_WRAP_VER="1"
+SPDLOG_VER="1.13.0"
SRC_URI="
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
@@ -28,6 +29,8 @@ SRC_URI="
-> implot-${IMPLOT_VER}.tar.gz
https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_MESON_WRAP_VER}/get_patch
-> implot-${IMPLOT_VER}-${IMPLOT_MESON_WRAP_VER}-meson-wrap.zip
+ https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip
"
if [[ ${PV} == 9999 ]]; then
@@ -61,7 +64,6 @@ RDEPEND="
${PYTHON_DEPS}
~media-libs/imgui-1.81[opengl,vulkan]
dev-cpp/nlohmann_json
- dev-libs/spdlog
dev-util/glslang
media-fonts/lato
media-libs/vulkan-loader
@@ -107,6 +109,11 @@ src_unpack() {
cd "${S}/subprojects/implot-${IMPLOT_VER}" || die
eapply "${FILESDIR}/implot-v0.16-fix-imgui-dep.patch"
+
+ # fix build error by using upstream submodule version of spdlog
+ unpack spdlog-${SPDLOG_VER}.tar.gz
+ unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+ mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
}
src_prepare() {
@@ -119,9 +126,10 @@ src_prepare() {
}
src_configure() {
+ # disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
- -Duse_system_spdlog=enabled
+ -Duse_system_spdlog=disabled
-Dinclude_doc=false
$(meson_feature video_cards_nvidia with_nvml)
$(meson_feature xnvctrl with_xnvctrl)
diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml
index ef677c607a..467717705c 100644
--- a/games-util/mangohud/metadata.xml
+++ b/games-util/mangohud/metadata.xml
@@ -5,7 +5,11 @@
<email>adel.ks@zegrapher.com</email>
<name>Adel KARA SLIMANE</name>
</maintainer>
- <upstream>
+ <maintainer type="person">
+ <email>gonegrier.duarte@gmail.com</email>
+ <name>Gonçalo Negrier Duarte</name>
+ </maintainer>
+ <upstream>
<remote-id type="github">flightlessmango/MangoHud</remote-id>
<bugs-to>https://github.com/flightlessmango/MangoHud/issues</bugs-to>
</upstream>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-02-08 9:29 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2024-02-08 9:29 UTC (permalink / raw
To: gentoo-commits
commit: d15c17df7c33ab59541e80cf9dcfaf01b4a4ac36
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 18:04:23 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 18:04:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d15c17df
games-util/mangohud:fix typo on RDEPEND (commit 7154705)
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/mangohud-0.7.0-r1.ebuild | 2 +-
games-util/mangohud/mangohud-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
index 8a3f925da9..46bd8da5c4 100644
--- a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 8bfb3ae515..a4b465dfec 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-02-08 9:29 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2024-02-08 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 71547053737487b311e5d89204217fecc0827b88
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Wed Feb 7 17:58:42 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Feb 7 17:59:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=71547053
games-util/mangohud: add multilib support
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/mangohud-0.7.0-r1.ebuild | 21 ++++++++++-----------
games-util/mangohud/mangohud-9999.ebuild | 20 ++++++++++----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
index f6022d6d7a..8a3f925da9 100644
--- a/games-util/mangohud/mangohud-0.7.0-r1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson
+inherit python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -55,21 +55,20 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- ~media-libs/imgui-1.81[opengl,vulkan]
+ ~media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
- dev-libs/spdlog
dev-util/glslang
media-fonts/lato
- media-libs/vulkan-loader
- media-libs/libglvnd
- x11-libs/libdrm
- dbus? ( sys-apps/dbus )
- X? ( x11-libs/libX11 )
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ x11-libs/libdrm[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
video_cards_nvidia? (
- x11-drivers/nvidia-drivers
+ x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland )
+ wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
@@ -112,7 +111,7 @@ src_prepare() {
find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
}
-src_configure() {
+multilib_src_configure() {
# disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 31854ad3e4..8bfb3ae515 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson
+inherit python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -62,20 +62,20 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- ~media-libs/imgui-1.81[opengl,vulkan]
+ ~media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
- media-libs/vulkan-loader
- media-libs/libglvnd
- x11-libs/libdrm
- dbus? ( sys-apps/dbus )
- X? ( x11-libs/libX11 )
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ x11-libs/libdrm[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
video_cards_nvidia? (
- x11-drivers/nvidia-drivers
+ x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}]
xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
)
- wayland? ( dev-libs/wayland )
+ wayland? ( dev-libs/wayland [${MULTILIB_USEDEP}] )
$(python_gen_cond_dep '
|| (
dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
@@ -125,7 +125,7 @@ src_prepare() {
find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
}
-src_configure() {
+multilib_src_configure() {
# disable system spdlog in favor of the submodule version
local emesonargs=(
-Dappend_libdir_mangohud=false
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-04-13 16:14 Julien Roy
0 siblings, 0 replies; 23+ messages in thread
From: Julien Roy @ 2024-04-13 16:14 UTC (permalink / raw
To: gentoo-commits
commit: aecae388f667c82eebac21fe1cdcf39d6df93147
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Sat Apr 13 15:53:07 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Apr 13 15:53:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aecae388
games-util/mangohud: minor ebuild code improvement
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
games-util/mangohud/mangohud-0.7.1.ebuild | 18 ++++++++++++------
games-util/mangohud/mangohud-9999.ebuild | 18 ++++++++++++------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.1.ebuild b/games-util/mangohud/mangohud-0.7.1.ebuild
index 5260457e43..56583d7753 100644
--- a/games-util/mangohud/mangohud-0.7.1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1.ebuild
@@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud"
VK_HEADERS_VER="1.2.158"
VK_HEADERS_MESON_WRAP_VER="2"
SPDLOG_VER="1.13.0"
+SPDLOG_WRAP_VER="1"
IMPLOT_VER="0.16"
+IMPLOT_WRAP_VER="1"
SRC_URI="
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
-> vulkan-headers-${VK_HEADERS_VER}.tar.gz
https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch
-> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
- https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip
- https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> implot-${IMPLOT_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> implot-${IMPLOT_VER}-1-wrap.zip
+ https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz
+ -> spdlog-${SPDLOG_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-${SPDLOG_WRAP_VER}/get_patch
+ -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
+ https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz
+ -> implot-${IMPLOT_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch
+ -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
"
if [[ ${PV} == 9999 ]]; then
@@ -101,11 +107,11 @@ src_unpack() {
# fix build error by using upstream submodule version of spdlog
unpack spdlog-${SPDLOG_VER}.tar.gz
- unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+ unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
unpack implot-${IMPLOT_VER}.tar.gz
- unpack implot-${IMPLOT_VER}-1-wrap.zip
+ unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die
}
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 5260457e43..56583d7753 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -16,17 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud"
VK_HEADERS_VER="1.2.158"
VK_HEADERS_MESON_WRAP_VER="2"
SPDLOG_VER="1.13.0"
+SPDLOG_WRAP_VER="1"
IMPLOT_VER="0.16"
+IMPLOT_WRAP_VER="1"
SRC_URI="
https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
-> vulkan-headers-${VK_HEADERS_VER}.tar.gz
https://wrapdb.mesonbuild.com/v2/vulkan-headers_${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}/get_patch
-> vulkan-headers-${VK_HEADERS_VER}-${VK_HEADERS_MESON_WRAP_VER}-meson-wrap.zip
- https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz -> spdlog-${SPDLOG_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-1/get_patch -> spdlog-${SPDLOG_VER}-1-wrap.zip
- https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz -> implot-${IMPLOT_VER}.tar.gz
- https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-1/get_patch -> implot-${IMPLOT_VER}-1-wrap.zip
+ https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VER}.tar.gz
+ -> spdlog-${SPDLOG_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/spdlog_${SPDLOG_VER}-${SPDLOG_WRAP_VER}/get_patch
+ -> spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
+ https://github.com/epezent/implot/archive/refs/tags/v${IMPLOT_VER}.tar.gz
+ -> implot-${IMPLOT_VER}.tar.gz
+ https://wrapdb.mesonbuild.com/v2/implot_${IMPLOT_VER}-${IMPLOT_WRAP_VER}/get_patch
+ -> implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
"
if [[ ${PV} == 9999 ]]; then
@@ -101,11 +107,11 @@ src_unpack() {
# fix build error by using upstream submodule version of spdlog
unpack spdlog-${SPDLOG_VER}.tar.gz
- unpack spdlog-${SPDLOG_VER}-1-wrap.zip
+ unpack spdlog-${SPDLOG_VER}-${SPDLOG_WRAP_VER}-wrap.zip
mv "${WORKDIR}/spdlog-${SPDLOG_VER}" "${S}/subprojects/" || die
unpack implot-${IMPLOT_VER}.tar.gz
- unpack implot-${IMPLOT_VER}-1-wrap.zip
+ unpack implot-${IMPLOT_VER}-${IMPLOT_WRAP_VER}-wrap.zip
mv "${WORKDIR}/implot-${IMPLOT_VER}" "${S}/subprojects/" || die
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-04-13 17:15 Julien Roy
0 siblings, 0 replies; 23+ messages in thread
From: Julien Roy @ 2024-04-13 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 9f65899b898177e37cc52b615801ea33aa0f9256
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Apr 13 16:17:27 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Apr 13 17:09:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f65899b
games-util/mangohud: fix pkgcheck nit picks
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
games-util/mangohud/mangohud-0.7.1.ebuild | 5 +++--
games-util/mangohud/mangohud-9999.ebuild | 5 +++--
games-util/mangohud/metadata.xml | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.1.ebuild b/games-util/mangohud/mangohud-0.7.1.ebuild
index 56583d7753..f96a5d8ce4 100644
--- a/games-util/mangohud/mangohud-0.7.1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -124,7 +124,8 @@ src_prepare() {
find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
# replace imgui_dep in implot build file
- sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
+ sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' \
+ -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
}
multilib_src_configure() {
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 56583d7753..f96a5d8ce4 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -124,7 +124,8 @@ src_prepare() {
find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die
# replace imgui_dep in implot build file
- sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
+ sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' \
+ -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
}
multilib_src_configure() {
diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml
index 467717705c..81225ee755 100644
--- a/games-util/mangohud/metadata.xml
+++ b/games-util/mangohud/metadata.xml
@@ -9,7 +9,7 @@
<email>gonegrier.duarte@gmail.com</email>
<name>Gonçalo Negrier Duarte</name>
</maintainer>
- <upstream>
+ <upstream>
<remote-id type="github">flightlessmango/MangoHud</remote-id>
<bugs-to>https://github.com/flightlessmango/MangoHud/issues</bugs-to>
</upstream>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-05-10 0:33 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2024-05-10 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 6530a2af26b37a35588a41e643035045d35b0901
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu May 9 23:53:15 2024 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu May 9 23:53:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6530a2af
games-util/mangohud: missing dependency mangoapp
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/mangohud-0.7.1-r3.ebuild | 1 +
games-util/mangohud/mangohud-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/games-util/mangohud/mangohud-0.7.1-r3.ebuild b/games-util/mangohud/mangohud-0.7.1-r3.ebuild
index 143418dc36..76827f04c2 100644
--- a/games-util/mangohud/mangohud-0.7.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1-r3.ebuild
@@ -72,6 +72,7 @@ RDEPEND="
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
mangoapp? (
>=media-libs/imgui-1.81[glfw]
+ media-libs/glfw[X]
media-libs/glew
)
$(python_gen_cond_dep '
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 143418dc36..76827f04c2 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -72,6 +72,7 @@ RDEPEND="
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
mangoapp? (
>=media-libs/imgui-1.81[glfw]
+ media-libs/glfw[X]
media-libs/glew
)
$(python_gen_cond_dep '
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-05-12 9:38 Viorel Munteanu
0 siblings, 0 replies; 23+ messages in thread
From: Viorel Munteanu @ 2024-05-12 9:38 UTC (permalink / raw
To: gentoo-commits
commit: 8c24881021c85917a60afd852f19fad72d940128
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri May 10 13:53:14 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri May 10 14:00:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c248810
games-util/mangohud: use the same version as subproject
* this may only apply to imgui and implot
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
.../mangohud/{mangohud-0.7.1-r3.ebuild => mangohud-0.7.1-r4.ebuild} | 4 ++--
games-util/mangohud/mangohud-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.1-r3.ebuild b/games-util/mangohud/mangohud-0.7.1-r4.ebuild
similarity index 97%
rename from games-util/mangohud/mangohud-0.7.1-r3.ebuild
rename to games-util/mangohud/mangohud-0.7.1-r4.ebuild
index 76827f04c2..46178138f2 100644
--- a/games-util/mangohud/mangohud-0.7.1-r3.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1-r4.ebuild
@@ -55,8 +55,8 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- >=media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
- >=media-libs/implot-0.16[${MULTILIB_USEDEP}]
+ =media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
+ =media-libs/implot-0.16*[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 76827f04c2..f8da5a4478 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -55,8 +55,8 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- >=media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
- >=media-libs/implot-0.16[${MULTILIB_USEDEP}]
+ =media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
+ =media-libs/implot-0.16[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-05-12 9:38 Viorel Munteanu
0 siblings, 0 replies; 23+ messages in thread
From: Viorel Munteanu @ 2024-05-12 9:38 UTC (permalink / raw
To: gentoo-commits
commit: dcc6d6ec84e4ec42e9fb246df89e1e80d3411f88
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sat May 11 07:43:17 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat May 11 07:45:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dcc6d6ec
games-util/mangohud: add missing dev-libs/spdlog dependency
* slight oversight when did the changes to system dependencies
Closes: https://bugs.gentoo.org/931697
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
games-util/mangohud/mangohud-0.7.1-r4.ebuild | 1 +
games-util/mangohud/mangohud-9999.ebuild | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.1-r4.ebuild b/games-util/mangohud/mangohud-0.7.1-r4.ebuild
index 46178138f2..230bd32509 100644
--- a/games-util/mangohud/mangohud-0.7.1-r4.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1-r4.ebuild
@@ -57,6 +57,7 @@ RDEPEND="
${PYTHON_DEPS}
=media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
=media-libs/implot-0.16*[${MULTILIB_USEDEP}]
+ =dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index f8da5a4478..230bd32509 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -55,8 +55,9 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
- =media-libs/imgui-1.81[opengl,vulkan,${MULTILIB_USEDEP}]
- =media-libs/implot-0.16[${MULTILIB_USEDEP}]
+ =media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
+ =media-libs/implot-0.16*[${MULTILIB_USEDEP}]
+ =dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-05-23 10:36 David Roman
0 siblings, 0 replies; 23+ messages in thread
From: David Roman @ 2024-05-23 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 0d344d4a959a979d2a1f65a42b2a57e7ab6cbb5e
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu May 23 09:36:23 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu May 23 09:36:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0d344d4a
games-util/mangohud: add missing dev-libs/libfmt
Closes https://bugs.gentoo.org/932526
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
.../mangohud/{mangohud-0.7.1-r4.ebuild => mangohud-0.7.1-r5.ebuild} | 1 +
games-util/mangohud/mangohud-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/games-util/mangohud/mangohud-0.7.1-r4.ebuild b/games-util/mangohud/mangohud-0.7.1-r5.ebuild
similarity index 99%
rename from games-util/mangohud/mangohud-0.7.1-r4.ebuild
rename to games-util/mangohud/mangohud-0.7.1-r5.ebuild
index 230bd3250..c3fcffcd4 100644
--- a/games-util/mangohud/mangohud-0.7.1-r4.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1-r5.ebuild
@@ -58,6 +58,7 @@ RDEPEND="
=media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
=media-libs/implot-0.16*[${MULTILIB_USEDEP}]
=dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
+ dev-libs/libfmt[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index 230bd3250..c3fcffcd4 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -58,6 +58,7 @@ RDEPEND="
=media-libs/imgui-1.89.9*[opengl,vulkan,${MULTILIB_USEDEP}]
=media-libs/implot-0.16*[${MULTILIB_USEDEP}]
=dev-libs/spdlog-1.13.0*[${MULTILIB_USEDEP}]
+ dev-libs/libfmt[${MULTILIB_USEDEP}]
dev-cpp/nlohmann_json
dev-util/glslang
media-fonts/lato
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/
@ 2024-09-18 23:46 Haelwenn Monnier
0 siblings, 0 replies; 23+ messages in thread
From: Haelwenn Monnier @ 2024-09-18 23:46 UTC (permalink / raw
To: gentoo-commits
commit: ffa7459c015522ff0017f5e3cc36b8f2d967f5a1
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 18 10:22:23 2024 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Wed Sep 18 12:06:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ffa7459c
games-util/mangohud: add workaround for lld
It can now be built with stage3-llvm-openrc, at least.
Bug: https://bugs.gentoo.org/924681
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
games-util/mangohud/mangohud-0.7.2.ebuild | 10 +++++++---
games-util/mangohud/mangohud-9999.ebuild | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/games-util/mangohud/mangohud-0.7.2.ebuild b/games-util/mangohud/mangohud-0.7.2.ebuild
index a7f88f4cc..3dc42b9ac 100644
--- a/games-util/mangohud/mangohud-0.7.2.ebuild
+++ b/games-util/mangohud/mangohud-0.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson-multilib
+inherit flag-o-matic python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -73,8 +73,8 @@ RDEPEND="
)
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
mangoapp? (
- >=media-libs/imgui-1.81[glfw]
- media-libs/glfw[X]
+ =media-libs/imgui-1.89.9*[glfw]
+ media-libs/glfw[X(+)]
media-libs/glew
)
mangoplot? ( $(python_gen_cond_dep '
@@ -113,6 +113,10 @@ src_prepare() {
}
multilib_src_configure() {
+ # workaround for lld
+ # https://github.com/flightlessmango/MangoHud/issues/1240
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
local emesonargs=(
-Dappend_libdir_mangohud=false
-Dinclude_doc=false
diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index a7f88f4cc..3dc42b9ac 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-single-r1 meson-multilib
+inherit flag-o-matic python-single-r1 meson-multilib
MY_PV=$(ver_cut 1-3)
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -73,8 +73,8 @@ RDEPEND="
)
wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
mangoapp? (
- >=media-libs/imgui-1.81[glfw]
- media-libs/glfw[X]
+ =media-libs/imgui-1.89.9*[glfw]
+ media-libs/glfw[X(+)]
media-libs/glew
)
mangoplot? ( $(python_gen_cond_dep '
@@ -113,6 +113,10 @@ src_prepare() {
}
multilib_src_configure() {
+ # workaround for lld
+ # https://github.com/flightlessmango/MangoHud/issues/1240
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
local emesonargs=(
-Dappend_libdir_mangohud=false
-Dinclude_doc=false
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-09-18 23:46 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-10 0:33 [gentoo-commits] repo/proj/guru:master commit in: games-util/mangohud/ Haelwenn Monnier
-- strict thread matches above, loose matches on Subject: below --
2024-09-18 23:46 Haelwenn Monnier
2024-05-23 10:36 David Roman
2024-05-12 9:38 Viorel Munteanu
2024-05-12 9:38 Viorel Munteanu
2024-04-13 17:15 Julien Roy
2024-04-13 16:14 Julien Roy
2024-02-08 9:29 David Roman
2024-02-08 9:29 David Roman
2024-02-07 10:10 David Roman
2024-02-07 10:10 David Roman
2023-08-23 17:33 David Roman
2023-08-21 12:43 Haelwenn Monnier
2023-08-21 12:43 Haelwenn Monnier
2022-09-26 10:05 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-09-26 10:05 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-09-08 1:46 Ronny Gutbrod
2022-09-06 1:06 Ronny Gutbrod
2022-07-23 17:36 Haelwenn Monnier
2022-05-12 9:14 Andrew Ammerlaan
2022-05-12 9:14 Andrew Ammerlaan
2022-05-10 7:49 Florian Schmaus
2022-05-09 18:44 Andrew Ammerlaan
2022-05-05 4:07 Haelwenn Monnier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox