[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 5331bf76cbb8a2fd863da0227f41f800dd4692ee Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Sun Jun 2 22:14:59 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Mon Jun 3 10:41:43 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5331bf76 games-util/mangohud: add 0.7.2 ,drop 0.7.1-r6 * possible to compile with older spdlog but it requires revision bump after spdlog bump, preventing future break Closes: https://bugs.gentoo.org/931794 Signed-off-by: Gonçalo Negrier Duarte gmail.com> games-util/mangohud/Manifest| 2 +- games-util/mangohud/{mangohud-0.7.1-r6.ebuild => mangohud-0.7.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index 500e807d7..bbdc3e84b 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -1,3 +1,3 @@ -DIST mangohud-0.7.1.tar.gz 14901139 BLAKE2B 722b1caa21225a15d175e0f83dbb4b4a6ac2be92443628dcfe82fe4e36773174121f95deaf078fae9ed25ea74242f5f9acd3e2a4e94111b4a32fbc7c9a852705 SHA512 981b20f0ca986a8e0ee5349dc3d9a5580c1e3eb0a40a1a0e81c390f85d25e3f175fdcca75cd2f18bf0af9f49c7d144de6d85406b6a3c96bdf204a7557f530300 +DIST mangohud-0.7.2.tar.gz 14906751 BLAKE2B a88e6497d8a8bcd899fc41d555dec429a69c864a10476c1d549acead58a7fc7c5f5d14d901b75bd2aed1d8c8088a027417a74480b89501d947333d665d0567c0 SHA512 edc3e380f9f58b65ae04c970e84eec9ff3458eafb2d89b2208c0afa6978a745a634aab6b0e025996175981e80c66475ef92ffe326d31a67055895b8fd1213e63 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.1-r6.ebuild b/games-util/mangohud/mangohud-0.7.2.ebuild similarity index 100% rename from games-util/mangohud/mangohud-0.7.1-r6.ebuild rename to games-util/mangohud/mangohud-0.7.2.ebuild
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/, games-util/mangohud/files/
commit: cf19ee3f779d95be2d5f52752905a6a21f901ffa Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Sun Jun 2 22:09:19 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Sun Jun 2 22:11:07 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf19ee3f games-util/mangohud: add 0.7.1-r6, drop 0.7.1-r5 * add missing mangoplot useflag (thanks nillerusr) Closes: https://github.com/gentoo/guru/pull/195 Signed-off-by: Gonçalo Negrier Duarte gmail.com> .../files/mangohud-0.7.1-menson-fix-dep.patch | 116 - .../files/mangohud--menson-fix-dep.patch | 108 --- ...ud-0.7.1-r5.ebuild => mangohud-0.7.1-r6.ebuild} | 12 +-- games-util/mangohud/mangohud-.ebuild | 12 +-- games-util/mangohud/metadata.xml | 1 + 5 files changed, 11 insertions(+), 238 deletions(-) diff --git a/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch b/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch deleted file mode 100644 index df2f7eb81..0 --- a/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch +++ /dev/null @@ -1,116 +0,0 @@ -From c98df705d2a52dcc0322e6ce8626ee1cf8ad87dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= - -Date: Thu, 9 May 2024 21:52:21 +0100 -Subject: [PATCH] meson: verify if system lib are present before fallback to - submodules -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* removed use_system_spdlog feature -* System vulkan-headers cant be use since mangohud don't use latest SDK -* The code is commented out for future use -* This is a backport for mangohud-0.7.1 of: aa7875942f5a0b7fdd187916b898b0b63c9a886c -* (see: https://github.com/flightlessmango/MangoHud/pull/1321) - -Signed-off-by: Gonçalo Negrier Duarte - meson.build | 45 - - meson_options.txt | 1 - - 2 files changed, 24 insertions(+), 22 deletions(-) - -diff --git a/meson.build b/meson.build -index 3bf3918..329ad6f 100644 a/meson.build -+++ b/meson.build -@@ -164,9 +164,16 @@ else - dep_rt = null_dep - endif - --vkh_sp = subproject('vulkan-headers') --vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') --dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') -+# Commented code can be used if mangohud start using latest SDK Vulkan-Headers -+# Allowing user to build mangohud using system Vulkan-Headers -+#if not dependency('VulkanHeaders').found() -+ vkh_sp = subproject('vulkan-headers') -+ vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') -+ dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') -+#else -+# dep_vulkan = dependency('VulkanHeaders', required: true) -+# vk_api_xml = files('/usr/share/vulkan/registry/vk.xml') -+#endif - - vk_enum_to_str = custom_target( - 'vk_enum_to_str', -@@ -212,31 +219,25 @@ if get_option('mangoapp') - ] - endif - --dearimgui_sp = subproject('imgui', default_options: imgui_options) --dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') -+dearimgui_dep = dependency('imgui', fallback: ['imgui', 'dearimgui_dep'], required: true, default_options: imgui_options) - - if is_unixy --implot_sp = subproject('implot', default_options: ['default_library=static']) --implot_dep = implot_sp.get_variable('implot_dep') -+implot_dep = dependency('implot', fallback: ['implot', 'implot_deb'], required: true, default_options: ['default_library=static']) - else - implot_dep = null_dep - implot_lib = static_library('nulllib', []) - endif - --spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) --if not spdlog_dep.found() -- spdlog_sp = subproject('spdlog', default_options: [ --'default_library=static', --'compile_library=true', --'werror=false', --'tests=disabled', --'external_fmt=disabled', --'std_format=disabled' -- ]) -- spdlog_dep = spdlog_sp.get_variable('spdlog_dep') --else -- spdlog_dep = dependency('spdlog', required: true) --endif -+spdlog_options = [ -+ 'default_library=static', -+ 'compile_library=true', -+ 'werror=false', -+ 'tests=disabled', -+ 'external_fmt=disabled', -+ 'std_format=disabled' -+] -+ -+spdlog_dep = dependency('spdlog', fallback: ['spdlog', 'spdlog_dep'], required: true, default_options: spdlog_options) - - if ['windows', 'mingw'].contains(host_machine.system()) - minhook_sp = subproject('minhook') -@@ -275,6 +276,7 @@ if get_option('tests').enabled() - dependencies: [ - cmocka_dep, - spdlog_dep, -+ implot_dep, - dearimgui_dep - ], - include_directories: inc_common) -@@ -287,3 +289,4 @@ endif - if get_option('mangoplot').enabled() - subdir('bin') - endif -+ -diff --git a/meson_options.txt b/meson_options.txt -index c82ae15..2984dfe 100644 a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,4 @@ - option('glibcxx_asserts', type : 'boolean', value : false) --optio
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 0d344d4a959a979d2a1f65a42b2a57e7ab6cbb5e Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 23 09:36:23 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 23 09:36:23 2024 + 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 gmail.com> .../mangohud/{mangohud-0.7.1-r4.ebuild => mangohud-0.7.1-r5.ebuild} | 1 + games-util/mangohud/mangohud-.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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 230bd3250..c3fcffcd4 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: dcc6d6ec84e4ec42e9fb246df89e1e80d3411f88 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Sat May 11 07:43:17 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Sat May 11 07:45:50 2024 + 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 gmail.com> games-util/mangohud/mangohud-0.7.1-r4.ebuild | 1 + games-util/mangohud/mangohud-.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-.ebuild b/games-util/mangohud/mangohud-.ebuild index f8da5a4478..230bd32509 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 8c24881021c85917a60afd852f19fad72d940128 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Fri May 10 13:53:14 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Fri May 10 14:00:47 2024 + 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 gmail.com> .../mangohud/{mangohud-0.7.1-r3.ebuild => mangohud-0.7.1-r4.ebuild} | 4 ++-- games-util/mangohud/mangohud-.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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 76827f04c2..f8da5a4478 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 6530a2af26b37a35588a41e643035045d35b0901 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 9 23:53:15 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 9 23:53:15 2024 + 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 gmail.com> games-util/mangohud/mangohud-0.7.1-r3.ebuild | 1 + games-util/mangohud/mangohud-.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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 143418dc36..76827f04c2 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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 '
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/, games-util/mangohud/files/
commit: e9a378e04e7098e104d84a13015b4277d0c1dfc6 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 9 22:46:27 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 9 23:41:58 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9a378e0 games-util/mangohud: add mangoapp and mangohudctl * enable test Signed-off-by: Gonçalo Negrier Duarte gmail.com> .../mangohud/files/mangohud-0.7.1-menson-fix-dep.patch | 2 +- .../mangohud/files/mangohud--menson-fix-dep.patch | 2 +- .../{mangohud-0.7.1-r2.ebuild => mangohud-0.7.1-r3.ebuild} | 14 -- games-util/mangohud/mangohud-.ebuild | 14 -- games-util/mangohud/metadata.xml | 3 +++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch b/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch index e06411f0ed..df2f7eb815 100644 --- a/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch +++ b/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch @@ -34,7 +34,7 @@ index 3bf3918..329ad6f 100644 +# Commented code can be used if mangohud start using latest SDK Vulkan-Headers +# Allowing user to build mangohud using system Vulkan-Headers +#if not dependency('VulkanHeaders').found() -+ vk_sp = subproject('VulkanHeaders') ++ vkh_sp = subproject('vulkan-headers') + vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') + dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') +#else diff --git a/games-util/mangohud/files/mangohud--menson-fix-dep.patch b/games-util/mangohud/files/mangohud--menson-fix-dep.patch index 4cf18e1394..549aecfc13 100644 --- a/games-util/mangohud/files/mangohud--menson-fix-dep.patch +++ b/games-util/mangohud/files/mangohud--menson-fix-dep.patch @@ -32,7 +32,7 @@ index 86b5411568..00555c7f97 100644 +# Commented code can be used if mangohud start using latest SDK Vulkan-Headers +# Allowing user to build mangohud using system Vulkan-Headers +#if not dependency('VulkanHeaders').found() -+ vk_sp = subproject('VulkanHeaders') ++ vkh_sp = subproject('vulkan-headers') + vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') + dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') +#else diff --git a/games-util/mangohud/mangohud-0.7.1-r2.ebuild b/games-util/mangohud/mangohud-0.7.1-r3.ebuild similarity index 87% rename from games-util/mangohud/mangohud-0.7.1-r2.ebuild rename to games-util/mangohud/mangohud-0.7.1-r3.ebuild index 171ea194b7..143418dc36 100644 --- a/games-util/mangohud/mangohud-0.7.1-r2.ebuild +++ b/games-util/mangohud/mangohud-0.7.1-r3.ebuild @@ -37,7 +37,8 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu" +IUSE="+dbus debug +X xnvctrl wayland mangoapp mangohudctl video_cards_nvidia video_cards_amdgpu test" +RESTRICT="!test? ( test )" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -48,6 +49,7 @@ REQUIRED_USE=" BDEPEND=" app-arch/unzip >=dev-util/vulkan-headers-1.2.158 + test? ( dev-util/cmocka ) $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]') " @@ -68,6 +70,10 @@ RDEPEND=" xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) ) wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + mangoapp? ( + >=media-libs/imgui-1.81[glfw] + media-libs/glew + ) $(python_gen_cond_dep ' || ( dev-python/matplotlib[gtk3,${PYTHON_USEDEP}] @@ -103,7 +109,8 @@ src_prepare() { find . -type f -exec sed -i 's|"imgui.h"||g' {} \; || die find . -type f -exec sed -i 's|||g' {} \; || die find . -type f -exec sed -i 's|"imgui_internal.h"||g' {} \; || die - + find . -type f -exec sed -i 's|"imgui_impl_glfw.h"||g' {} \; || die + find . -type f -exec sed -i 's|"imgui_impl_opengl3.h"||g' {} \; || die } multilib_src_configure() { @@ -115,6 +122,9 @@ multilib_src_configure() { $(meson_feature X with_x11) $(meson_feature wayland with_wayland) $(meson_feature dbus with_dbus) + $(meson_use mangoapp mangoapp) + $(meson_use mangoapp mangoapp_layer) + $(meson_use mangohudctl mangohudctl) ) meson_src_configure } diff --git a/games-util/mangohud/mangohud-.ebuild b/games-util/mangohud/mangohud-.ebuild index 171ea194b7..143418dc36 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.ebuild @@ -37,7 +37,8 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu" +IUSE="+dbus debug +X xnvctrl wayland mangoapp mangohudctl video_cards_nvidia video_cards_amdgpu test" +RESTRICT="!test? ( test )" REQUIRED_USE=" ${PYTHON_REQUIRED
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: 70a8f8072f026673bd167c992a1eba8d4b760fe9 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 9 22:35:32 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 9 22:36:30 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=70a8f807 games-util/mangohud: improve meson lib detection patch * see this: https://github.com/flightlessmango/MangoHud/pull/1321 Signed-off-by: Gonçalo Negrier Duarte gmail.com> .../files/mangohud-0.7.1-menson-fix-dep.patch | 116 + .../files/mangohud--menson-fix-dep.patch | 108 +++ .../files/mangohud-v0.7.1-menson-fix-dep.patch | 19 ...ud-0.7.1-r1.ebuild => mangohud-0.7.1-r2.ebuild} | 3 +- games-util/mangohud/mangohud-.ebuild | 3 +- 5 files changed, 226 insertions(+), 23 deletions(-) diff --git a/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch b/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch new file mode 100644 index 00..e06411f0ed --- /dev/null +++ b/games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch @@ -0,0 +1,116 @@ +From c98df705d2a52dcc0322e6ce8626ee1cf8ad87dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= + +Date: Thu, 9 May 2024 21:52:21 +0100 +Subject: [PATCH] meson: verify if system lib are present before fallback to + submodules +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* removed use_system_spdlog feature +* System vulkan-headers cant be use since mangohud don't use latest SDK +* The code is commented out for future use +* This is a backport for mangohud-0.7.1 of: aa7875942f5a0b7fdd187916b898b0b63c9a886c +* (see: https://github.com/flightlessmango/MangoHud/pull/1321) + +Signed-off-by: Gonçalo Negrier Duarte +--- + meson.build | 45 - + meson_options.txt | 1 - + 2 files changed, 24 insertions(+), 22 deletions(-) + +diff --git a/meson.build b/meson.build +index 3bf3918..329ad6f 100644 +--- a/meson.build b/meson.build +@@ -164,9 +164,16 @@ else + dep_rt = null_dep + endif + +-vkh_sp = subproject('vulkan-headers') +-vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') +-dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') ++# Commented code can be used if mangohud start using latest SDK Vulkan-Headers ++# Allowing user to build mangohud using system Vulkan-Headers ++#if not dependency('VulkanHeaders').found() ++ vk_sp = subproject('VulkanHeaders') ++ vk_api_xml = vkh_sp.get_variable('vulkan_api_xml') ++ dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep') ++#else ++# dep_vulkan = dependency('VulkanHeaders', required: true) ++# vk_api_xml = files('/usr/share/vulkan/registry/vk.xml') ++#endif + + vk_enum_to_str = custom_target( + 'vk_enum_to_str', +@@ -212,31 +219,25 @@ if get_option('mangoapp') + ] + endif + +-dearimgui_sp = subproject('imgui', default_options: imgui_options) +-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') ++dearimgui_dep = dependency('imgui', fallback: ['imgui', 'dearimgui_dep'], required: true, default_options: imgui_options) + + if is_unixy +-implot_sp = subproject('implot', default_options: ['default_library=static']) +-implot_dep = implot_sp.get_variable('implot_dep') ++implot_dep = dependency('implot', fallback: ['implot', 'implot_deb'], required: true, default_options: ['default_library=static']) + else + implot_dep = null_dep + implot_lib = static_library('nulllib', []) + endif + +-spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) +-if not spdlog_dep.found() +- spdlog_sp = subproject('spdlog', default_options: [ +-'default_library=static', +-'compile_library=true', +-'werror=false', +-'tests=disabled', +-'external_fmt=disabled', +-'std_format=disabled' +- ]) +- spdlog_dep = spdlog_sp.get_variable('spdlog_dep') +-else +- spdlog_dep = dependency('spdlog', required: true) +-endif ++spdlog_options = [ ++ 'default_library=static', ++ 'compile_library=true', ++ 'werror=false', ++ 'tests=disabled', ++ 'external_fmt=disabled', ++ 'std_format=disabled' ++] ++ ++spdlog_dep = dependency('spdlog', fallback: ['spdlog', 'spdlog_dep'], required: true, default_options: spdlog_options) + + if ['windows', 'mingw'].contains(host_machine.system()) + minhook_sp = subproject('minhook') +@@ -275,6 +276,7 @@ if get_option('tests').enabled() + dependencies: [ + cmocka_dep, + spdlog_dep, ++ implot_dep, + dearimgui_dep + ], + include_directories: inc_common) +@@ -287,3 +289,4 @@ endif + if get_option('mangoplot').enabled() + subdir('bin') + endif ++ +diff --git a/meson_options.txt b/meson_options.txt +index c82ae15..2984dfe 100644 +--- a/meson_options.txt b/meson_options.txt +@@ -1,5 +1,4 @@ + option('glibcxx_asserts', type : 'boolean', value : false) +-option('use_system_spdlog', type :
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: 6a66116471864352775493f1432b0bcac7828151 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 9 14:57:41 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 9 15:57:39 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a661164 games-util/mangohud: use spdlog, imgui and implot system packages * refactor the ebuild to use system dependecies instead of submodules * TODO: apply the same change to Vulkan-Headers * TODO: add the new submodules (including tests) * TODO: make a meson patch that can be upstream (optional) Signed-off-by: Gonçalo Negrier Duarte gmail.com> games-util/mangohud/Manifest | 4 --- .../files/implot-v0.16-fix-imgui-dep.patch | 16 --- .../files/mangohud-v0.7.1-menson-fix-dep.patch | 19 + .../mangohud-v0.7.1-meson-fix-imgui-dep.patch | 14 - ...gohud-0.7.1.ebuild => mangohud-0.7.1-r1.ebuild} | 33 -- games-util/mangohud/mangohud-.ebuild | 33 -- 6 files changed, 29 insertions(+), 90 deletions(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index f52b926d20..500e807d71 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -1,7 +1,3 @@ -DIST implot-0.16-1-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7 -DIST implot-0.16.tar.gz 137983 BLAKE2B aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7 SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa991ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 DIST mangohud-0.7.1.tar.gz 14901139 BLAKE2B 722b1caa21225a15d175e0f83dbb4b4a6ac2be92443628dcfe82fe4e36773174121f95deaf078fae9ed25ea74242f5f9acd3e2a4e94111b4a32fbc7c9a852705 SHA512 981b20f0ca986a8e0ee5349dc3d9a5580c1e3eb0a40a1a0e81c390f85d25e3f175fdcca75cd2f18bf0af9f49c7d144de6d85406b6a3c96bdf204a7557f530300 -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 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/implot-v0.16-fix-imgui-dep.patch b/games-util/mangohud/files/implot-v0.16-fix-imgui-dep.patch deleted file mode 100644 index 68f5768760..00 --- a/games-util/mangohud/files/implot-v0.16-fix-imgui-dep.patch +++ /dev/null @@ -1,16 +0,0 @@ -# We provide media-libs/imgui in guru - -diff --git a/meson.build b/meson.build.new -index b628fe0..16b11de 100644 a/meson.build -+++ b/meson.build -@@ -5,8 +5,7 @@ project( - version : '0.16', - ) - --imgui_sp = subproject('imgui') --imgui_dep = imgui_sp.get_variable('imgui_dep') -+imgui_dep = dependency('imgui') - - implot_inc = include_directories('.') - implot_src = files( diff --git a/games-util/mangohud/files/mangohud-v0.7.1-menson-fix-dep.patch b/games-util/mangohud/files/mangohud-v0.7.1-menson-fix-dep.patch new file mode 100644 index 00..c85efd7bc1 --- /dev/null +++ b/games-util/mangohud/files/mangohud-v0.7.1-menson-fix-dep.patch @@ -0,0 +1,19 @@ +diff --git a/meson.build b/meson.build +index daf063d..a0c0633 100644 +--- a/meson.build b/meson.build +@@ -214,12 +214,10 @@ if get_option('mangoapp') + ] + endif + +-dearimgui_sp = subproject('imgui', default_options: imgui_options) +-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') ++dearimgui_dep = dependency('imgui') + + if is_unixy +-implot_sp = subproject('implot', default_options: ['default_library=static']) +-implot_dep = implot_sp.get_variable('implot_dep') ++implot_dep =
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 9f65899b898177e37cc52b615801ea33aa0f9256 Author: Julien Roy jroy ca> AuthorDate: Sat Apr 13 16:17:27 2024 + Commit: Julien Roy jroy ca> CommitDate: Sat Apr 13 17:09:15 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f65899b games-util/mangohud: fix pkgcheck nit picks Signed-off-by: Julien Roy jroy.ca> games-util/mangohud/mangohud-0.7.1.ebuild | 5 +++-- games-util/mangohud/mangohud-.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"||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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 56583d7753..f96a5d8ce4 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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"||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 @@ gonegrier.dua...@gmail.com Gonçalo Negrier Duarte - + flightlessmango/MangoHud https://github.com/flightlessmango/MangoHud/issues
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: aecae388f667c82eebac21fe1cdcf39d6df93147 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sat Apr 13 15:53:07 2024 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Sat Apr 13 15:53:31 2024 + 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 zegrapher.com> games-util/mangohud/mangohud-0.7.1.ebuild | 18 -- games-util/mangohud/mangohud-.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} == ]]; 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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 5260457e43..56583d7753 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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} == ]]; then @@ -101,11 +107,11 @@ src_unpack() { # fix build error b
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/, games-util/mangohud/files/
commit: 55e51f5ec40d8e0822c108ec8475fb791936fd7f Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu Feb 22 13:38:25 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu Feb 22 14:12:12 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=55e51f5e games-util/mangohud: drop 0.7.0-r1, add 0.7.1 * thanks for thomasg to provided a updated ebuild Closes: https://bugs.gentoo.org/925203 Signed-off-by: Gonçalo Negrier Duarte gmail.com> games-util/mangohud/Manifest | 6 ++--- ...h => mangohud-v0.7.1-meson-fix-imgui-dep.patch} | 0 ...gohud-0.7.0-r1.ebuild => mangohud-0.7.1.ebuild} | 14 ++-- games-util/mangohud/mangohud-.ebuild | 26 +- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index ad59a61752..f52b926d20 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -1,9 +1,7 @@ -DIST implot-0.16-1-meson-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7 +DIST implot-0.16-1-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7 DIST implot-0.16.tar.gz 137983 BLAKE2B aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7 SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa991ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 -DIST mangohud-0.7.0.tar.gz 14892372 BLAKE2B 436a7834743aac3f95d55031194fddd79861061010cf5eb25e81cf5eceacf4015b607a191931a85715ca0d58c8e314841d536ce83e7767a39869ab789d376c7a SHA512 1ed43c2ba8a97c8934895450bf1ce152970031e5a5654db91df02d7b44f5eeacb32167f219735d2f0fb3c8ba24fc4386a8af4da99a3cd736af0b0d50ef2fedd7 +DIST mangohud-0.7.1.tar.gz 14901139 BLAKE2B 722b1caa21225a15d175e0f83dbb4b4a6ac2be92443628dcfe82fe4e36773174121f95deaf078fae9ed25ea74242f5f9acd3e2a4e94111b4a32fbc7c9a852705 SHA512 981b20f0ca986a8e0ee5349dc3d9a5580c1e3eb0a40a1a0e81c390f85d25e3f175fdcca75cd2f18bf0af9f49c7d144de6d85406b6a3c96bdf204a7557f530300 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 DIST vulkan-headers-1.2.158.tar.gz 831647 BLAKE2B 792d7e895e27c4a8fbc93fc4d9c9e696d2ceb946e745709c050c0693b77afbeb6411a4267fc59508ddeb58167d469349fedc1c5d4b4a7415b590c97248b244bc SHA512 f7aa9222f9deb1316d22deacc2c6cd85c409f0f2b2d37ecd55e0fc8466d381bbe3bed287881b993a01c5f33736e1607014f820980b7a54a3721fab6980960c91 diff --git a/games-util/mangohud/files/mangohud-v0.7.0-meson-fix-imgui-dep.patch b/games-util/mangohud/files/mangohud-v0.7.1-meson-fix-imgui-dep.patch similarity index 100% rename from games-util/mangohud/files/mangohud-v0.7.0-meson-fix-imgui-dep.patch rename to games-util/mangohud/files/mangohud-v0.7.1-meson-fix-imgui-dep.patch diff --git a/games-util/mangohud/mangohud-0.7.0-r1.ebuild b/games-util/mangohud/mangohud-0.7.1.ebuild similarity index 86% rename from games-util/mangohud/mangohud-0.7.0-r1.ebuild rename to games-u
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: d15c17df7c33ab59541e80cf9dcfaf01b4a4ac36 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Wed Feb 7 18:04:23 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Wed Feb 7 18:04:23 2024 + 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 gmail.com> games-util/mangohud/mangohud-0.7.0-r1.ebuild | 2 +- games-util/mangohud/mangohud-.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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 8bfb3ae515..a4b465dfec 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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}]
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 71547053737487b311e5d89204217fecc0827b88 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Wed Feb 7 17:58:42 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Wed Feb 7 17:59:36 2024 + 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 gmail.com> games-util/mangohud/mangohud-0.7.0-r1.ebuild | 21 ++--- games-util/mangohud/mangohud-.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"||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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 31854ad3e4..8bfb3ae515 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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"||g' {} \; || die } -src_configure() { +multilib_src_configure() { # disable system spdlog in favor of the submodule version local emesonargs=( -Dappend_libdir_mangohud=false
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 8d4c451d2aa0b9df348d983bf5028b0bc199e38f Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Wed Feb 7 01:41:44 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Wed Feb 7 01:43:54 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8d4c451d games-util/mangohud: propragate spdlog fix to * improve comments for spdlog fix * add myself as proxy mantainer Signed-off-by: Gonçalo Negrier Duarte gmail.com> games-util/mangohud/Manifest | 2 ++ games-util/mangohud/mangohud-0.7.0-r1.ebuild | 4 +++- games-util/mangohud/mangohud-.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 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa991ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 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-.ebuild b/games-util/mangohud/mangohud-.ebuild index 3fba65ec23..31854ad3e4 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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="
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 007ed1306557352091482b32f406f06cf96e0bbf Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Tue Feb 6 20:56:08 2024 + Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Tue Feb 6 20:59:33 2024 + 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 need to drop Signed-off-by: Gonçalo Negrier Duarte 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 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa991ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 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} == ]]; 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 +
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: ab7568044fe114f18bd3e7a824916da9bedda044 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Nov 27 22:11:59 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Mon Nov 27 22:13:09 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ab756804 games-util/mangohud: replace patches with sed calls less maintenance like this. Signed-off-by: Adel KARA SLIMANE zegrapher.com> .../files/implot-v0.16-imgui-include-fix.patch | 45 -- .../files/mangohud-v0.7.0-imgui-include-fix.patch | 13 --- games-util/mangohud/mangohud-0.7.0.ebuild | 7 ++-- games-util/mangohud/mangohud-.ebuild | 8 ++-- 4 files changed, 8 insertions(+), 65 deletions(-) diff --git a/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch b/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch deleted file mode 100644 index 7da397ce44..00 --- a/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/.github/example_implot.cpp b/.github/example_implot.cpp -index 9339bab..13bcf8c 100644 a/.github/example_implot.cpp -+++ b/.github/example_implot.cpp -@@ -1,12 +1,12 @@ - // Sample app built with Dear ImGui and ImPlot - // This app uses implot and imgui, but does not output to any backend! It only serves as a proof that an app can be built, linked, and run. - --#include "imgui.h" -+#include "imgui/imgui.h" - #include "implot.h" - #include "stdio.h" - - int main(int, char**) --{ -+{ - printf("sample_implot: start\n"); - - IMGUI_CHECKVERSION(); -diff --git a/implot.h b/implot.h -index 36c0d40..5dabc9d 100644 a/implot.h -+++ b/implot.h -@@ -45,7 +45,7 @@ - // [SECTION] Obsolete API - - #pragma once --#include "imgui.h" -+#include "imgui/imgui.h" - - //- - // [SECTION] Macros and Defines -diff --git a/implot_internal.h b/implot_internal.h -index fb01204..4e58767 100644 a/implot_internal.h -+++ b/implot_internal.h -@@ -32,7 +32,7 @@ - #pragma once - - #include --#include "imgui_internal.h" -+#include "imgui/imgui_internal.h" - - #ifndef IMPLOT_VERSION - #error Must include implot.h before implot_internal.h 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 deleted file mode 100644 index 1d5d32e2f1..00 --- a/games-util/mangohud/files/mangohud-v0.7.0-imgui-include-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - #include - #include --#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/mangohud-0.7.0.ebuild b/games-util/mangohud/mangohud-0.7.0.ebuild index f257c749b7..4735f458e9 100644 --- a/games-util/mangohud/mangohud-0.7.0.ebuild +++ b/games-util/mangohud/mangohud-0.7.0.ebuild @@ -78,7 +78,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch" - "${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch" ) src_unpack() { @@ -99,8 +98,10 @@ src_unpack() { src_prepare() { default # replace all occurences of "#include " to "#include " - find . -type f -exec sed -i 's/#include /#include /g' {} \; - find . -type f -exec sed -i 's/#include "imgui.h"/#include /g' {} \; + find . -type f -exec sed -i 's|||g' {} \; || die + find . -type f -exec sed -i 's|"imgui.h"||g' {} \; || die + find . -type f -exec sed -i 's|||g' {} \; || die + find . -type f -exec sed -i 's|"imgui_internal.h"||g' {} \; || die } src_configure() { diff --git a/games-util/mangohud/mangohud-.ebuild b/games-util/mangohud/mangohud-.ebuild index d68169da01..3fba65ec23 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.ebuild @@ -85,7 +85,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch" - "${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch" ) src_unpack() { @@ -108,14 +107,15 @@ src_unpack() { cd "${S}/subprojects/implot-${IMPLOT_VER}" || die eapply "${FILESDIR}/implot-v0.16-fix-imgui-dep.patch" - eapply "${FILESDIR}/implot-v0.16-imgui-include-fix.patch" } src_prepare() { default # replace all occurences of "#include " to "#include " - find . -type f -exec sed -i 's/#include /#include /g' {} \; - find . -type f -exec sed -i 's/#include "imgui.h"/#include /g' {} \; + find . -type f -exec sed -i 's|||g' {} \; || die + find . -type f -exec sed -i 's|"imgui.h"||g' {} \; || die + find . -type f -exec sed -i 's|||g' {} \; || die + fin
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 190c795ad50da68978ea7b621926213196b2cf11 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Nov 27 22:04:04 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Mon Nov 27 22:13:08 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=190c795a games-util/mangohud: fix python eclass use Signed-off-by: Adel KARA SLIMANE zegrapher.com> games-util/mangohud/mangohud-0.7.0.ebuild | 34 +-- games-util/mangohud/mangohud-.ebuild | 34 +-- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/games-util/mangohud/mangohud-0.7.0.ebuild b/games-util/mangohud/mangohud-0.7.0.ebuild index 8b15d25e4d..f257c749b7 100644 --- a/games-util/mangohud/mangohud-0.7.0.ebuild +++ b/games-util/mangohud/mangohud-0.7.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit python-any-r1 meson +inherit python-single-r1 meson MY_PV=$(ver_cut 1-3) [[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" @@ -40,22 +40,18 @@ SLOT="0" IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} || ( X wayland ) - xnvctrl? ( video_cards_nvidia )" + xnvctrl? ( video_cards_nvidia ) +" BDEPEND=" app-arch/unzip - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]') " -python_check_deps() { - 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=" +RDEPEND=" + ${PYTHON_DEPS} ~media-libs/imgui-1.81[opengl,vulkan] dev-cpp/nlohmann_json dev-libs/spdlog @@ -71,17 +67,15 @@ 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}] - ') -) + $(python_gen_cond_dep ' + || ( + dev-python/matplotlib[gtk3,${PYTHON_USEDEP}] + dev-python/matplotlib[qt5,${PYTHON_USEDEP}] + dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}] + ) + ') " -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}/mangohud-v0.7.0-meson-fix-imgui-dep.patch" "${FILESDIR}/mangohud-v0.7.0-imgui-include-fix.patch" diff --git a/games-util/mangohud/mangohud-.ebuild b/games-util/mangohud/mangohud-.ebuild index 7632ae6556..d68169da01 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit python-any-r1 meson +inherit python-single-r1 meson MY_PV=$(ver_cut 1-3) [[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" @@ -47,22 +47,18 @@ SLOT="0" IUSE="+dbus debug +X xnvctrl wayland video_cards_nvidia video_cards_amdgpu" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} || ( X wayland ) - xnvctrl? ( video_cards_nvidia )" + xnvctrl? ( video_cards_nvidia ) +" BDEPEND=" app-arch/unzip - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]') " -python_check_deps() { - 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=" +RDEPEND=" + ${PYTHON_DEPS} ~media-libs/imgui-1.81[opengl,vulkan] dev-cpp/nlohmann_json dev-libs/spdlog @@ -78,17 +74,15 @@ 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}] - ') -) + $(python_gen_cond_dep ' + || ( + dev-python/matplotlib[gtk3,${PYTHON_USEDEP}] + dev-python/matplotlib[qt5,${PYTHON_USEDEP}] +
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: 26e006d1e03f7670231d0a83cf8b69fda9af5d44 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Nov 27 19:22:51 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Mon Nov 27 19:25:53 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=26e006d1 games-util/mangohud: add Signed-off-by: Adel KARA SLIMANE zegrapher.com> games-util/mangohud/Manifest | 2 + .../files/implot-v0.16-fix-imgui-dep.patch | 16 +++ .../files/implot-v0.16-imgui-include-fix.patch | 45 +++ games-util/mangohud/mangohud-.ebuild | 150 + 4 files changed, 213 insertions(+) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index cc06a9c609..d9d337f7d4 100644 --- a/games-util/mangohud/Manifest +++ b/games-util/mangohud/Manifest @@ -1,3 +1,5 @@ +DIST implot-0.16-1-meson-wrap.zip 1226 BLAKE2B 4725661fe2c7f7f05e1702c3a871f9feb9fdefdc2a840cdf8a3d56e7e180e950533f830192f9ad19cba97e8094ab53cf73adda2ed6712a83384d4160f6c06b18 SHA512 6e54beebef8ac4ec0b3e85d30d7570c9a987d69c03b6a564bc67d105d19d2cec45cb3ab8921ebcbda51e7139d93c3c6dae359fa30b3fcce748cdec8953aabbf7 +DIST implot-0.16.tar.gz 137983 BLAKE2B aca328e2fe6049b72601f25a409f313e99971f606e68ca780a1594f8ca42b1606831090add8039fefd013cfb6c057900f0add347d1b80c466a05bd18e455b8d7 SHA512 117cb08122d900e7db857897bfec4c9ac3300a1d429c8f0303415bc693840baa991ca3f13853d8efd3a6ebf538b7114401d4fbfe0d067256e58cbdbd4919 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/implot-v0.16-fix-imgui-dep.patch b/games-util/mangohud/files/implot-v0.16-fix-imgui-dep.patch new file mode 100644 index 00..68f5768760 --- /dev/null +++ b/games-util/mangohud/files/implot-v0.16-fix-imgui-dep.patch @@ -0,0 +1,16 @@ +# We provide media-libs/imgui in guru + +diff --git a/meson.build b/meson.build.new +index b628fe0..16b11de 100644 +--- a/meson.build b/meson.build +@@ -5,8 +5,7 @@ project( + version : '0.16', + ) + +-imgui_sp = subproject('imgui') +-imgui_dep = imgui_sp.get_variable('imgui_dep') ++imgui_dep = dependency('imgui') + + implot_inc = include_directories('.') + implot_src = files( diff --git a/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch b/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch new file mode 100644 index 00..7da397ce44 --- /dev/null +++ b/games-util/mangohud/files/implot-v0.16-imgui-include-fix.patch @@ -0,0 +1,45 @@ +diff --git a/.github/example_implot.cpp b/.github/example_implot.cpp +index 9339bab..13bcf8c 100644 +--- a/.github/example_implot.cpp b/.github/example_implot.cpp +@@ -1,12 +1,12 @@ + // Sample app built with Dear ImGui and ImPlot + // This app uses implot and imgui, but does not output to any backend! It only serves as a proof that an app can be built, linked, and run. + +-#include "imgui.h" ++#include "imgui/imgui.h" + #include "implot.h" + #include "stdio.h" + + int main(int, char**) +-{ ++{ + printf("sample_implot: start\n"); + + IMGUI_CHECKVERSION(); +diff --git a/implot.h b/implot.h +index 36c0d40..5dabc9d 100644 +--- a/implot.h b/implot.h +@@ -45,7 +45,7 @@ + // [SECTION] Obsolete API + + #pragma once +-#include "imgui.h" ++#include "imgui/imgui.h" + + //- + // [SECTION] Macros and Defines +diff --git a/implot_internal.h b/implot_internal.h +index fb01204..4e58767 100644 +--- a/implot_internal.h b/implot_internal.h +@@ -32,7 +32,7 @@ + #pragma once + + #include +-#include "imgui_internal.h" ++#include "imgui/imgui_internal.h" + + #ifndef IMPLOT_VERSION + #error Must include implot.h before implot_internal.h diff --git a/games-util/mangohud/mangohud-.ebuild b/games-util/mangohud/mangohud-.ebuild new file mode 100644 index 00..7632ae6556 --- /dev/null +++ b/games-util/mangohud/mangohud-.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU Genera
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/, games-util/mangohud/files/
commit: 4131f201451831552549c16225d9709b8006acb3 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Nov 27 17:52:38 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Mon Nov 27 19:25:53 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4131f201 games-util/mangohud: add 0.7.0, drop 0.6.9.1 Signed-off-by: Adel KARA SLIMANE zegrapher.com> games-util/mangohud/Manifest | 2 +- .../files/mangohud-v0.7.0-imgui-include-fix.patch | 13 +++ ...h => mangohud-v0.7.0-meson-fix-imgui-dep.patch} | 0 ...ngohud-0.6.9.1.ebuild => mangohud-0.7.0.ebuild} | 45 ++ 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest index b02ce6d837..cc06a9c609 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 00..1d5d32e2f1 --- /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 + #include + #include +-#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 similarity index 100% rename from games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch rename to 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 similarity index 63% rename from games-util/mangohud/mangohud-0.6.9.1.ebuild rename to games-util/mangohud/mangohud-0.7.0.ebuild index 34baf3dabe..8b15d25e4d 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} == ]]; 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}]
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: b783b445cc48a09958b0f734865cfe7c27209603 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Tue Aug 22 18:15:30 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Tue Aug 22 18:15:50 2023 + 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 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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 1d43421aeb6380583dbe599cecf80afdf2e3dc77 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sun Aug 20 00:38:29 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Sun Aug 20 00:42:44 2023 + 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, 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 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-.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..00 --- 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_n
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: d54b8300d11abba6dfecb37f0270680cf28e51b4 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sun Aug 20 00:36:07 2023 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Sun Aug 20 00:42:44 2023 + 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 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 00..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} == ]]; 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 ) +" + +RDEP
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: e710bbacb4ba08fd4ff7c417696d2014d2d568af Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Sep 26 10:00:28 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Sep 26 10:05:39 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e710bbac games-util/mangohud: shorten description Signed-off-by: Andrew Ammerlaan 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-.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} == ]]; then diff --git a/games-util/mangohud/mangohud-.ebuild b/games-util/mangohud/mangohud-.ebuild index 0325714a5..f16c7e660 100644 --- a/games-util/mangohud/mangohud-.ebuild +++ b/games-util/mangohud/mangohud-.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} == ]]; then
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 40533cc0b25627c2d4e2f90143fa6f9f4e6c1e43 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Wed Sep 7 20:54:32 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Wed Sep 7 20:55:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=40533cc0 games-util/mangohud: improve ebuilds + add 0.6.8 and Fixed pkgcheck warnings Signed-off-by: Adel KARA SLIMANE 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-.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 ov
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 56a16cb2b9804e88b146e69c6c96cb9437c9bf44 Author: Jay Faulkner jvf cc> AuthorDate: Fri Sep 2 02:09:39 2022 + Commit: Jay Faulkner jvf cc> CommitDate: Fri Sep 2 02:10:29 2022 + 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 : nonsolvable depset(depend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] NonsolvableDepsInStable: version : nonsolvable depset(rdepend) keyword(~x86) stable profile (default/linux/x86/17.0) (20 total): solutions: [ ~media-libs/imgui-1.81 ] VisibleVcsPkg: version : 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 jvf.cc> games-util/mangohud/Manifest | 1 - games-util/mangohud/mangohud-0.6.8.ebuild | 100 -- games-util/mangohud/mangohud-.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..0 --- 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-
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 4636e479e98f107273cecb1565c4198a149d3284 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sat Aug 27 19:22:23 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Sat Aug 27 19:22:48 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4636e479 games-util/mangohud: version bump to 0.6.8 use imgui-1.81 ebuild instead of bundling it Signed-off-by: Adel KARA SLIMANE zegrapher.com> games-util/mangohud/Manifest | 1 + games-util/mangohud/mangohud-0.6.8.ebuild | 100 ++ games-util/mangohud/mangohud-.ebuild | 92 +++ 3 files changed, 193 insertions(+) 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.8.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild new file mode 100644 index 0..e77071978 --- /dev/null +++ b/games-util/mangohud/mangohud-0.6.8.ebuild @@ -0,0 +1,100 @@ +# 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 " to "#include " + find . -type f -exec sed -i 's/#include /#include /g' {} \; + find . -type f -exec sed -i 's/#include "imgui.h"/#include /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 "" +
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 809624148bd026884a0625d3ee2c6082b351d283 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Fri Jul 22 17:38:38 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Fri Jul 22 17:39:27 2022 + 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 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 0..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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: f7289cf91664bed749fdac2ff6ac6ed7615f8911 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Wed May 11 19:06:04 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Wed May 11 19:06:04 2022 + 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 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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 547bceacc87d20ff565d1fbdcc3e2322aa0ef8c9 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Wed May 11 18:31:40 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Wed May 11 18:33:04 2022 + 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 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? (
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: 67b8cd8e3eddbaccb77d75ef7535079a2e4950ef Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Tue May 10 21:27:21 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Tue May 10 21:29:07 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=67b8cd8e games-util/mangohud: make dev-python/mako BDEPEND + remove spdlog patch texts Closes: https://bugs.gentoo.org/843551 Closes: https://bugs.gentoo.org/843554 Closes: https://bugs.gentoo.org/843566 Signed-off-by: Adel KARA SLIMANE zegrapher.com> ...on-build.patch => mangohud-0.6.6-meson-fix-imgui-dep.patch} | 2 +- .../{mangohud-0.6.6.1-r2.ebuild => mangohud-0.6.6.1-r3.ebuild} | 10 +- games-util/mangohud/metadata.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch b/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch similarity index 79% rename from games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch rename to games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch index c6aa9e6fd..6d3c9c285 100644 --- a/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch +++ b/games-util/mangohud/files/mangohud-0.6.6-meson-fix-imgui-dep.patch @@ -8,7 +8,7 @@ -dearimgui_sp = subproject('imgui', default_options: imgui_options) -dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') -+dearimgui_dep = dependency('imgui', default_options: imgui_options, fallback : ['imgui', 'imgui_dep']) ++dearimgui_dep = dependency('imgui') spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) if not spdlog_dep.found() diff --git a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild similarity index 95% rename from games-util/mangohud/mangohud-0.6.6.1-r2.ebuild rename to games-util/mangohud/mangohud-0.6.6.1-r3.ebuild index f237f6f88..977a71eef 100644 --- a/games-util/mangohud/mangohud-0.6.6.1-r2.ebuild +++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild @@ -34,10 +34,10 @@ REQUIRED_USE=" BDEPEND=" app-arch/unzip + dev-python/mako[${PYTHON_USEDEP}] " DEPEND=" - dev-python/mako[${PYTHON_USEDEP}] dev-libs/spdlog dev-util/glslang >=dev-util/vulkan-headers-1.2 @@ -56,10 +56,9 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/MangoHud-${PV}" -PATCHES=( - # "${FILESDIR}/mangonhud-0.6.6-meson-build.patch" - "${FILESDIR}/mangohud-0.6.6-meson-fix-spdlog-dep.patch" -) +# PATCHES=( +# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" +# ) src_unpack() { default @@ -73,6 +72,7 @@ src_unpack() { 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) diff --git a/games-util/mangohud/metadata.xml b/games-util/mangohud/metadata.xml index da9d5549c..53e5027d0 100644 --- a/games-util/mangohud/metadata.xml +++ b/games-util/mangohud/metadata.xml @@ -10,6 +10,6 @@ https://github.com/flightlessmango/MangoHud/issues - "Use XNVctrl as fall back for older Nvidia devices." + Use XNVctrl as fall back for older Nvidia devices.
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: a1a706a47ee68cfd0bc551bdde9365920b8f1d00 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon May 9 20:50:44 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Mon May 9 21:06:55 2022 + 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 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)
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: df151128206ef2e4de535a3f4f3749bb17edfa9f Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon May 9 18:25:12 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon May 9 18:25:12 2022 + 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 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}]
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
commit: 91e7bc3da242cddbc57a644c87d01e48cca18270 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Tue May 3 21:57:57 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Tue May 3 21:59:23 2022 + 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 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
[gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/files/, games-util/mangohud/
commit: e5119f64b321b101843486a27ae1bd7135f06242 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Sat Apr 16 17:30:19 2022 + Commit: Adel KARA SLIMANE karaslimane com> CommitDate: Sat Apr 16 17:32:43 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e5119f64 games-util/mangohud: new package The imgui dependency that is bundled in GURU needs some work before it can be used as a dependency, bundle it for now Bug: https://bugs.gentoo.org/838850 Signed-off-by: Adel KARA SLIMANE zegrapher.com> games-util/mangohud/Manifest | 3 + .../files/mangonhud-0.6.6-meson-build.patch| 14 games-util/mangohud/mangohud-0.6.6.1.ebuild| 94 ++ games-util/mangohud/metadata.xml | 15 4 files changed, 126 insertions(+) diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest new file mode 100644 index 0..c00c83d44 --- /dev/null +++ b/games-util/mangohud/Manifest @@ -0,0 +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 diff --git a/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch b/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch new file mode 100644 index 0..c6aa9e6fd --- /dev/null +++ b/games-util/mangohud/files/mangonhud-0.6.6-meson-build.patch @@ -0,0 +1,14 @@ +# We provide media-libs/imgui in guru + +--- a/meson.build b/meson.build +@@ -251,8 +251,7 @@ elif sizeof_ptr == 4 + pre_args += '-DMANGOHUD_ARCH="32bit"' + endif + +-dearimgui_sp = subproject('imgui', default_options: imgui_options) +-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep') ++dearimgui_dep = dependency('imgui', default_options: imgui_options, fallback : ['imgui', 'imgui_dep']) + + spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) + if not spdlog_dep.found() diff --git a/games-util/mangohud/mangohud-0.6.6.1.ebuild b/games-util/mangohud/mangohud-0.6.6.1.ebuild new file mode 100644 index 0..ae6a20b76 --- /dev/null +++ b/games-util/mangohud/mangohud-0.6.6.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 meson-multilib + +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 + dev-python/mako[${PYTHON_USEDEP}] + dev-libs/spdlog + 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}] ) + video_cards_nvidia? ( + x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] + xnvctrl? ( x11-drivers/nvidia-drivers[static-libs] ) + ) + wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) +" + +RDEPEND="${BDEPEND}" + +S="${WORKDIR}/MangoHud-${PV}" + +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 $