From patchwork Thu Dec 9 23:14:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 35096 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 04E6027BBEB; Thu, 9 Dec 2021 23:16:24 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,T_SPF_HELO_PERMERROR, URIBL_BLOCKED autolearn=ham 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 CE86827BBEA for ; Thu, 9 Dec 2021 23:16:22 +0000 (GMT) Received: from localhost ([::1]:42604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvSeD-0000wL-QB for patchwork@mira.cbaines.net; Thu, 09 Dec 2021 18:16:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvSe4-0000vn-VK for guix-patches@gnu.org; Thu, 09 Dec 2021 18:16:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvSdu-0006Jz-Bc for guix-patches@gnu.org; Thu, 09 Dec 2021 18:16:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvSdu-0005LZ-1Y for guix-patches@gnu.org; Thu, 09 Dec 2021 18:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52233] [PATCH] gnu: godot: Update to 3.4 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Dec 2021 23:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52233 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , Nicolas Goaziou , 52233-done@debbugs.gnu.org Received: via spool by 52233-done@debbugs.gnu.org id=D52233.163909170520478 (code D ref 52233); Thu, 09 Dec 2021 23:16:01 +0000 Received: (at 52233-done) by debbugs.gnu.org; 9 Dec 2021 23:15:05 +0000 Received: from localhost ([127.0.0.1]:44988 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvScy-0005KD-W6 for submit@debbugs.gnu.org; Thu, 09 Dec 2021 18:15:05 -0500 Received: from mail-io1-f52.google.com ([209.85.166.52]:41525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvScw-0005JO-9f for 52233-done@debbugs.gnu.org; Thu, 09 Dec 2021 18:15:03 -0500 Received: by mail-io1-f52.google.com with SMTP id y16so8524636ioc.8 for <52233-done@debbugs.gnu.org>; Thu, 09 Dec 2021 15:15:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=q0LaxDRelaOrIOmpHHvXXHrBxvc83Tus7qYupwFDydY=; b=d/VJXBvLLObPwzf9tNw02AQ4VlBufo/ErDOqzSJNYnQ+/coI2c0aN5QrfUNT3R//Yy YCr+zS+fAM4NkTRF6LlGuxE9aQu9VDzEI3j90kaCRKW51QTWjb6ssnd0/6CiJI4J0r+i JNbD2BWLmTBJ/pC4bXXlojIFuXzrHd3zKncWqNpEDkULo4sZ93/6qx821MGj9A8VC3aK rqRpZvMdeGS27lEhp/pdHsxOBz9MfgKSZ9l4llZypGAju/4hWseOMg/QxfsIXYjtc2nQ m0IPPHsn+i6J8ovqOJf0sceooZn1jaPCRZzCg/wEEcq4bANr+qEJO45z3VacKBoCC2n6 qK2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=q0LaxDRelaOrIOmpHHvXXHrBxvc83Tus7qYupwFDydY=; b=DzmTMx9g3BZWgJb9ijp4wzkOQ2yKUJ5UZa25Wv4CnwJnqRIZtWe7uBUHMHKAdLJ6bB uZANKlKuIM4YmrzZfiWxLL1wGfZrg7A83WA1XQqC0vpt5G7/YaA/EoE+uStoz82FOJg+ oIQ9FaPzxFQ8gBFzt+EKN8RMH9uZN+8QwG2gbWJ7IDThRc5p3i1Z2HJR3yyDSFgATdPI KsxAA7hKSWv4P86KJuWpop3P7Odqm41C20jMmf+lJgp5oyWhLAjBMJnPO/YSKjxj9Prj G8aTaCnFp3HwjMDaZgA+yEqmJr/XB27XGYVYpES9Hg91GNwb0YDak4NugZlKBWbAPWmC JLGQ== X-Gm-Message-State: AOAM533bLUikis5dJv0od28qpRRKWisHsvAOuE+xKMylDMoye8IdWfxW 25C5ohAJCGw1zYHSmQ5BcF9Xm7zfqceMAgTEDcg= X-Google-Smtp-Source: ABdhPJw2y+xzMOOqNPBmYU7cGgtQNOpuQkbNAoynXq7njiypDmofcdWs6NyswVOC7zeK9Qo4w+4tXGeLBKyj49P1EVQ= X-Received: by 2002:a05:6638:4113:: with SMTP id ay19mr14196156jab.149.1639091696635; Thu, 09 Dec 2021 15:14:56 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Andy Tai Date: Thu, 9 Dec 2021 15:14:20 -0800 Message-ID: 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 with the attached patch to superstarfighter, which updates it to the next version (master tip), the game can run, with audio. What should I do now? with these two patches but the issue is marked "done", do I have to file two new issues for these two patches? Help to make this submission easier highly appreciated. On Sun, Dec 5, 2021 at 11:27 PM Andy Tai wrote: > > updated patch: > > godot built from this can run the master tip of the superstarfighter > git (checked out by itself) successfully > > However the superstarfighter in guix still aborts. > > So that still needs more investigation as to what is going on there. > > I am using Fedora as the host OS, with guix on it. > > > On Thu, Dec 2, 2021 at 11:25 AM Leo Famulari wrote: > > > > On Thu, Dec 02, 2021 at 12:07:34AM -0800, Andy Tai wrote: > > > I just built superstarfighter with godot 3.4 and I was able to start > > > the game on my PC. So I guess it may run successfully or fail due to > > > difference in hardware configurations. Just a data point. > > > > I'm curious, was that on Guix System? Or Guix on another distro? I > > tested with Guix on Debian. From 1b9a3128693d7fe2604643f20a844897cb10e7a0 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 9 Dec 2021 15:08:33 -0800 Subject: [PATCH] gnu: superstarfighter: Update to 0.6.5. To: guix-patches@gnu.org * gnu/packages/games.scm (superstarfighter): Update to 0.6.5. --- gnu/packages/games.scm | 143 +++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 819a832baf..ec8a2e024c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2582,81 +2582,82 @@ (define-public solarus-quest-editor modify quests for the Solarus engine."))) (define-public superstarfighter - (package - (name "superstarfighter") - (version "0.6.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/notapixelstudio/superstarfighter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fly63yf5ls1xwm15if4lxwy67wi84k4gvjllljpykrl18vw2y0y")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ;there are no tests - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (chdir "godot") - (setenv "HOME" (getcwd)) - (with-output-to-file "export_presets.cfg" - (lambda () - (display - "[preset.0] + (let ((commit "32521f467616bb390e3929d07e1936ff43fe64da")) + (package + (name "superstarfighter") + (version "0.6.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/notapixelstudio/superstarfighter") + (commit commit))) + (file-name (string-append name "-" version "-" commit "-checkout")) + (sha256 + (base32 "1ckghzrfgvk9z1n5f4ivnamm6s8h9sbv0a3aq9pp4a3yrhkgld0k")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #: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) - (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")) - (make-desktop-entry-file - (string-append share "/applications/" ,name ".desktop") - #:name "SuperStarfighter" - #:comment "Fast-paced arcade combat game" - #:exec ,name - #:icon ,name - #:categories '("Game" "ArcadeGame"))) - #t))))) - (native-inputs - `(("godot-headless" ,godot "headless"))) - (inputs - `(("godot" ,godot))) - (home-page "https://notapixel.itch.io/superstarfighter") - (synopsis "Fast-paced local multiplayer arcade game") - (description "In SuperStarfighter, up to four local players compete in a -2D arena with fast-moving ships and missiles. Different game types are -available, as well as a single-player mode with AI-controlled ships.") - (license (list license:expat ; game - license:silofl1.1)))) ; fonts + #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) + (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")) + (make-desktop-entry-file + (string-append share "/applications/" ,name ".desktop") + #:name "SuperStarfighter" + #:comment "Fast-paced arcade combat game" + #:exec ,name + #:icon ,name + #:categories '("Game" "ArcadeGame"))) + #t))))) + (native-inputs + `(("godot-headless" ,godot "headless"))) + (inputs + `(("godot" ,godot))) + (home-page "https://notapixel.itch.io/superstarfighter") + (synopsis "Fast-paced local multiplayer arcade game") + (description "In SuperStarfighter, up to four local players compete in a + 2D arena with fast-moving ships and missiles. Different game types are + available, as well as a single-player mode with AI-controlled ships.") + (license (list license:expat ; game + license:silofl1.1))))) ; fonts (define %ufoai-commit "a542a87a891f96b1ab2c44d35b2f6f16859a5019") (define %ufoai-revision "0") base-commit: 4665e6a73b233e3755ffbba7ecfdbbb53dae87bd -- 2.34.0