From patchwork Tue Dec 21 23:55:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35565 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 56CCF27BBEA; Tue, 21 Dec 2021 23:57: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,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 0357527BBE9 for ; Tue, 21 Dec 2021 23:57:15 +0000 (GMT) Received: from localhost ([::1]:53312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0M-0001ZP-0J for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0001Z0-2M for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0A-0002rz-Po for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0A-0005rS-Pk for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 1/6] build-system: Add godot-build-system. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013099122413 (code B ref 48952); Tue, 21 Dec 2021 23:57:02 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:31 +0000 Received: from localhost ([127.0.0.1]:56198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozf-0005pQ-2A for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:31 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozc-0005pB-WA for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:29 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 14CA4240104 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640130983; bh=DMchcAjLaYbFFmCqvh8tdSGXr5Vy7LQ6AGMKVZofWXY=; h=From:To:Cc:Subject:Date:From; b=chg7XCFm+dKkIn2yA+iKDEqCbSeY+8ExF+OtWoXdbBSVbjb+dNugNOh0QfAX+AzJh ezGOFb3CUckJkorUYw4ZfIPj0G8fLjSRIRHk9aucfZHOl9gb4YMi1NozHvomdu+0c/ 6whZOctiJGKTFI86jX0JG/PsF/U1gDKQyORjnm/q1t2OAJ3P9j9dKGrKyzMj/LXM7P OwBe4AWstC7mpLFBHhBAnbF+MvkKq9qsD0OBu0aakmgp1Qk4W2g8al4Kf7NRkAJnRH fylFLC3A02wl4QEMRN74hXiDtGdDK7pziWDgO42aMD/bkfpgmEpjdwPNmj/8nPHWRb PP2wTfNw82zJA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJQ0sDhz9rwg; Wed, 22 Dec 2021 00:56:21 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:43 +0000 Message-Id: <20211221235548.130808-2-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/godot-build-system.scm: New file. * guix/build-system/godot.scm: New file. * Makefile.am (MODULES): Add them here. * doc/guix.texi (Build Systems): Document godot-build-system. --- Makefile.am | 3 + doc/guix.texi | 19 +++++ guix/build-system/godot.scm | 122 +++++++++++++++++++++++++++++ guix/build/godot-build-system.scm | 123 ++++++++++++++++++++++++++++++ 4 files changed, 267 insertions(+) create mode 100644 guix/build-system/godot.scm create mode 100644 guix/build/godot-build-system.scm diff --git a/Makefile.am b/Makefile.am index c4ccee65f1..283e2d7b7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ # Copyright © 2019 Efraim Flashner # Copyright © 2021 Chris Marusich # Copyright © 2021 Andrew Tropin +# Copyright © 2021 Vinicius Monego # # This file is part of GNU Guix. # @@ -148,6 +149,7 @@ MODULES = \ guix/build-system/copy.scm \ guix/build-system/glib-or-gtk.scm \ guix/build-system/gnu.scm \ + guix/build-system/godot.scm \ guix/build-system/guile.scm \ guix/build-system/haskell.scm \ guix/build-system/julia.scm \ @@ -204,6 +206,7 @@ MODULES = \ guix/build/gnu-bootstrap.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ + guix/build/godot-build-system.scm \ guix/build/guile-build-system.scm \ guix/build/maven-build-system.scm \ guix/build/minetest-build-system.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 34e75156eb..d1b5a365ea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -100,6 +100,7 @@ Copyright @copyright{} 2021 Josselin Poiret@* Copyright @copyright{} 2021 Andrew Tropin@* Copyright @copyright{} 2021 Sarah Morgensen@* Copyright @copyright{} 2021 Josselin Poiret@* +Copyright @copyright{} 2021 Vinicius Monego@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -8324,6 +8325,24 @@ specified with the @code{#:glib} parameter. Both phases are executed after the @code{install} phase. @end defvr +@defvr {Scheme Variable} godot-build-system +This variable is exported by @code{(guix build-system godot)}. It implements +the more or less standard build procedure used by Godot games. + +Projects may place @file{project.godot} in a subdirectory. This can be passed +to @code{#:project-directory}. It defaults to the source root. + +Many projects do not ship with @file{exports_preset.cfg}. In that case, a +custom template is created. If that file exists already, it is preferred. +The name of the target preset is variable and can be specified with +@code{#:export-name}. Defaults to ``Linux/X11'' which is used in the custom +template. + +It further creates a wrapper script in @code{bin/} which can be used to launch +the game. The filename is configured by @code{#:game} and should be set to +the name of the package. Desktop files must be created or copied manually. +@end defvr + @defvr {Scheme Variable} guile-build-system This build system is for Guile packages that consist exclusively of Scheme code and that are so lean that they don't even have a makefile, let alone a diff --git a/guix/build-system/godot.scm b/guix/build-system/godot.scm new file mode 100644 index 0000000000..510d33c86e --- /dev/null +++ b/guix/build-system/godot.scm @@ -0,0 +1,122 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Vinicius Monego +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system godot) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix memoization) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix monads) + #:use-module (guix search-paths) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%godot-build-system-modules + default-godot + godot-build + godot-build-system)) + +(define (default-godot) + "Return the default Godot package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((module (resolve-interface '(gnu packages game-development)))) + (module-ref module 'godot))) + +(define %godot-build-system-modules + ;; Build-side modules imported by default. + `((guix build godot-build-system) + ,@%gnu-build-system-modules)) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (godot (default-godot)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + (define private-keywords + '(#:target #:godot #:inputs #:native-inputs)) + + (and (not target) ;XXX: no cross-compilation + (bag + (name name) + (system system) + (host-inputs `(,@(if source + `(("source" ,source) + ("godot-headless" ,godot "headless")) + '()) + ,@inputs + + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages))) + (build-inputs `(("godot" ,godot) + ,@native-inputs)) + (outputs outputs) + (build godot-build) + (arguments (strip-keyword-arguments private-keywords arguments))))) + +(define* (godot-build name inputs + #:key + source + (phases '%standard-phases) + (configure-flags ''()) + (game "Game") + (project-directory ".") + (export-name "Linux/X11") + (outputs '("out")) + (output "out") + (search-paths '()) + (system (%current-system)) + (guile #f) + (imported-modules %godot-build-system-modules) + (modules '((guix build godot-build-system) + (guix build utils)))) + "Build SOURCE using GODOT, and with INPUTS." + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + (godot-build #:name #$name + #:source #+source + #:configure-flags #$configure-flags + #:game #$game + #:project-directory #$project-directory + #:export-name #$export-name + #:system #$system + #:phases #$phases + #:outputs #$(outputs->gexp outputs) + #:output #$output + #:game #$game + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs #$(input-tuples->gexp inputs))))) + + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + system #:graft? #f))) + (gexp->derivation name builder + #:system system + #:guile-for-build guile))) + +(define godot-build-system + (build-system + (name 'godot) + (description "The Godot build system") + (lower lower))) diff --git a/guix/build/godot-build-system.scm b/guix/build/godot-build-system.scm new file mode 100644 index 0000000000..5c25111540 --- /dev/null +++ b/guix/build/godot-build-system.scm @@ -0,0 +1,123 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Vinicius Monego +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build godot-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 match) + #:use-module (ice-9 format) + #:use-module (ice-9 ftw) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + godot-build)) + +(define* (configure #:key project-directory #:allow-other-keys) + + ;; Projects may have the 'project.godot' file in different directories. The + ;; project-directory key contains the path string to the directory where it + ;; is located. + + (chdir project-directory) + (setenv "HOME" (getcwd)) + + ;; Not all projects ship with export_presets.cfg because it may contain + ;; confidential information such as CI keys. In that case, we check if + ;; this file exists, and if it doesn't we use this generic template below. + ;; There is ongoing effort to separate the keys from that file. See: + ;; https://github.com/godotengine/godot-demo-projects/issues/329 and + ;; https://github.com/godotengine/godot/pull/35930. Until that is fixed and + ;; developers start to provide the file, we have to use our own template. + + (let ((export-presets "export_presets.cfg")) + (when (not (file-exists? export-presets)) + (with-output-to-file export-presets + (lambda () + (display + "[preset.0] + +name=\"Linux/X11\" +platform=\"Linux/X11\" +runnable=true +custom_features=\"\" +export_filter=\"all_resources\" +include_filter=\"\" +exclude_filter=\"\" +export_path=\"\" +patch_list=PoolStringArray( ) +script_export_mode=1 +script_encryption_key=\"\" + +[preset.0.options] + +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +texture_format/no_bptc_fallbacks=true +binary_format/64_bits=false +binary_format/embed_pck=false +custom_template/release=\"\" +custom_template/debug=\"\"")))))) + +(define* (build #:key inputs game export-name #:allow-other-keys) + (let ((godot (assoc-ref inputs "godot-headless"))) + (invoke (string-append godot "/bin/godot_server") + "--export-pack" export-name (string-append game ".pck") + "project.godot"))) + +(define* (install #:key inputs outputs game #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share")) + (data (string-append share "/" game)) + (desktop (string-append share "/applications"))) + + ;; Install the binary file. + (install-file (string-append game ".pck") data) + (mkdir-p bin) + (call-with-output-file (string-append bin "/" game) + (lambda (port) + (format port + "#!/bin/sh~@ + exec ~a/bin/godot --main-pack ~a/~a.pck~%" + (assoc-ref inputs "godot") data game) + (chmod port #o755))) + + ;; Install desktop file[s]. + (mkdir-p desktop) + (for-each (lambda (file) + (display file) + (copy-file file (string-append + desktop "/" + (car (last-pair + (string-split file #\/)))))) + (find-files "." "\\.desktop$")))) + +(define %standard-phases + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (replace 'configure configure) + (replace 'build build) + (delete 'check) + (replace 'install install))) + +(define* (godot-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given Godot package, applying all of PHASES in order." + (apply gnu:gnu-build #:inputs inputs #:phases phases args)) From patchwork Tue Dec 21 23:55:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35566 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 9A54927BBE9; Tue, 21 Dec 2021 23:57: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,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 C997A27BBEB for ; Tue, 21 Dec 2021 23:57:15 +0000 (GMT) Received: from localhost ([::1]:53344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0M-0001aY-SS for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0001Z9-H3 for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0002s6-7a for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0B-0005ra-7P for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 2/6] gnu: superstarfighter: Use godot-build-system. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013100022436 (code B ref 48952); Tue, 21 Dec 2021 23:57:03 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:40 +0000 Received: from localhost ([127.0.0.1]:56202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozn-0005pn-Sb for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozl-0005pY-NB for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:38 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0DF3B240104 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640130992; bh=kfgI+CY+Ulp7UNlpmRrlYeXQR0mnJ6C6HhjH5LXhYyE=; h=From:To:Cc:Subject:Date:From; b=gxWNnNIWB6olgaMIkDe42th7uqFi0NTSkQKsE2YSDkWCYglNYyq8qslXpGbpPLqbS PJk0edkHawio2WwiZFZD0ZNB8PBuULXHDyx+SbsJqMXth5oOLCKjwBsFcoYLURDNkS yjPXMggMiUtU8Rttu9t/qU0KuuziWn5OkSv7skahulz9UsYzxejCOU7osgKHE/sX8m cmQ4NfOBtM80MkLsaegkTTdX3kai0l/22BkTJt/ZWSer3ChoRe5A32/LlS5RHMHe/d vL0yRrEAxb+rWGxLo9zq0zmUFg9ghKcL7qe6l3chPBYCE3eoXSHdZNg/BSUnV0oxei 86wiZMtt5IdLQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJb2hJsz9rwg; Wed, 22 Dec 2021 00:56:31 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:44 +0000 Message-Id: <20211221235548.130808-3-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (superstarfighter)[build-system]: Use godot-build-system. [arguments]: Remove #:tests?. <#:game, #:project-directory>: New fields. <#:phases>: Do not replace configure, build and install. Add phase 'install-desktop-file after 'install. --- gnu/packages/games.scm | 54 +++++++++--------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6258d65f97..a701f7aa94 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Christopher Baines +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -209,6 +210,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system godot) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -2562,59 +2564,25 @@ modify quests for the Solarus engine."))) (commit "32521f467616bb390e3929d07e1936ff43fe64da"))) (file-name (git-file-name name version)) (sha256 + (base32 "1ckghzrfgvk9z1n5f4ivnamm6s8h9sbv0a3aq9pp4a3yrhkgld0k")))) - (build-system gnu-build-system) + (build-system godot-build-system) (arguments - `(#:tests? #f ;there are no tests + `(#:game ,name + #:project-directory "godot" #:phases (modify-phases %standard-phases - (replace 'configure - (lambda _ - (chdir "godot") - (setenv "HOME" (getcwd)) - (with-output-to-file "export_presets.cfg" - (lambda () - (display - "[preset.0] -name=\"Guix\" -platform=\"Linux/X11\" -runnable=true -[preset.0.options]"))) - #t)) - (replace 'build - (lambda _ - (let ((godot (assoc-ref %build-inputs "godot-headless"))) - (invoke (string-append godot "/bin/godot_server") - "--export-pack" "Guix" - "superstarfighter.pck" "project.godot")) - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-after 'install 'install-desktop-file + (lambda* (#:key inputs outputs game #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (share (string-append out "/share")) - (data (string-append share "/superstarfighter")) - (icons (string-append share "/icons/hicolor/256x256/apps"))) - (install-file "superstarfighter.pck" data) - (mkdir-p bin) - (call-with-output-file (string-append bin "/superstarfighter") - (lambda (port) - (format port - "#!/bin/sh~@ - exec ~a/bin/godot --main-pack ~a/superstarfighter.pck~%" - (assoc-ref inputs "godot") - data) - (chmod port #o755))) - (mkdir-p icons) - (copy-file "icon.png" (string-append icons "/" ,name ".png")) + (share (string-append out "/share"))) (make-desktop-entry-file - (string-append share "/applications/" ,name ".desktop") + (string-append share "/applications/" game ".desktop") #:name "SuperStarfighter" #:comment "Fast-paced arcade combat game" #:exec ,name #:icon ,name - #:categories '("Game" "ArcadeGame"))) - #t))))) + #:categories '("Game" "ArcadeGame")))))))) (native-inputs `(("godot-headless" ,godot "headless"))) (inputs From patchwork Tue Dec 21 23:55:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35564 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 F0EB527BBEA; Tue, 21 Dec 2021 23:57:15 +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,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 855CA27BBEA for ; Tue, 21 Dec 2021 23:57:15 +0000 (GMT) Received: from localhost ([::1]:53436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0M-0001dP-M0 for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0001ZD-UC for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0002sB-Km for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0B-0005rh-Ku for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 3/6] gnu: Add librerama. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013100422460 (code B ref 48952); Tue, 21 Dec 2021 23:57:03 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:44 +0000 Received: from localhost ([127.0.0.1]:56206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozs-0005qC-8t for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:44 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozq-0005pd-7C for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 8DE08240103 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640130996; bh=/Di7QMfkENYSzWVi61mPzZI12o6xFHZrAOeUitaXk2w=; h=From:To:Cc:Subject:Date:From; b=g7A3M2TMn/Tj2fUaUvLSt7lo6KWAXFkTQqYzrZttfdnuXnGrrw7EN+jDtC2tDWHAX QBhcej/rjrYxDUFLNda/wQLpplzECO8UEiNGrfy95WgqHi+WF42IYo17KaQi50S08r /ggeNfT0Chu8rqGDEniCJXkoEfp0eKSXhbawp1upZfWcpGzvdBJsDMNJX2Uau53MdK nz4IRG9JtsUVqeppK7IF1py6Ym3DrjAXHTVsn3Mpzp1SVL4oix40lSGtUEchKpKBON mVJB4PV0ftvt4bAW3lVS7wcE32nIv4HpOuihiuV4CJzQDHmkntTbZmLZ8fDjV4EKn5 ui94FfbgLr3bA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJg23klz9rwg; Wed, 22 Dec 2021 00:56:35 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:45 +0000 Message-Id: <20211221235548.130808-4-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (librerama): New variable. --- gnu/packages/games.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a701f7aa94..7358630dba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2595,6 +2595,33 @@ available, as well as a single-player mode with AI-controlled ships.") (license (list license:expat ; game license:silofl1.1)))) ; fonts +(define-public librerama + (package + (name "librerama") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/librerama/librerama") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1am88cilrjhcpgfdsrz2z31k1dgmhiqypaspaparbzk0dday2i4j")))) + (build-system godot-build-system) + (arguments + `(#:game ,name + #:export-name "GNU/Linux / *BSD - 64 Bits")) + (home-page "https://yeldham.itch.io/librerama") + (synopsis "Fast-paced arcade collection of mini-games") + (description + "Librerama is an arcade compilation of small, fast-paced games, with the +overall objective being to play a series of mini-games (here referred as +\"nanogames\") which progressively increase in speed and difficulty.") + (license (list license:gpl3+ ; game + license:cc-by-sa4.0 ; assets + license:silofl1.1)))) ; fonts + (define %ufoai-commit "a542a87a891f96b1ab2c44d35b2f6f16859a5019") (define %ufoai-revision "0") (define %ufoai-version (git-version "2.6.0_dev" %ufoai-revision %ufoai-commit)) From patchwork Tue Dec 21 23:55:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35567 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 EC5D127BBE9; Tue, 21 Dec 2021 23:57: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,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 A828E27BBEA for ; Tue, 21 Dec 2021 23:57:16 +0000 (GMT) Received: from localhost ([::1]:53432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0N-0001cW-R9 for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0C-0001ZV-AF for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0C-0002sI-17 for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0C-0005rp-0o for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 4/6] gnu: Add material-maker. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013101322489 (code B ref 48952); Tue, 21 Dec 2021 23:57:03 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:53 +0000 Received: from localhost ([127.0.0.1]:56210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozx-0005qV-Is for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:49793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozv-0005q0-97 for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 44B5D240027 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640131001; bh=fRvNFofTBiOnqZwqShp6t87qBWRGyImZjZ4yW+OqOwE=; h=From:To:Cc:Subject:Date:From; b=PCD+TL+aBzNF7/U6420toHJ2c6F7GKByk5U7IZ7FjvjV37auixr3ikMGxEH4f6nWC SZcSOsiIJJU8/IUKNqdL/fSKfmxSnlsKvsbnIbnNHsh+fUhDnmofga8nan4px2/mF4 jYKo74U6ti39SxYNbt3JOnhO6v1YOXI1IiHD4QAtOF2qiCEVuTJ+VJxPoKFW5fYJ7n F91tpKHA5WJBJgXvZmvL5YndSQrfC4s0dfCyTebosrw1AQBmNLEzQJ2Xzxd8kpft16 3s1c3gpEh42wZaMouA6rWjMLyWGdvSI9ngTcUCm9bGwyRmESgENXjwzLsQLiAcHHP3 41gvy+JkrEwVw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJm09qlz6tm4; Wed, 22 Dec 2021 00:56:39 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:46 +0000 Message-Id: <20211221235548.130808-5-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (material-maker): New variable. --- gnu/packages/game-development.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 305c2c2819..f0096a4c59 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020-2021 James Smith ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Andy Tai +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system godot) #:use-module (guix build-system python) #:use-module (guix build-system scons) #:use-module (gnu packages) @@ -622,6 +624,29 @@ development of visual novels, written on top of Guile-SDL2. It is still experimental.") (license license:lgpl3+))) +(define-public material-maker + (package + (name "material-maker") + (version "0.97") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/RodZill4/material-maker") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06y4kaknrwkvwgznlyql9c5f5sjr32fadzraww3g7vcx5y240cr0")))) + (build-system godot-build-system) + (arguments + `(#:game ,name)) + (home-page "https://www.materialmaker.org/") + (synopsis "Procedural textures authoring and 3D model painting tool") + (description + "Material Maker is a tool based on Godot Engine that can be used to +create textures procedurally and paint 3D models.") + (license license:expat))) + (define-public sfml (package (name "sfml") From patchwork Tue Dec 21 23:55:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35569 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 BEE1927BBEA; Tue, 21 Dec 2021 23:57:25 +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,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 704CF27BBE9 for ; Tue, 21 Dec 2021 23:57:25 +0000 (GMT) Received: from localhost ([::1]:54834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0W-0002B1-KK for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0C-0001aD-NX for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44677) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0C-0002sO-E2 for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0C-0005rw-Df for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 5/6] gnu: Add pixelorama. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013101322495 (code B ref 48952); Tue, 21 Dec 2021 23:57:04 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:53 +0000 Received: from localhost ([127.0.0.1]:56214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzp01-0005qg-7W for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:53 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozy-0005qK-Ll for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:51 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 09E19240103 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640131005; bh=OVufmb72q/bgA9nqfFWrdf8T0bdLKhxiYDzUKUR5fxI=; h=From:To:Cc:Subject:Date:From; b=TdMqGuhMJK9TAMBdfGRZAsT7I4D3Obza/h0+LHe4QlDz/XT/etm75f8VTEF9K2jS1 nXCTtmpgtRRyx5tO2WN+JzWCxrm0OmFGgPasy0NlAdG+MRjd63DUkM92g2xElgExXv h1HpUViyhDJbE6oUgGyCogim06qQomuetvlfkf9SYRIRv3URToNF3EHHRXEOjjF/7N fP2yhypKamRcUgetV4agIO0b+tAFqqGn9QQrJklW0J4/nhpbCsX31GrmzfyQsfhqZ1 OOfracJYapoTv1ADJWPksBwGZSNScn1LGz4HuU4Uq2mIDwgfM2CL5S8sIJney03D4z Z3agJXoiqXpEA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJr148rz6tpX; Wed, 22 Dec 2021 00:56:43 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:47 +0000 Message-Id: <20211221235548.130808-6-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/game-development.scm (pixelorama): New variable. --- gnu/packages/game-development.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f0096a4c59..294c9ccbe9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -647,6 +647,28 @@ experimental.") create textures procedurally and paint 3D models.") (license license:expat))) +(define-public pixelorama + (package + (name "pixelorama") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Orama-Interactive/Pixelorama") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m08lzb3cqbv5k5nqygd22kgq6ihacc4qrsybmys3v1mv694c9wm")))) + (build-system godot-build-system) + (arguments + `(#:game ,name + #:export-name "Linux/X11 64-bit")) + (home-page "https://orama-interactive.itch.io/pixelorama") + (synopsis "2D sprite editor") + (description "Pixelorama is a 2D sprite editor made with Godot engine.") + (license license:expat))) + (define-public sfml (package (name "sfml") From patchwork Tue Dec 21 23:55:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 35568 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 6137127BBEA; Tue, 21 Dec 2021 23:57:25 +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,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 27AF227BBE9 for ; Tue, 21 Dec 2021 23:57:25 +0000 (GMT) Received: from localhost ([::1]:54750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0W-00029G-9n for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 18:57:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0D-0001bD-4n for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0C-0002sY-Qk for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0C-0005s3-QY for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 6/6] gnu: Add lorien. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013101622510 (code B ref 48952); Tue, 21 Dec 2021 23:57:04 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:56 +0000 Received: from localhost ([127.0.0.1]:56218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzp04-0005r0-Fd for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:56 -0500 Received: from mout01.posteo.de ([185.67.36.65]:42265) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzp02-0005qW-TO for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:55 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 46851240026 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640131009; bh=YYhegRZuB7OwOF8jDXyZQSyoHlekt6cHRy0BFwU4hnI=; h=From:To:Cc:Subject:Date:From; b=qmC1qap2llrwZuY1AQhfp9yVc8FzoQDa7PAcc0wVJReXLqQWsrbAVEFQNCtb1ngX7 z7knpL+Zxwtx0ynjk4D1GfHBIJq66KmyYwpdqGZ4CtGMpeSDqC6g4UMqdmuTYBcSD0 gfGXy8j/DnRtHXaVCiPgdjKrjy5T1yXS0mx3kuDGDhmAD92xTMU2MFmf/oC6S8ItSY ki0CTmeqqIc7RtE4qhqwrbEpc8/E9CU3h6fmgrR/Ff8Yp6Jg1R6YgCo5h4OSMVO6JH NjXnEx0SMhx2B+XFqWKqgDaboxi7z8s2uhqBVuLU7hHft5gPJtw2DPy0YXtKP39Mbf orZ2ygCz6HnPg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJw2HwWz6tpZ; Wed, 22 Dec 2021 00:56:48 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:48 +0000 Message-Id: <20211221235548.130808-7-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (lorien): New variable. --- gnu/packages/graphics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 3f83c72599..7c06cd20d8 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -109,6 +109,7 @@ #:use-module (guix build-system copy) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system godot) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system qt) @@ -606,6 +607,35 @@ NOTE: This older version of Blender is the last release that does not require OpenGL 3. It is retained for use with older computers.") (license license:gpl2+))) +(define-public lorien + (package + (name "lorien") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mbrlabs/Lorien") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z185j87qhwhfyahkqywmdazabyf21nb3ywaba0g1dwjrylk72jj")))) + (build-system godot-build-system) + (arguments + `(#:game ,name + #:project-directory "lorien")) + (home-page "https://github.com/mbrlabs/Lorien") + (synopsis "Infinite canvas drawing/whiteboarding") + (description "Lorien is an infinite canvas drawing/note-taking app that is +focused on performance, small savefiles and simplicity. It's not based on +bitmap images like Krita, Gimp or Photoshop; it rather saves brush strokes as +a collection of points and renders them at runtime. It's primarily designed +to be used as a digital notebook and as brainstorming tool. While it can +totally be used to make small sketches and diagrams, it is not meant to +replace traditional art programs that operate on bitmap images. It is +entirely written in the Godot Game Engine") + (license license:expat))) + (define-public goxel (package (name "goxel")