From unknown Tue Jun 17 01:34:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66413] [PATCH] gnu: mangohud: Update to 0.7.0. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 04:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66413@debbugs.gnu.org Cc: John Kehayias X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169682546118259 (code B ref -1); Mon, 09 Oct 2023 04:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Oct 2023 04:24:21 +0000 Received: from localhost ([127.0.0.1]:59007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qphoa-0004kR-LC for submit@debbugs.gnu.org; Mon, 09 Oct 2023 00:24:21 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qphoV-0004k6-4P for submit@debbugs.gnu.org; Mon, 09 Oct 2023 00:24:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpho5-0003l3-64 for guix-patches@gnu.org; Mon, 09 Oct 2023 00:23:49 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qphnz-0007o5-WA for guix-patches@gnu.org; Mon, 09 Oct 2023 00:23:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1696825421; x=1697084621; bh=prbOLfLyVkMz4YL9ojSKBLgXVJ7iOcUJjvib/zTi2VM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=p3HgZqIl8+hHQ+ml5tadFWy4eC+LpOfW5m3gKzQcAzvLICWiZeNYbMxn3Wi1ZY4yi xUQHgrNS9iRsmpP0W6rULVIXMVO7IFXJTS4I1eu04TIAp2YBiNiO3Hq2pZuzqUS7We ruRxpTQ+SIpJJi+FWYhdmDDVSFjoyUCfbUcQ2/vcr/0mbuZVU0PWDBcv9Ei7HYQ/o+ ONxUnWuaXPSI1Fbd6G1oZZePT3yCsw0PCTex+/9VwdXSEWaa0DioZdID12uCAOIwzY FsjCm8v8wTekzFPJszFH8bAsqCLJuv8/R96XNxGgm86BvdGuvfHKgT8UworclYNo0c dDlTSP6Euagjg== Date: Mon, 09 Oct 2023 04:23:30 +0000 From: John Kehayias Message-ID: <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=enabled" and "-Dvulkan_datadir" from as they are no longer supported. <#:phases>: A [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (john.kehayias[at]protonmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=3Denabled" and "-Dvulkan_datadir" from as they are no longer supported. <#:phases>: Add 'unbundle-vulkan-headers'. [inputs]: Add nlohmann-json. Replace vulkan-headers with origin for vulkan-headers@1.2.158. [native-inputs]: Add git-minimal. --- Here is a patch to update mangohud to the latest version. I've used guix lint, built it locally, and also tested it works with vulkan. The major change here is to manually unbundle vulkan-headers as that is no longer a configurable option. To do this a bare origin is used to get the source for the expected vulkan version (a specific older one is required) and the build patched to use this. Thanks! John gnu/packages/graphics.scm | 46 +++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9362666274..c5be44b1e4 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -28,7 +28,7 @@ ;;; Copyright =C2=A9 2021 Ekaitz Zarraga ;;; Copyright =C2=A9 2021, 2022 Vinicius Monego ;;; Copyright =C2=A9 2022 Michael Rohleder -;;; Copyright =C2=A9 2022 John Kehayias +;;; Copyright =C2=A9 2022, 2023 John Kehayias ;;; Copyright =C2=A9 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright =C2=A9 2022 Tobias Kortkamp ;;; Copyright =C2=A9 2022 Paul A. Patience @@ -121,6 +121,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages tbb) #:use-module (gnu packages toolkits) #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xiph) @@ -1038,7 +1039,7 @@ (define-public alembic (define-public mangohud (package (name "mangohud") - (version "0.6.8") + (version "0.7.0") (source (origin (method git-fetch) @@ -1047,21 +1048,18 @@ (define-public mangohud (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19dp8l5njzl9xah0bhwlkl39vc8w2rnpvpdrhgaz3hnhz8b0r5df")))) + (base32 "1m4a2dqzqdhk9w1gvzppid7k0fxvplh5hmivvj9sda529s1g24rc")))) (build-system meson-build-system) (arguments (list #:build-type "release" #:configure-flags - #~(list "-Duse_system_vulkan=3Denabled" - "-Duse_system_spdlog=3Denabled" + #~(list "-Duse_system_spdlog=3Denabled" "-Dwith_xnvctrl=3Ddisabled" - "-Dappend_libdir_mangohud=3Dfalse" - (string-append "-Dvulkan_datadir=3D" - #$(this-package-input "vulkan-headers") "/sha= re")) + "-Dappend_libdir_mangohud=3Dfalse") #:phases #~(modify-phases %standard-phases - ;; Mangohud tries to build the imgui library as a meson submodul= e, + ;; MangoHud tries to build the imgui library as a meson submodul= e, ;; so we change the dependency to the imgui input instead. (add-after 'unpack 'unbundle-imgui (lambda _ @@ -1073,6 +1071,23 @@ (define-public mangohud "declare_dependency(dependencies: " "cpp.find_library('imgui'), include_directories: '" #$(this-package-input "imgui") "/include/imgui')"))))) + ;; Likewise, MangoHud bundles a Vulkan headers submodule to use = a + ;; specific version, which we provide as an input and adjust the + ;; build accordingly. + (add-after 'unbundle-imgui 'unbundle-vulkan-headers + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("vkh_sp =3D .*") + "") + (("vkh_sp.get_variable\\('vulkan_api_xml'\\)") + (string-append "files('" + (search-input-file inputs "registry/vk.xml= ") + "')")) + (("dep_vulkan =3D .*") + "")) + (substitute* "src/meson.build" + (("dep_vulkan,") + "")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/meson.build" @@ -1098,11 +1113,20 @@ (define-public mangohud libx11 mesa mesa-utils + nlohmann-json python-mako spdlog - vulkan-headers + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Headers") + (commit "v1.2.158"))) + (file-name (git-file-name "vulkan" "v1.2.158")) + (sha256 + (base32 + "0jvaqj87792yccpr290djb18pqaisspq9dw6bqim6mrhfgda9v76"))) vulkan-loader)) - (native-inputs (list pkg-config python)) + (native-inputs (list git-minimal pkg-config python)) (home-page "https://github.com/flightlessmango/MangoHud/") (synopsis "Vulkan and OpenGL overlay for monitoring performance and ha= rdware") (description "MangoHud is a Vulkan and OpenGL overlay for monitoring base-commit: 321979a15317eaf93b15e9cca30d328d39cca4b1 -- 2.41.0 From unknown Tue Jun 17 01:34:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66413] [PATCH] gnu: mangohud: Update to 0.7.0. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Oct 2023 20:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66413 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: 66413@debbugs.gnu.org Received: via spool by 66413-submit@debbugs.gnu.org id=B66413.16973151543478 (code B ref 66413); Sat, 14 Oct 2023 20:26:01 +0000 Received: (at 66413) by debbugs.gnu.org; 14 Oct 2023 20:25:54 +0000 Received: from localhost ([127.0.0.1]:50656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrlCs-0000u1-1M for submit@debbugs.gnu.org; Sat, 14 Oct 2023 16:25:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrlCp-0000tl-Hd for 66413@debbugs.gnu.org; Sat, 14 Oct 2023 16:25:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qrlCM-0001Tw-9E; Sat, 14 Oct 2023 16:25:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=+lPdevXktsLmKOLn9C1tFj9FV+DbcXuyj2+ONbm4rRM=; b=q1OnBYa6RxuP2dE99pg0 Kg25kO/ajPbzAOzt/FwqWVgXAhd+i+j+zXiTBVD9DWAMLUMaBujO7EGpQQlpG8e7mCukiRCYctTuL XkBURrm9Ce73Ci3Js+nxOXX6Jp+yFZk76Z0d6AdKIM1Es4VvjR8ab0VDSrP+40/RXTif8Et8tNST5 oT2gnaUtLqCZAEULWHBhSOoWUViQ532Ra5MIcrNCCvyDyaMQJ09ZiQdquZsGsdUocwe3pq7dwUPlN 0foEKkK7j8iZ4L+B8MtHCvuyVJ+3VCBu+SBPD+TTMQxBTJ9lqrSK3r28IdSHraEmcWWK9rHMHyyHa dWnjAv3w3JIVPA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> (John Kehayias's message of "Mon, 09 Oct 2023 04:23:30 +0000") References: <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> Date: Sat, 14 Oct 2023 22:25:19 +0200 Message-ID: <87zg0l9ck0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) John Kehayias skribis: > * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. > [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=3Denabled" and > "-Dvulkan_datadir" from as they are no longer supported. > <#:phases>: Add 'unbundle-vulkan-headers'. > [inputs]: Add nlohmann-json. Replace vulkan-headers with origin for > vulkan-headers@1.2.158. > [native-inputs]: Add git-minimal. [...] > + (native-inputs (list git-minimal pkg-config python)) ^ Should be =E2=80=98git-minimal/pinned=E2=80=99 to avoid unnecessary rebuild= s. Otherwise LGTM and to qa.guix! Thanks, Ludo=E2=80=99. From unknown Tue Jun 17 01:34:51 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: John Kehayias Subject: bug#66413: closed (Re: [bug#66413] [PATCH] gnu: mangohud: Update to 0.7.0.) Message-ID: References: <87h6msc4bd.fsf@protonmail.com> <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> X-Gnu-PR-Message: they-closed 66413 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 66413@debbugs.gnu.org Date: Sat, 14 Oct 2023 20:56:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1697316962-17531-1" This is a multi-part message in MIME format... ------------=_1697316962-17531-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #66413: [PATCH] gnu: mangohud: Update to 0.7.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 66413@debbugs.gnu.org. --=20 66413: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66413 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1697316962-17531-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 66413-done) by debbugs.gnu.org; 14 Oct 2023 20:55:57 +0000 Received: from localhost ([127.0.0.1]:50735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrlfx-0004YV-EM for submit@debbugs.gnu.org; Sat, 14 Oct 2023 16:55:57 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:51759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qrlfs-0004YD-R0 for 66413-done@debbugs.gnu.org; Sat, 14 Oct 2023 16:55:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1697316922; x=1697576122; bh=jvj2LgcLl40kRUrs2s6WPRgb5giIID6Y8aHNLBweHws=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=qy4q7y9QpQajXCvVtGwWLAE9tZ7JHnivOxOvej7zy1OfAPwJBtWi/ZPrWZ8/C/fXT KsYObIY+KS6qwr7b6KlIHAqJkATSpA8ehC9OycXiTz5N+q9ntEDibRg/aKb7NkuabN Cn0Be8dbHMpt7rSJaXv3N2jsBpnqeYZZVO2jo+il/xwSpauK+W7UrGcg1u8uvO0/Ky YDjWb9uiKarBHfSUA8TG/aw1aoW3VLCF6CQRSv/Yrj9jAK+SnRfqhOZ/E3ZEY+N5jf BGPLknc4jmO8DHtPwXRK06YmqJDEw6RnfKFXKg230m+x2yosutP/0mK8a94el6MO1a yGeAzMJGNb5ng== Date: Sat, 14 Oct 2023 20:55:08 +0000 To: =?utf-8?Q?Ludovic_Court=C3=A8s?= From: John Kehayias Subject: Re: [bug#66413] [PATCH] gnu: mangohud: Update to 0.7.0. Message-ID: <87h6msc4bd.fsf@protonmail.com> In-Reply-To: <87zg0l9ck0.fsf@gnu.org> References: <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> <87zg0l9ck0.fsf@gnu.org> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66413-done Cc: 66413-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Sat, Oct 14, 2023 at 10:25 PM, Ludovic Court=C3=A8s wrote: > John Kehayias skribis: > >> * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. >> [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=3Denabled" a= nd >> "-Dvulkan_datadir" from as they are no longer supported. >> <#:phases>: Add 'unbundle-vulkan-headers'. >> [inputs]: Add nlohmann-json. Replace vulkan-headers with origin for >> vulkan-headers@1.2.158. >> [native-inputs]: Add git-minimal. > > [...] > >> + (native-inputs (list git-minimal pkg-config python)) > ^ > Should be =E2=80=98git-minimal/pinned=E2=80=99 to avoid unnecessary rebui= lds. > Ah, thanks! > Otherwise LGTM and to qa.guix! > > Thanks, > Ludo=E2=80=99. Made that change, updated commit message accordingly, and pushed as 5a6b1a5= 5869c488c0da15b4a7a8176d616ec92f8. ------------=_1697316962-17531-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Oct 2023 04:24:21 +0000 Received: from localhost ([127.0.0.1]:59007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qphoa-0004kR-LC for submit@debbugs.gnu.org; Mon, 09 Oct 2023 00:24:21 -0400 Received: from lists.gnu.org ([2001:470:142::17]:33768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qphoV-0004k6-4P for submit@debbugs.gnu.org; Mon, 09 Oct 2023 00:24:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpho5-0003l3-64 for guix-patches@gnu.org; Mon, 09 Oct 2023 00:23:49 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qphnz-0007o5-WA for guix-patches@gnu.org; Mon, 09 Oct 2023 00:23:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1696825421; x=1697084621; bh=prbOLfLyVkMz4YL9ojSKBLgXVJ7iOcUJjvib/zTi2VM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=p3HgZqIl8+hHQ+ml5tadFWy4eC+LpOfW5m3gKzQcAzvLICWiZeNYbMxn3Wi1ZY4yi xUQHgrNS9iRsmpP0W6rULVIXMVO7IFXJTS4I1eu04TIAp2YBiNiO3Hq2pZuzqUS7We ruRxpTQ+SIpJJi+FWYhdmDDVSFjoyUCfbUcQ2/vcr/0mbuZVU0PWDBcv9Ei7HYQ/o+ ONxUnWuaXPSI1Fbd6G1oZZePT3yCsw0PCTex+/9VwdXSEWaa0DioZdID12uCAOIwzY FsjCm8v8wTekzFPJszFH8bAsqCLJuv8/R96XNxGgm86BvdGuvfHKgT8UworclYNo0c dDlTSP6Euagjg== Date: Mon, 09 Oct 2023 04:23:30 +0000 To: guix-patches@gnu.org From: John Kehayias Subject: [PATCH] gnu: mangohud: Update to 0.7.0. Message-ID: <94feda96cdbfe16512a664d66dd25290320f762e.1696825155.git.john.kehayias@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.131; envelope-from=john.kehayias@protonmail.com; helo=mail-40131.protonmail.ch X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=enabled" and "-Dvulkan_datadir" from as they are no longer supported. <#:phases>: A [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (john.kehayias[at]protonmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: John Kehayias X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/graphics.scm (mangohud): Update to 0.7.0. [arguments]<#:configure-flags>: Remove "-Duse_system_vulkan=3Denabled" and "-Dvulkan_datadir" from as they are no longer supported. <#:phases>: Add 'unbundle-vulkan-headers'. [inputs]: Add nlohmann-json. Replace vulkan-headers with origin for vulkan-headers@1.2.158. [native-inputs]: Add git-minimal. --- Here is a patch to update mangohud to the latest version. I've used guix lint, built it locally, and also tested it works with vulkan. The major change here is to manually unbundle vulkan-headers as that is no longer a configurable option. To do this a bare origin is used to get the source for the expected vulkan version (a specific older one is required) and the build patched to use this. Thanks! John gnu/packages/graphics.scm | 46 +++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9362666274..c5be44b1e4 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -28,7 +28,7 @@ ;;; Copyright =C2=A9 2021 Ekaitz Zarraga ;;; Copyright =C2=A9 2021, 2022 Vinicius Monego ;;; Copyright =C2=A9 2022 Michael Rohleder -;;; Copyright =C2=A9 2022 John Kehayias +;;; Copyright =C2=A9 2022, 2023 John Kehayias ;;; Copyright =C2=A9 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright =C2=A9 2022 Tobias Kortkamp ;;; Copyright =C2=A9 2022 Paul A. Patience @@ -121,6 +121,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages tbb) #:use-module (gnu packages toolkits) #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xiph) @@ -1038,7 +1039,7 @@ (define-public alembic (define-public mangohud (package (name "mangohud") - (version "0.6.8") + (version "0.7.0") (source (origin (method git-fetch) @@ -1047,21 +1048,18 @@ (define-public mangohud (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19dp8l5njzl9xah0bhwlkl39vc8w2rnpvpdrhgaz3hnhz8b0r5df")))) + (base32 "1m4a2dqzqdhk9w1gvzppid7k0fxvplh5hmivvj9sda529s1g24rc")))) (build-system meson-build-system) (arguments (list #:build-type "release" #:configure-flags - #~(list "-Duse_system_vulkan=3Denabled" - "-Duse_system_spdlog=3Denabled" + #~(list "-Duse_system_spdlog=3Denabled" "-Dwith_xnvctrl=3Ddisabled" - "-Dappend_libdir_mangohud=3Dfalse" - (string-append "-Dvulkan_datadir=3D" - #$(this-package-input "vulkan-headers") "/sha= re")) + "-Dappend_libdir_mangohud=3Dfalse") #:phases #~(modify-phases %standard-phases - ;; Mangohud tries to build the imgui library as a meson submodul= e, + ;; MangoHud tries to build the imgui library as a meson submodul= e, ;; so we change the dependency to the imgui input instead. (add-after 'unpack 'unbundle-imgui (lambda _ @@ -1073,6 +1071,23 @@ (define-public mangohud "declare_dependency(dependencies: " "cpp.find_library('imgui'), include_directories: '" #$(this-package-input "imgui") "/include/imgui')"))))) + ;; Likewise, MangoHud bundles a Vulkan headers submodule to use = a + ;; specific version, which we provide as an input and adjust the + ;; build accordingly. + (add-after 'unbundle-imgui 'unbundle-vulkan-headers + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("vkh_sp =3D .*") + "") + (("vkh_sp.get_variable\\('vulkan_api_xml'\\)") + (string-append "files('" + (search-input-file inputs "registry/vk.xml= ") + "')")) + (("dep_vulkan =3D .*") + "")) + (substitute* "src/meson.build" + (("dep_vulkan,") + "")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/meson.build" @@ -1098,11 +1113,20 @@ (define-public mangohud libx11 mesa mesa-utils + nlohmann-json python-mako spdlog - vulkan-headers + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Headers") + (commit "v1.2.158"))) + (file-name (git-file-name "vulkan" "v1.2.158")) + (sha256 + (base32 + "0jvaqj87792yccpr290djb18pqaisspq9dw6bqim6mrhfgda9v76"))) vulkan-loader)) - (native-inputs (list pkg-config python)) + (native-inputs (list git-minimal pkg-config python)) (home-page "https://github.com/flightlessmango/MangoHud/") (synopsis "Vulkan and OpenGL overlay for monitoring performance and ha= rdware") (description "MangoHud is a Vulkan and OpenGL overlay for monitoring base-commit: 321979a15317eaf93b15e9cca30d328d39cca4b1 -- 2.41.0 ------------=_1697316962-17531-1--