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" + (("