From patchwork Mon Dec 6 07:27:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 34993 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 D016727BBEA; Mon, 6 Dec 2021 07:28:29 +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,SPF_HELO_PASS 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 530A627BBE9 for ; Mon, 6 Dec 2021 07:28:29 +0000 (GMT) Received: from localhost ([::1]:50070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mu8QG-0003Tg-9s for patchwork@mira.cbaines.net; Mon, 06 Dec 2021 02:28:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mu8Pr-0003PM-5K for guix-patches@gnu.org; Mon, 06 Dec 2021 02:28:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mu8Pq-0007WW-Tr for guix-patches@gnu.org; Mon, 06 Dec 2021 02:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mu8Pq-0002oZ-P2 for guix-patches@gnu.org; Mon, 06 Dec 2021 02:28: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: Mon, 06 Dec 2021 07:28:02 +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 Cc: 52233-done@debbugs.gnu.org Received: via spool by 52233-done@debbugs.gnu.org id=D52233.163877567010798 (code D ref 52233); Mon, 06 Dec 2021 07:28:02 +0000 Received: (at 52233-done) by debbugs.gnu.org; 6 Dec 2021 07:27:50 +0000 Received: from localhost ([127.0.0.1]:60440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mu8Pe-0002o5-9X for submit@debbugs.gnu.org; Mon, 06 Dec 2021 02:27:50 -0500 Received: from mail-il1-f172.google.com ([209.85.166.172]:43826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mu8Pb-0002nq-Pu for 52233-done@debbugs.gnu.org; Mon, 06 Dec 2021 02:27:48 -0500 Received: by mail-il1-f172.google.com with SMTP id r2so9242098ilb.10 for <52233-done@debbugs.gnu.org>; Sun, 05 Dec 2021 23:27:47 -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 :cc; bh=tIxfoFpgwM8OLrEj5YrXhneNJg5Y9eTsQ1HaV7eIn1U=; b=1L4rWls+dv2fMpFrdUG2d156w1QPYhAdpOE52jpw5cSGmVOpexyWrnJOyKHuHfP21l /Cscg5qGsmyC2YJu/Anfpt/oi2SPNUuB2Yx7PBOB2/MiGcQ9EUmojxgU3XFTbsr2EsMl +vFF/9VGPU+OaEm9qNvZ1M8FRoYOfeO6qXq5UrjGVPIg48tmAq7E/GZdpwWJK/dgsQHJ uQpCo0VOT/rI1jaEcO4kQLBxLZLr5j7BipU9OetimmhTQtoYeW1rFqQYcbS3jW/exkTO TY/2/sTABHSFQvTPZJC7xw7FPPsCA/yuREVbTefvngcqv0kgeKsLx+6AgvEERHKl8YnZ VHEw== 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:cc; bh=tIxfoFpgwM8OLrEj5YrXhneNJg5Y9eTsQ1HaV7eIn1U=; b=BpZ1F7042z8mD1rIu9r5TTSOE1+CfagJ1oNLD1X9RunqISjO3hHql1cqTv6/UifTzP WqNPQxsiY5z44XuWHozVv5B4Mo9Zp8DJkLZPLoSwsXB2uKwsH/WHtUMpdugFFGHDW8oE QpDtP5OaWI6xo84dKBpAquWzGROHM4IxrUXsBh8Igi9dDGoQw8w+UiVFlljef0ucuJLg ghnSTXWamRtKYNoerrPNWNSTGig/SKbqHezgYQzhpvZnfJEBBLujVu6vnfBkg79I+8uu uwGDEmYfB5oo8L1pVPU3DK8Vi9VfYTbqbTq+nVrobOAj2/P2Wp5ByAgPdjuRXvrpnyQx omtA== X-Gm-Message-State: AOAM533MnoW3AexbmTdnQ8eN84/hy6Mt6v1ld0dWgEyLHJeo6DpfP6Ki D/kfzAFi1BMe95LxPwpPO00HI3hYq+3gjVtyW9T4rOfG X-Google-Smtp-Source: ABdhPJwN432NAZCIYSr0DImzvF8PTHSYFBCoZv0QwXQlHObKfHBkX42lHauYsNgos7dk2ma1USvQhVXEIeZu4VcDZHc= X-Received: by 2002:a05:6e02:1285:: with SMTP id y5mr29876301ilq.119.1638775662065; Sun, 05 Dec 2021 23:27:42 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Andy Tai Date: Sun, 5 Dec 2021 23:27:05 -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 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 619328a56e451b218733dd8d454dccbae2d89dcf Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sun, 5 Dec 2021 23:19:31 -0800 Subject: [PATCH] gnu: godot: Update to 3.4. To: guix-patches@gnu.org * gnu/packages/game-development.scm (godot): Update to 3.4. --- gnu/packages/game-development.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index a060dc94dc..ed733e317f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1846,7 +1846,7 @@ (define-public openmw (define-public godot (package (name "godot") - (version "3.2.3") + (version "3.4") (source (origin (method git-fetch) (uri (git-reference @@ -1855,7 +1855,7 @@ (define-public godot (file-name (git-file-name name version)) (sha256 (base32 - "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v")) + "0y542zla6msgxf31rd0349d9j3ya7f3njnwmmrh8lmzfgxx86qbx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1870,19 +1870,23 @@ (define-public godot "assimp" "certs" "cvtt" + "embree" "enet" "etc2comp" "fonts" "glad" "jpeg-compressor" "libsimplewebm" + "minimp3" "miniupnpc" "minizip" "misc" "nanosvg" + "oidn" "pvrtccompressor" "recastnavigation" "squish" + "stb_rect_pack" "tinyexr" "vhacd" "xatlas"))) @@ -1950,6 +1954,19 @@ (define-public godot (wrap-program (string-append out "/bin/godot") `("PATH" ":" prefix (,(string-append zenity "/bin"))))) #t)) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; FIXME: Mesa tries to dlopen libudev.so.0 and fails. Pending a + ;; fix of the mesa package we wrap the pcb executable such that + ;; Mesa can find libudev.so.0 through LD_LIBRARY_PATH. + ;; also append ld path for pulseaudio and alsa-lib + (let* ((out (assoc-ref outputs "out")) + (udev_path (string-append (assoc-ref inputs "udev") "/lib")) + (pulseaudio_path (string-append (assoc-ref inputs "pulseaudio") "/lib")) + (alas_lib_path (string-append (assoc-ref inputs "alsa-lib") "/lib"))) + (wrap-program (string-append out "/bin/godot") + `("LD_LIBRARY_PATH" ":" prefix (,udev_path ,pulseaudio_path ,alas_lib_path)))) + #t)) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1986,6 +2003,7 @@ (define-public godot ("opusfile" ,opusfile) ("pcre2" ,pcre2) ("pulseaudio" ,pulseaudio) + ("udev" ,eudev) ;FIXME: required by mesa ("wslay" ,wslay) ("zenity" ,zenity) ("zstd" ,zstd "lib"))) base-commit: 764be13ee62eff202ee2dd711167d0bfa4d2ec3f -- 2.34.0