games-util/mangohud: add 0.7.0, drop 0.6.9.1

Signed-off-by: Adel KARA SLIMANE <adel.ks@zegrapher.com>

4 files changed, 44 insertions, 16 deletions

diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest
index b02ce6d83..cc06a9c60 100644
--- a/games-util/mangohud/Manifest
+++ b/games-util/mangohud/Manifest
@@ -1,3 +1,3 @@
-DIST mangohud-0.6.9.1.tar.gz 14853039 BLAKE2B e34674dc6877249bdfa8929fec1b337876f6d69c42e5c35c37813adca67232084178247d8bef1bf9c0471f9966474df27b25564644dea55e90b3b3c6b9fbf4d1 SHA512 540fb4d1c5494e1305553600f76c57ba75c465df4b76ddbe1f15c418fa9a7e26c66be7ce64a13bfd7c5073bcb985cd28b2876252cdff7c43793d22a40eb78a87
+DIST mangohud-0.7.0.tar.gz 14892372 BLAKE2B 436a7834743aac3f95d55031194fddd79861061010cf5eb25e81cf5eceacf4015b607a191931a85715ca0d58c8e314841d536ce83e7767a39869ab789d376c7a SHA512 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7
 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/files/mangohud-v0.7.0-imgui-include-fix.patch b/games-util/mangohud/files/mangohud-v0.7.0-imgui-include-fix.patch
new file mode 100644
index 000000000..1d5d32e2f
--- /dev/null
+++ b/games-util/mangohud/files/mangohud-v0.7.0-imgui-include-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/overlay.h b/src/overlay.h
+index 8b53285..127c3db 100644
+--- a/src/overlay.h
++++ b/src/overlay.h
+@@ -7,7 +7,7 @@
+ #include <vector>
+ #include <deque>
+ #include <imgui.h>
+-#include "imgui_internal.h"
++#include "imgui/imgui_internal.h"
+ #include "overlay_params.h"
+ #include "hud_elements.h"
+ #include "engine_types.h"
diff --git a/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch b/games-util/mangohud/files/mangohud-v0.7.0-meson-fix-imgui-dep.patch
index 6d3c9c285..6d3c9c285 100644
--- a/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch
+++ b/games-util/mangohud/files/mangohud-v0.7.0-meson-fix-imgui-dep.patch
diff --git a/games-util/mangohud/mangohud-0.6.9.1.ebuild b/games-util/mangohud/mangohud-0.7.0.ebuild
index 34baf3dab..8b15d25e4 100644
--- a/games-util/mangohud/mangohud-0.6.9.1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.0.ebuild
@@ -16,19 +16,23 @@ HOMEPAGE="https://github.com/flightlessmango/MangoHud"
 VK_HEADERS_VER="1.2.158"
 VK_HEADERS_MESON_WRAP_VER="2"
 
+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
+"
+
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git"
 else
-	SRC_URI="
+	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"
+	S="${WORKDIR}/MangoHud-${PV}"
 fi
 
 LICENSE="MIT"
@@ -45,7 +49,10 @@ BDEPEND="
 "
 
 python_check_deps() {
-	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
+	python_has_version "dev-python/mako[${PYTHON_USEDEP}]" ||
+	python_has_version "dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]" ||
+	python_has_version "dev-python/matplotlib[qt5,${PYTHON_USEDEP}]" ||
+	python_has_version "dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]"
 }
 
 DEPEND="
@@ -53,6 +60,7 @@ DEPEND="
 	dev-cpp/nlohmann_json
 	dev-libs/spdlog
 	dev-util/glslang
+	media-fonts/lato
 	media-libs/vulkan-loader
 	media-libs/libglvnd
 	x11-libs/libdrm
@@ -63,28 +71,35 @@ DEPEND="
 		xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] )
 	)
 	wayland? ( dev-libs/wayland )
+	|| (
+			 $(python_gen_any_dep '
+					dev-python/matplotlib[gtk3,${PYTHON_USEDEP}]
+					dev-python/matplotlib[qt5,${PYTHON_USEDEP}]
+					dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+				')
+		 )
 "
 
 RDEPEND="${DEPEND}"
 
-[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}"
-
 PATCHES=(
-	"${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch"
+	"${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch"
+	"${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch"
 )
 
 src_unpack() {
+
 	default
-	if [[ $PV != 9999 ]]; then
 
-		[[ -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 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
+	if [[ $PV == 9999 ]]; then
 		git-r3_src_unpack
 	fi
+
+	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
 }
 
 src_prepare() {