From patchwork Tue Jan 4 22:23:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35954 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3075D27BBEA; Tue, 4 Jan 2022 22:24:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB1F327BBE9 for ; Tue, 4 Jan 2022 22:24:20 +0000 (GMT) Received: from localhost ([::1]:60608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sE8-0007nt-1o for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:24:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sDr-0007mq-1P for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sDq-0001yJ-Nn for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sDq-00036y-Fl for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53015] [PATCH 1/4] gnu: Add pciutils-no-zlib. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53015@debbugs.gnu.org" <53015@debbugs.gnu.org> Received: via spool by 53015-submit@debbugs.gnu.org id=B53015.164133503711933 (code B ref 53015); Tue, 04 Jan 2022 22:24:02 +0000 Received: (at 53015) by debbugs.gnu.org; 4 Jan 2022 22:23:57 +0000 Received: from localhost ([127.0.0.1]:38971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDl-00036P-4X for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:57 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:62664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDj-00036C-FJ for 53015@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:56 -0500 Date: Tue, 04 Jan 2022 22:23:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641335028; bh=rqd1lJa5ZLzzJM9yWhNET4hMERT8sHtV4EzUZ/v3L7I=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=k3YWAHDfc93itrpiYjgWipzc0cVncFryaxGJKbJPTQHVPzL12+UJ8AaY7lVKN9nc8 LeuaL6A0hYTqL7LQ9AejA/P9qrJKdsjTJ024ceKrn5j3IvvG+D9Wpd/5nB2InTX1BB CQn+a0SofcmyHgVcHV3oHu4GQsWyGUE7RrezFrGO4hjCzXgPGtDs2DTI4DRtNkDKXc GMnHJcCYdlnINFh6N3tEvdVkTY8wsZayPRjp1b4Ew8XoEI8FmIC3rORPZotSq1xnd6 K5tQP50fcAYWV9/eJONzb1TXHjRt7oNSUBAuDFJzv2Mu2UffLt7mpOs7xagvtosP58 wFCWls87A9kNQ== Message-ID: <5P1tW8O5FTcp3WD4j3xIl-XLhBKkPhcqkNzoSzxFaihpC7qgFsz5y6o9KTXZaMz0dsMPT65dYa8FWU7CUAOXUE_iysyNYtfqzxHjVzGWsT0=@protonmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 0e8b852e0ff58a34141d804747b13b55088993b4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 4 Jan 2022 16:40:14 -0500 Subject: [PATCH 1/4] gnu: Add pciutils-no-zlib. * gnu/packages/pciutils.scm (pciutils-no-zlib): New variable. A hidden package to provide pciutils with uncompressed pci.ids. --- gnu/packages/pciutils.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 47275a8ff0..a8c46528d0 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,3 +130,23 @@ (define-public pciutils of operating systems. This includes the @command{lspci} and @command{setpci} commands.") (license license:gpl2+))) + +;; This is a version of pciutils without zlib, so that the hardware pci.ids is +;; uncompressed. This is useful for packages that try to read pci.ids +;; directly. Alternatively, the uncompressed file could also be present in +;; pciutils or the direct source of pci.ids could be made available +;; separately, see: https://pci-ids.ucw.cz/ +(define-public pciutils-no-zlib + (hidden-package + (package + (inherit pciutils) + (arguments + (substitute-keyword-arguments (package-arguments pciutils) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'disable-zlib + ;; remove zlib from Makefile to have uncompressed pci.ids + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("^ZLIB := .*$") + "ZLIB := no\n"))))))))))) -- 2.34.0 From patchwork Tue Jan 4 22:24:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35955 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 74F4827BBEA; Tue, 4 Jan 2022 22:25:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E43827BBE9 for ; Tue, 4 Jan 2022 22:25:16 +0000 (GMT) Received: from localhost ([::1]:33036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sF1-00089c-Ei for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:25:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sEp-00088W-21 for guix-patches@gnu.org; Tue, 04 Jan 2022 17:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sEo-00024F-Nx for guix-patches@gnu.org; Tue, 04 Jan 2022 17:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sEo-000396-KK for guix-patches@gnu.org; Tue, 04 Jan 2022 17:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53015] [PATCH 2/4] gnu: spdlog: Build with '-fpic'. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53015@debbugs.gnu.org" <53015@debbugs.gnu.org> Received: via spool by 53015-submit@debbugs.gnu.org id=B53015.164133508312054 (code B ref 53015); Tue, 04 Jan 2022 22:25:02 +0000 Received: (at 53015) by debbugs.gnu.org; 4 Jan 2022 22:24:43 +0000 Received: from localhost ([127.0.0.1]:38981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sEU-00038M-OJ for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:24:43 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:32853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sES-00037x-4A for 53015@debbugs.gnu.org; Tue, 04 Jan 2022 17:24:40 -0500 Date: Tue, 04 Jan 2022 22:24:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641335073; bh=NlTTljiIlCDTZKKzLU2WcGd53vJDHEZbO5M0It42sp0=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=CEkGNdIjymomturCzmJVr7s0vbNXMMKSFmFg5/8Fz1G3jkGeF9J45RFbXin8kFGBZ 1C+Xd4C8nw5awjzfIKzVjeDu7g3g+ZR0NSJgDFJUYsm0OuZVl+spS5SmNEdmgPPGuL 4UIiZw6qIaHQRK5p0fooAQDQkQP3wupqyEtE9r+mojZquoB8MHbsf191sxLOi/eKvb aizEzrCwh+9oWVOHgqpaB+MK0C9I8iJh22E4WqdSaoBk/WsA7Sqd3iI2Fq6ZMDgZKF Be1dFMbQSv8NrT2BHmJMIUX7MBQUKLxGjCGQoIwRrO2/TMtvAHCLmbRSGiJifNo1UK kbU3mGZQwLfuQ== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 79f30cf17e88ca50fd8444f1ad34ceb795b1d255 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 4 Jan 2022 16:41:48 -0500 Subject: [PATCH 2/4] gnu: spdlog: Build with '-fpic'. * gnu/packages/logging.scm (spdlog)[arguments]: Add "-DCMAKE_CXX_FLAGS=-fpic" to #:configure-flags. --- gnu/packages/logging.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index be144e2daa..3c8f67b3ce 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -207,7 +208,11 @@ (define-public spdlog ;; (gnu packages benchmark) forms a dependency cycle (arguments '(#:configure-flags - (list "-DSPDLOG_BUILD_BENCH=OFF" + ;; Typically this library is meant to be compiled statically, see + ;; https://github.com/gabime/spdlog/wiki/How-to-use-spdlog-in-DLLs + ;; So build with -fpic to allow linking in shared libraries. + (list "-DCMAKE_CXX_FLAGS=-fpic" + "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON"))) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") -- 2.34.0 From patchwork Tue Jan 4 22:25:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35956 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5DE6827BBEA; Tue, 4 Jan 2022 22:26:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A7D5C27BBE9 for ; Tue, 4 Jan 2022 22:26:12 +0000 (GMT) Received: from localhost ([::1]:33482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sFv-00007c-SR for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:26:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sFm-00007D-LE for guix-patches@gnu.org; Tue, 04 Jan 2022 17:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sFm-0002Gn-CV for guix-patches@gnu.org; Tue, 04 Jan 2022 17:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sFm-0003Am-45 for guix-patches@gnu.org; Tue, 04 Jan 2022 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53015] [PATCH 3/4] gnu: dear-imgui: Update to 1.81, hide version 1.79. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53015@debbugs.gnu.org" <53015@debbugs.gnu.org> Received: via spool by 53015-submit@debbugs.gnu.org id=B53015.164133511612143 (code B ref 53015); Tue, 04 Jan 2022 22:26:02 +0000 Received: (at 53015) by debbugs.gnu.org; 4 Jan 2022 22:25:16 +0000 Received: from localhost ([127.0.0.1]:38987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sF2-00039m-3j for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:25:16 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:27376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sF0-00039V-GL for 53015@debbugs.gnu.org; Tue, 04 Jan 2022 17:25:15 -0500 Date: Tue, 04 Jan 2022 22:25:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641335107; bh=YKsbEyfn4YbkP98KQHndjLzAUYNsZGtFS/i4yrv/N1g=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=LVgLxC0Vfe2XdDKE8Odp2epMyNXTe5fNHu7UgADoP0oUQOXU9d/kvb+MPp+1YPSWe SrcUXEMarxQUwbD3Fh+p5ojejuC5NXjPFtxh+3YeIdQoRaGdSnJT2RA50T2TP+jeh7 XhYaWbHeLkxy6b/iaD8qSo3ou7Rk6BtteabOguUn9eDv9fki52U9ZmiwrThzLBrctw 3+qhLSS/VV36wwAgOD1EQ3GzsBKxxgdr3KzXbP458WzGGAmAyO/OXgdK7bp8Hx8Cui gygkvmw4iu8EG/7lmYhjVqigmcX0tSoRzjhIQhzlIIqoMFw4o3MbjJ02QssembmGfh 17mTdIU+S6/IQ== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From d4eeb30544c9681899b12fe27baf2ad5d20a4330 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 4 Jan 2022 16:48:39 -0500 Subject: [PATCH 3/4] gnu: dear-imgui: Update to 1.81, hide version 1.79. * gnu/packages/graphics.scm: Import (gnu packages game-development). (dear-imgui): Update to 1.81. [outputs]: Add static output. [phases]{unpack-debian-files}: Build the static library, remove references to non-existent stb library. {move-static-libraries}: New phase to install static libraries. [inputs]: Add allegro, freeglut, glew, glfw, mesa, sdl2, and vulkan-headers. (dear-imgui-1.79): New variable. Hidden package of the previous version of dear-imgui. (ogre)[native-inputs]: Use it. --- gnu/packages/graphics.scm | 122 ++++++++++++++++++++++++++++++++++---- 1 file changed, 110 insertions(+), 12 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fe35aaad2d..438a01ba72 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2021 Andy Tai ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ (define-module (gnu packages graphics) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -867,10 +869,81 @@ (define-public pstoedit @end itemize") (license license:gpl2+))) +(define-public dear-imgui-1.79 + (hidden-package + (package + (name "dear-imgui-1.79") + (version "1.79") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocornut/imgui") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x26igynxp6rlpp2wfc5dr7x6yh583ajb7p23pgycn9vqikn318q")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "VERSION=" ,version)) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'unpack-debian-files + (lambda* (#:key inputs #:allow-other-keys) + (invoke "tar" "xvf" (assoc-ref inputs "debian-files")) + (apply invoke "patch" "-Np1" "-i" + (find-files "debian/patches" "\\.patch$")) + (substitute* "Makefile" + ((" X-Patchwork-Id: 35957 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC9DB27BBEA; Tue, 4 Jan 2022 22:35:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 29EF127BBE9 for ; Tue, 4 Jan 2022 22:35:16 +0000 (GMT) Received: from localhost ([::1]:34524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sOh-0001fB-A3 for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:35:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sOU-0001f1-KA for guix-patches@gnu.org; Tue, 04 Jan 2022 17:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sOU-0003Nu-AO for guix-patches@gnu.org; Tue, 04 Jan 2022 17:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sOU-0003Oi-6d for guix-patches@gnu.org; Tue, 04 Jan 2022 17:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53015] [PATCH 4/4] gnu: Add mangohud. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53015@debbugs.gnu.org" <53015@debbugs.gnu.org> Received: via spool by 53015-submit@debbugs.gnu.org id=B53015.164133569913048 (code B ref 53015); Tue, 04 Jan 2022 22:35:02 +0000 Received: (at 53015) by debbugs.gnu.org; 4 Jan 2022 22:34:59 +0000 Received: from localhost ([127.0.0.1]:38995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sOR-0003OO-Cq for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:34:59 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:55453) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sOO-0003O9-W6 for 53015@debbugs.gnu.org; Tue, 04 Jan 2022 17:34:57 -0500 Date: Tue, 04 Jan 2022 22:34:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641335690; bh=0KZTRkQmyvu3T1sT0HfNGLMamvxqknCpmm1dUEAl1sk=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=pCls0539PVhhLwbhx62w9OcJBfKGOsF9BNPWLWAv7uBEa/OeF0+bWWP4jIhtC0c6c GVvPoNAoeivgx2hRKytc2WXFnwnLQz0rnGSfBhds8U7h19dJA7ANfc2qx4XPhg72M1 PlBaQ9jWjwKzjiycvSe+/Cwjf3ue7kW2gmQZijJyTAp0jc8i5iv5UWMsu6u6S11msG RQbMV7acoMhMit5RcOJX9YBlAoAsGrREiCBHRK0awQGVthrZt7jA7FDIfIITC/mNLh K2Le/bfBg1kiZwKrmDZMxt8tGS4VI9Y1SB0LFNZUjWj1P6ki5miFFHxFPqXjAlayEH 5zAo1jIXr78GQ== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From ba253276636a18cb9af0b7982cd7db34942d39e2 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 4 Jan 2022 17:02:31 -0500 Subject: [PATCH 4/4] gnu: Add mangohud. * gnu/packages/graphics.scm (mangohud): New variable. * gnu/packages/patches/mangohud-imgui.patch: New file. * gnu/local.mk (dist_path_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 81 +++++++++++++++++++++++ gnu/packages/patches/mangohud-imgui.patch | 50 ++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 gnu/packages/patches/mangohud-imgui.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8ec622aa1..aab5331bf1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1466,6 +1466,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ + %D%/packages/patches/mangohud-imgui.patch \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mesa-opencl-all-targets.patch \ %D%/packages/patches/mesa-skip-tests.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 438a01ba72..85211fb25d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -81,10 +81,12 @@ (define-module (gnu packages graphics) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -116,6 +118,7 @@ (define-module (gnu packages graphics) #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) @@ -1059,6 +1062,84 @@ (define-public alembic distills complex, animated scenes into a set of baked geometric results.") (license license:bsd-3))) +(define-public mangohud + (package + (name "mangohud") + (version "0.6.6-1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flightlessmango/MangoHud/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "mangohud-imgui.patch")) + (sha256 + (base32 "0ka004wxkajmvs5vy60r4ckm7f169c61rrd46w6gywkaqf5yp1ab")))) + (build-system meson-build-system) + (arguments + (list + #:build-type "release" + #:configure-flags + #~(list "-Duse_system_vulkan=enabled" + "-Duse_system_spdlog=enabled" + "-Dwith_xnvctrl=disabled" + "-Dappend_libdir_mangohud=false" + (string-append "-Dvulkan_datadir=" + #$(this-package-input "vulkan-headers") + "/share")) + #:phases + `(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Don't use $LIB. + (substitute* "src/meson.build" + (("\\\\\\$LIB") + "lib")) + ;; Adjust hardcoded paths. + (substitute* "src/loaders/loader_libdrm.cpp" + (("libdrm.so.2") + (search-input-file inputs "/lib/libdrm.so.2")) + (("libdrm_amdgpu.so.1") + (search-input-file inputs "/lib/libdrm_amdgpu.so.1"))) + (substitute* "src/overlay.cpp" + (("glxinfo") + (search-input-file inputs "/bin/glxinfo"))) + (substitute* "src/loaders/loader_x11.cpp" + (("libX11.so.6") + (search-input-file inputs "/lib/libX11.so.6"))) + (substitute* "src/pci_ids.cpp" + (("/usr/share/hwdata/pci.ids") + (search-input-file inputs "share/hwdata/pci.ids"))) + (substitute* "src/dbus.cpp" + (("libdbus-1.so.3") + (search-input-file inputs "lib/libdbus-1.so.3")))))))) + (inputs + (list dbus + dear-imgui + `(,dear-imgui "static") ;static imgui preferred + glslang + libdrm + libx11 + mesa + mesa-utils + pciutils-no-zlib + python-mako + spdlog + vulkan-loader + vulkan-headers)) + (native-inputs + (list pkg-config)) + (synopsis "Vulkan and OpenGL overlay for monitoring framerate, temperatures and more") + (description + "MangoHud is a Vulkan and OpenGL overlay for monitoring FPS, temperatures, +CPU/GPU load and more. Configuration is customizable though configuration +files or the variable @code{MANGOHUD_CONFIG}, including position, color, media +info, framerate logging, and so on. MangoHud can be run with @code{mangohud} +or with @code{MANGOHUD=1} (for Vulkan only).") + (home-page "https://github.com/flightlessmango/MangoHud/") + (license license:expat))) + (define-public ogre (package (name "ogre") diff --git a/gnu/packages/patches/mangohud-imgui.patch b/gnu/packages/patches/mangohud-imgui.patch new file mode 100644 index 0000000000..d5dff193fa --- /dev/null +++ b/gnu/packages/patches/mangohud-imgui.patch @@ -0,0 +1,50 @@ +This patch removes trying to build the bundled dear-imgui library in favor of +the input version. The static option is set in the dependency to mirror the +upstream build (though dear-imgui is built with all available backends +already). + +diff --git a/meson.build b/meson.build +index e5cf395..7f8a8e1 100644 +--- a/meson.build ++++ b/meson.build +@@ -220,39 +220,14 @@ util_files = files( + 'src/mesa/util/os_time.c', + ) + +-imgui_options = [ +- 'default_library=static', +- # use 'auto_features=disabled' once available: https://github.com/mesonbuild/meson/issues/5320 +- 'dx9=disabled', +- 'dx10=disabled', +- 'dx11=disabled', +- 'dx12=disabled', +- 'metal=disabled', +- 'opengl=disabled', +- 'vulkan=disabled', +- 'glfw=disabled', +- 'sdl2=disabled', +- 'osx=disabled', +- 'win=disabled', +- 'marmalade=disabled', +- 'allegro5=disabled', +-] +- + sizeof_ptr = cc.sizeof('void*') + if sizeof_ptr == 8 + pre_args += '-DMANGOHUD_ARCH="64bit"' +- if get_option('mangoapp') +- imgui_options += [ +- 'opengl=enabled', +- 'glfw=enabled', +- ] +- endif + 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', static: true) + + spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog')) + if not spdlog_dep.found() -- 2.34.0