From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0E8B158064 for ; Thu, 9 May 2024 23:42:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC2A9E2C47; Thu, 9 May 2024 23:42:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8DC48E2C47 for ; Thu, 9 May 2024 23:42:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 854EB34300E for ; Thu, 9 May 2024 23:42:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E59EA1A47 for ; Thu, 9 May 2024 23:42:53 +0000 (UTC) From: "Gonçalo Negrier Duarte" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gonçalo Negrier Duarte" Message-ID: <1715298118.e9a378e04e7098e104d84a13015b4277d0c1dfc6.gonegrier.duarte@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/, games-util/mangohud/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-util/mangohud/files/mangohud-0.7.1-menson-fix-dep.patch games-util/mangohud/files/mangohud-9999-menson-fix-dep.patch games-util/mangohud/mangohud-0.7.1-r2.ebuild games-util/mangohud/mangohud-0.7.1-r3.ebuild games-util/mangohud/mangohud-9999.ebuild games-util/mangohud/metadata.xml X-VCS-Directories: games-util/mangohud/files/ games-util/mangohud/ X-VCS-Committer: gonegrier.duarte X-VCS-Committer-Name: Gonçalo Negrier Duarte X-VCS-Revision: e9a378e04e7098e104d84a13015b4277d0c1dfc6 X-VCS-Branch: dev Date: Thu, 9 May 2024 23:42:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b843314-7209-404a-8350-b87fd229c522 X-Archives-Hash: ca687d2aeb8edddd7ede17c50258c7ef commit: e9a378e04e7098e104d84a13015b4277d0c1dfc6 Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Thu May 9 22:46:27 2024 +0000 Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Thu May 9 23:41:58 2024 +0000 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-9999-menson-fix-dep.patch | 2 +- .../{mangohud-0.7.1-r2.ebuild => mangohud-0.7.1-r3.ebuild} | 14 ++++++++++++-- games-util/mangohud/mangohud-9999.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-9999-menson-fix-dep.patch b/games-util/mangohud/files/mangohud-9999-menson-fix-dep.patch index 4cf18e1394..549aecfc13 100644 --- a/games-util/mangohud/files/mangohud-9999-menson-fix-dep.patch +++ b/games-util/mangohud/files/mangohud-9999-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-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild index 171ea194b7..143418dc36 100644 --- a/games-util/mangohud/mangohud-9999.ebuild +++ b/games-util/mangohud/mangohud-9999.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/metadata.xml b/games-util/mangohud/metadata.xml index 81225ee755..113dd15042 100644 --- a/games-util/mangohud/metadata.xml +++ b/games-util/mangohud/metadata.xml @@ -15,5 +15,8 @@ Use XNVctrl as fall back for older Nvidia devices. + Run mangohud tests + Build and install mangoapp and mangoapp layer + Build and install mangohudctl