commit: 40533cc0b25627c2d4e2f90143fa6f9f4e6c1e43
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Wed Sep 7 20:54:32 2022 +0000
Commit: Adel KARA SLIMANE <adel <AT> karaslimane <DOT> com>
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() {
