games-util/mangohud: sync live ebuild

Signed-off-by: Kostadin Shishmanov <kostadinshishmanov@protonmail.com>

games-util/mangohud/Manifest

@@ -3,5 +3,7 @@ DIST Vulkan-Utility-Libraries-1.4.346.tar.gz 1306759 BLAKE2B 8c4ebf73af3ad871360
 DIST mangohud-0.8.2.tar.gz 14934235 BLAKE2B 2fbf57fb4b68ba808f8b99cbdf0606a618e993695c938a45a8abc04dff29f00823f3a0858850e1f52e14615b7d40775fcf0ae3fcd8b48fe7cf578237caae8930 SHA512 9f5a04a01a0a28569c44b57ea59dc17f98a418afd93680e616d208e33b31bb57d081d479239b172b2ebc83f5872b187726324fe76b504dc43169057943bba637
 DIST mangohud-0.8.3.tar.gz 14947932 BLAKE2B 37b96e8ea4b64c4f295bdd065f63cbe0c02615f551c0561f5be9059246f0639e0acff74a9f826289e609bb63ef41875a707de6ebdb5e7d65ad9a1eafd67640a9 SHA512 90ae828e378d5f901c98a30432aee1187fe2b9defdf5415c920f6f5d572799a0d7f49462457fea01bfb11f0c77a3eb00bbd015bd508cf1e0cbc1f24da4fee1c7
 DIST mangohud-0.8.4.tar.gz 14950040 BLAKE2B 1be7648061833c060228e51616bb67dca5af54aa120d06c68f59fa75b2fa40dccb32ca659bf92b1adf47fa5b6dd410e76722667e843a66050c8fba74be4dabe3 SHA512 c06ac78fceca159cc4a87c17bb7cf762523f384e1c8b1b20ca5d09747c824dadcc2e6231cc41bfd92f50b42cb9b7aa1c2a96bac7a1195e11aacc134f11d0a4a1
+DIST vk-bootstrap-1.4.328.tar.gz 194986 BLAKE2B 151ecc1024814185e105b67e079450ba6c4a58979b9d8dbe2bb49a09450a4caca04a1c9ecbf5eef98b49d6622982aa1d1d579e8fe2d55fe33ac5d24a17dc32f6 SHA512 62ddd5b68835b11279b405052ef2b4d7090a21dbcaf177cc8f99c108c29ca0748f37fcbaee71ad3544038e6d190f3881a8bf8512791146988f067c5f4a5ae26a
+DIST vkroots-5106d8a0df95de66cc58dc1ea37e69c99afc9540.tar.gz 352651 BLAKE2B bc6c7a4f5b4f810c4d87a6cef46e73adb292bc22ae9a40666a6c7c8ab0cbc1973af405b32a5c7a3d38623c92e5d41e8472dabb744fcf31cf29118b9684dcfc32 SHA512 726e65dd0bb322d537e985ba2e504c68ef1b474574f11a5b102edcb8a7b74a6d86dea132c3b11417399a00beff9163e7aad413a389cf6073ec44d5ce6175ffc5
 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

games-util/mangohud/files/mangohud-9999-system-libs.patch

@@ -0,0 +1,186 @@
+diff --git a/meson.build b/meson.build
+index 1146a26..9634dc0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -253,13 +253,14 @@ if get_option('mangoapp')
+   ]
+ endif
+
+-imgui_sp = subproject('imgui', default_options: imgui_options)
+-dearimgui_dep = imgui_sp.get_variable('imgui_dep')
++dearimgui_dep = dependency('imgui', fallback: ['imgui'], required: true, default_options: imgui_options)
+
+-meson.override_dependency('imgui', dearimgui_dep)
+-
+-implot_sp = subproject('implot', default_options: ['default_library=static'])
+-implot_dep = implot_sp.get_variable('implot_dep')
++if is_unixy
++  implot_dep = dependency('implot', fallback: ['implot'], required: true, default_options: ['default_library=static'])
++else
++  implot_dep = null_dep
++  implot_lib = static_library('nulllib', [])
++endif
+
+ spdlog_options = [
+   'default_library=static',
+diff --git a/src/app/main.cpp b/src/app/main.cpp
+index 2235476..0d457c8 100644
+--- a/src/app/main.cpp
++++ b/src/app/main.cpp
+@@ -6,9 +6,9 @@
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+
+-#include "imgui.h"
+-#include "imgui_impl_glfw.h"
+-#include "imgui_impl_opengl3.h"
++#include <imgui/imgui.h>
++#include <imgui/imgui_impl_glfw.h>
++#include <imgui/imgui_impl_opengl3.h>
+ #include <stdio.h>
+ #include <thread>
+ #include <unistd.h>
+diff --git a/src/gl/gl_hud.cpp b/src/gl/gl_hud.cpp
+index 2ef688d..c47cadc 100644
+--- a/src/gl/gl_hud.cpp
++++ b/src/gl/gl_hud.cpp
+@@ -7,7 +7,7 @@
+ #include <memory>
+ #include <unistd.h>
+ #include <spdlog/spdlog.h>
+-#include <imgui.h>
++#include <imgui/imgui.h>
+ #ifdef __linux__
+ #include <implot.h>
+ #endif
+diff --git a/src/gl/gl_renderer.cpp b/src/gl/gl_renderer.cpp
+index 08111f1..69b38a0 100644
+--- a/src/gl/gl_renderer.cpp
++++ b/src/gl/gl_renderer.cpp
+@@ -65,7 +65,7 @@
+ //----------------------------------------
+
+ #include <spdlog/spdlog.h>
+-#include <imgui.h>
++#include <imgui/imgui.h>
+ #include "gl_renderer.h"
+ #include <stdio.h>
+ #include <stdint.h>     // intptr_t
+diff --git a/src/hud_elements.h b/src/hud_elements.h
+index 70deb51..3ccdba8 100644
+--- a/src/hud_elements.h
++++ b/src/hud_elements.h
+@@ -3,7 +3,7 @@
+ #include <string>
+ #include <utility>
+ #include <map>
+-#include <imgui.h>
++#include <imgui/imgui.h>
+ #include "timing.hpp"
+ #include <functional>
+ #include "vulkan/vulkan.h"
+diff --git a/src/imgui_utils.h b/src/imgui_utils.h
+index f2797e4..3923d3a 100644
+--- a/src/imgui_utils.h
++++ b/src/imgui_utils.h
+@@ -1,6 +1,6 @@
+ #pragma once
+
+-#include <imgui.h>
++#include <imgui/imgui.h>
+
+ #ifdef __linux__
+ #include <implot.h>
+diff --git a/src/overlay.h b/src/overlay.h
+index cad97c2..bf9faf6 100644
+--- a/src/overlay.h
++++ b/src/overlay.h
+@@ -6,8 +6,8 @@
+ #include <stdint.h>
+ #include <vector>
+ #include <deque>
+-#include <imgui.h>
+-#include "imgui_internal.h"
++#include <imgui/imgui.h>
++#include <imgui/imgui_internal.h>
+ #include "overlay_params.h"
+ #include "hud_elements.h"
+
+diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp
+index ab7e37d..5e4bf90 100644
+--- a/src/overlay_params.cpp
++++ b/src/overlay_params.cpp
+@@ -10,7 +10,7 @@
+ #include <wordexp.h>
+ #include <unistd.h>
+ #endif
+-#include "imgui.h"
++#include <imgui/imgui.h>
+ #include <iostream>
+ #include <string>
+ #include <sstream>
+diff --git a/src/vulkan.cpp b/src/vulkan.cpp
+index ffadf25..b1e8c23 100644
+--- a/src/vulkan.cpp
++++ b/src/vulkan.cpp
+@@ -37,7 +37,7 @@
+ #include <sstream>
+ #include <inttypes.h>
+ #include <spdlog/spdlog.h>
+-#include <imgui.h>
++#include <imgui/imgui.h>
+
+ #include "mesa/util/macros.h" // defines "restrict" for vk_util.h
+ #include "mesa/util/os_socket.h"
+diff --git a/mangohud-next/render/imgui/egl.h b/mangohud-next/render/imgui/egl.h
+index ff08211..f796470 100644
+--- a/mangohud-next/render/imgui/egl.h
++++ b/mangohud-next/render/imgui/egl.h
+@@ -2,7 +2,7 @@
+ #include <mutex>
+ #include <imgui.h>
+ #include "implot.h"
+-#include <backends/imgui_impl_opengl3.h>
++#include <imgui_impl_opengl3.h>
+
+ #include "imgui_ctx.h"
+ #include "font/font.h"
+diff --git a/mangohud-next/render/imgui/imgui_ctx.cpp b/mangohud-next/render/imgui/imgui_ctx.cpp
+index 5bf29d6..b6688d9 100644
+--- a/mangohud-next/render/imgui/imgui_ctx.cpp
++++ b/mangohud-next/render/imgui/imgui_ctx.cpp
+@@ -1,7 +1,7 @@
+ #include <deque>
+ #include <unistd.h>
+ #include <math.h>
+-#include "backends/imgui_impl_opengl3.h"
++#include "imgui_impl_opengl3.h"
+ #include "imgui_ctx.h"
+ #include "imgui.h"
+ #include "imgui_internal.h"
+diff --git a/mangohud-next/render/imgui/vk.h b/mangohud-next/render/imgui/vk.h
+index 81504b6..127d743 100644
+--- a/mangohud-next/render/imgui/vk.h
++++ b/mangohud-next/render/imgui/vk.h
+@@ -1,7 +1,7 @@
+ #include "imgui.h"
+ #include "implot.h"
+ #include <vulkan/vulkan.h>
+-#include "backends/imgui_impl_vulkan.h"
++#include "imgui_impl_vulkan.h"
+ #include "../vulkan_ctx.h"
+ #include "font/font.h"
+
+diff --git a/mangohud-next/server/metrics/metrics.cpp b/mangohud-next/server/metrics/metrics.cpp
+index 90fd381..1339058 100644
+--- a/mangohud-next/server/metrics/metrics.cpp
++++ b/mangohud-next/server/metrics/metrics.cpp
+@@ -5,7 +5,7 @@
+ #include <cctype>
+ #include <algorithm>
+ #include <sys/stat.h>
+-#include <spdlog/fmt/bundled/format.h>
++#include <fmt/format.h>
+ #include "../common/json.h"
+ #include "../common/table_structs.h"
+ #include "../common/helpers.hpp"

games-util/mangohud/mangohud-9999.ebuild

@@ -10,14 +10,22 @@ inherit flag-o-matic python-single-r1 meson-multilib toolchain-funcs
 DESCRIPTION="Vulkan and OpenGL overlay for monitoring FPS, sensors, system load and more"
 HOMEPAGE="https://github.com/flightlessmango/MangoHud"
 
+# Check subprojects/vk-bootstrap.wrap for this value
+VK_BOOTSTRAP_VER="1.4.328"
 # Check subprojects/vulkan-headers.wrap for this value
 VK_HEADERS_VER="1.4.346"
+# Check subprojects/vkroots.wrap for this value
+VKROOTS_COMMIT="5106d8a0df95de66cc58dc1ea37e69c99afc9540"
 
 SRC_URI="
 	https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VK_HEADERS_VER}.tar.gz
 		-> Vulkan-Headers-${VK_HEADERS_VER}.tar.gz
 	https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/v${VK_HEADERS_VER}.tar.gz
 		-> Vulkan-Utility-Libraries-${VK_HEADERS_VER}.tar.gz
+	https://github.com/charles-lunarg/vk-bootstrap/archive/refs/tags/v${VK_BOOTSTRAP_VER}.tar.gz
+		-> vk-bootstrap-${VK_BOOTSTRAP_VER}.tar.gz
+	https://github.com/misyltoad/vkroots/archive/${VKROOTS_COMMIT}.tar.gz
+		-> vkroots-${VKROOTS_COMMIT}.tar.gz
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -31,7 +39,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+dbus +X xnvctrl wayland mangoapp mangohudctl mangoplot video_cards_nvidia test"
+IUSE="+dbus elogind mangoapp mangohudctl mangoplot next systemd test video_cards_nvidia wayland +X xnvctrl"
 RESTRICT="test" # tests aren't enabled upstream
 
 REQUIRED_USE="
@@ -49,10 +57,19 @@ BDEPEND="
 
 DEPEND="
 	${PYTHON_DEPS}
+	next? (
+		dev-cpp/yaml-cpp:=[${MULTILIB_USEDEP}]
+		=media-libs/imgui-1.91.6*:=[opengl,vulkan,${MULTILIB_USEDEP}]
+		media-libs/mesa[opengl,${MULTILIB_USEDEP}]
+		elogind? ( sys-auth/elogind )
+		systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+	)
 	dev-libs/spdlog:=[${MULTILIB_USEDEP}]
 	dev-libs/libfmt:=[${MULTILIB_USEDEP}]
 	=media-libs/imgui-1.91.6*:=[${MULTILIB_USEDEP}]
 	=media-libs/implot-0.16*:=[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
 	x11-libs/libxkbcommon:=[${MULTILIB_USEDEP}]
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
@@ -60,7 +77,10 @@ DEPEND="
 		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}]
+		dev-libs/wayland-protocols
+	)
 	mangoapp? (
 		=media-libs/imgui-1.91.6*[glfw,opengl]
 		media-libs/glfw[X(+)?,wayland(+)?]
@@ -85,7 +105,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.8.3-system-imgui.patch"
+	"${FILESDIR}/${PN}-9999-system-libs.patch"
 )
 
 src_unpack() {
@@ -95,6 +115,8 @@ src_unpack() {
 		git-r3_src_unpack
 	fi
 
+	unpack vkroots-${VKROOTS_COMMIT}.tar.gz
+	unpack vk-bootstrap-${VK_BOOTSTRAP_VER}.tar.gz
 	unpack Vulkan-Headers-${VK_HEADERS_VER}.tar.gz
 	unpack Vulkan-Utility-Libraries-${VK_HEADERS_VER}.tar.gz
 }
@@ -104,10 +126,15 @@ src_prepare() {
 
 	mv "${WORKDIR}/Vulkan-Headers-${VK_HEADERS_VER}" "${S}/subprojects/" || die
 	mv "${WORKDIR}/Vulkan-Utility-Libraries-${VK_HEADERS_VER}" "${S}/subprojects/" || die
+	mv "${WORKDIR}/vkroots-${VKROOTS_COMMIT}" "${S}/subprojects/vkroots" || die
+	mv "${WORKDIR}/vk-bootstrap-${VK_BOOTSTRAP_VER}" "${S}/subprojects/vk-bootstrap" || die
 
 	pushd subprojects || die
 	mv packagefiles/vulkan-headers/* Vulkan-Headers-${VK_HEADERS_VER} || die
 	mv packagefiles/vulkan-utility-libraries/* Vulkan-Utility-Libraries-${VK_HEADERS_VER} || die
+	mv packagefiles/vkroots/* vkroots || die
+	mv packagefiles/vk-bootstrap/* vk-bootstrap || die
+
 	# save some space when using FEATURES=installsources
 	rm -rf "*.wrap" "{packagefiles/imgui-0.16}" || die
 	popd || die
@@ -130,6 +157,7 @@ multilib_src_configure() {
 		$(meson_feature wayland with_wayland)
 		$(meson_feature dbus with_dbus)
 		$(meson_use mangoapp mangoapp)
+		$(meson_use next with_mangohud_next)
 		$(meson_use mangohudctl mangohudctl)
 		$(meson_feature mangoplot mangoplot)
 		$(meson_feature test tests)

games-util/mangohud/metadata.xml

@@ -23,5 +23,6 @@
 		<flag name="mangoapp">Build and install mangoapp and mangoapp layer</flag>
 		<flag name="mangohudctl">Build and install mangohudctl</flag>
 		<flag name="mangoplot">Install mangoplot python script</flag>
+		<flag name="next">Build and install server/client rewrite</flag>
 	</use>
 </pkgmetadata>