From unknown Sat Jun 21 03:25:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71067] [PATCH 0/2] Update godot-lts to 3.5.3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 May 2024 14:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71067@debbugs.gnu.org Cc: ngraves@ngraves.fr X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17161305788305 (code B ref -1); Sun, 19 May 2024 14:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 May 2024 14:56:18 +0000 Received: from localhost ([127.0.0.1]:36570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8hxS-00029s-2U for submit@debbugs.gnu.org; Sun, 19 May 2024 10:56:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:55190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8hxP-00029l-LK for submit@debbugs.gnu.org; Sun, 19 May 2024 10:56:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8hxL-0007gJ-5k for guix-patches@gnu.org; Sun, 19 May 2024 10:56:11 -0400 Received: from 17.mo581.mail-out.ovh.net ([188.165.35.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s8hxJ-0005gx-Lb for guix-patches@gnu.org; Sun, 19 May 2024 10:56:10 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.108.25.157]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4Vj3ft0NzXz1F91 for ; Sun, 19 May 2024 14:56:06 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zvrlt (unknown [10.110.96.9]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A971A1FE68; Sun, 19 May 2024 14:56:04 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-zvrlt with ESMTPSA id upo0NQQTSmZHSAAAuOiC9A (envelope-from ); Sun, 19 May 2024 14:56:04 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S00232b3b0c4-2345-4980-b902-0ac0b347677f, 8F9042FB94FE21B7310FA1A939C635510802798D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves Date: Sun, 19 May 2024 16:55:20 +0200 Message-ID: <20240519145601.9772-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 1370501665070113506 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehkedgkedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=188.165.35.227; envelope-from=ngraves@ngraves.fr; helo=17.mo581.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Nicolas Graves (2): gnu: godot-lts: Update to 3.5.3. gnu: godot-lts: Improve package style. gnu/packages/game-development.scm | 181 +++++++++++++++--------------- 1 file changed, 92 insertions(+), 89 deletions(-) -- 2.41.0 From unknown Sat Jun 21 03:25:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71067] [PATCH 1/2] gnu: godot-lts: Update to 3.5.3. References: <20240519145601.9772-1-ngraves@ngraves.fr> In-Reply-To: <20240519145601.9772-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 May 2024 16:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71067@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 71067-submit@debbugs.gnu.org id=B71067.171613538912151 (code B ref 71067); Sun, 19 May 2024 16:17:01 +0000 Received: (at 71067) by debbugs.gnu.org; 19 May 2024 16:16:29 +0000 Received: from localhost ([127.0.0.1]:36903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8jD3-00039v-Bd for submit@debbugs.gnu.org; Sun, 19 May 2024 12:16:29 -0400 Received: from 10.mo583.mail-out.ovh.net ([46.105.52.148]:46595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8jD0-00039p-7V for 71067@debbugs.gnu.org; Sun, 19 May 2024 12:16:27 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.139.16]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Vj5RS2C4Rz1Kq0 for <71067@debbugs.gnu.org>; Sun, 19 May 2024 16:16:20 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gfw8h (unknown [10.110.168.145]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 13BE71FD41; Sun, 19 May 2024 16:16:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-gfw8h with ESMTPSA id FQICAtQlSma3dAsA5uFiZg (envelope-from ); Sun, 19 May 2024 16:16:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0044248e9cd-84b2-4c29-b259-2727217d6e97, 8F9042FB94FE21B7310FA1A939C635510802798D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves Date: Sun, 19 May 2024 18:16:05 +0200 Message-ID: <20240519161612.700-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 2725803676589613794 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehkedgleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejuddtieejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/game-development.scm (godot-lts): Update to 3.5.3. [arguments]<#:scons>: Update to scons-python. Remove argument. <#:phases>: Rename phase 'wrap to 'wrap-ld-path, remove mesa-related comment that seems to be fixed. [inputs]: Replace freetype by freetype-with-brotli. Change-Id: Ia83bc33bd0b944342ba413b46f0963d3f2197bf5 --- gnu/packages/game-development.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 5b7852c4eb9..9591fae7f9e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1927,7 +1927,7 @@ (define-public openmw (define-public godot-lts (package (name "godot") - (version "3.4.2") + (version "3.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -1936,7 +1936,7 @@ (define-public godot-lts (file-name (git-file-name name version)) (sha256 (base32 - "1bm9yl995chvx6jwkdia12yjrgwcpzb1r9bmj606q8z264aw2ma5")) + "0zibc6am9axbbm8l57jf2d324a2m44pf6ncp2i4h1b219jjq89l6")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1948,7 +1948,6 @@ (define-public godot-lts (with-directory-excursion "thirdparty" (let* ((preserved-files '("README.md" - "assimp" "certs" "cvtt" "embree" @@ -1966,6 +1965,7 @@ (define-public godot-lts "oidn" "pvrtccompressor" "recastnavigation" + "rvo2" "squish" "stb_rect_pack" "tinyexr" @@ -1977,8 +1977,7 @@ (define-public godot-lts (cons* "." ".." preserved-files))))))))) (build-system scons-build-system) (arguments - `(#:scons ,scons-python2 - #:scons-flags (list "platform=x11" "target=release_debug" + `(#:scons-flags (list "platform=x11" "target=release_debug" ;; Avoid using many of the bundled libs. ;; Note: These options can be found in the SConstruct file. "builtin_bullet=no" @@ -2032,18 +2031,13 @@ (define-public godot-lts ;; Tell the editor where to find zenity for OS.alert(). (wrap-program (string-append out "/bin/godot") `("PATH" ":" prefix (,(string-append zenity "/bin"))))))) - (add-after 'install 'wrap + (add-after 'install 'wrap-ld-path (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 "eudev") "/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)))))) + `("LD_LIBRARY_PATH" ":" prefix (,pulseaudio_path ,alas_lib_path)))))) (add-after 'install 'install-godot-desktop (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2064,7 +2058,7 @@ (define-public godot-lts (inputs (list alsa-lib bullet - freetype + freetype-with-brotli glew glu libtheora @@ -2081,7 +2075,7 @@ (define-public godot-lts opusfile pcre2 pulseaudio - eudev ; FIXME: required by mesa + eudev wslay zenity `(,zstd "lib"))) -- 2.41.0 From unknown Sat Jun 21 03:25:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71067] [PATCH 2/2] gnu: godot-lts: Improve package style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 May 2024 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71067@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 71067-submit@debbugs.gnu.org id=B71067.171613539912172 (code B ref 71067); Sun, 19 May 2024 16:17:02 +0000 Received: (at 71067) by debbugs.gnu.org; 19 May 2024 16:16:39 +0000 Received: from localhost ([127.0.0.1]:36906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8jDC-0003AG-Pz for submit@debbugs.gnu.org; Sun, 19 May 2024 12:16:39 -0400 Received: from 2.mo561.mail-out.ovh.net ([46.105.75.36]:38923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s8jDA-0003AA-Ng for 71067@debbugs.gnu.org; Sun, 19 May 2024 12:16:37 -0400 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.25.136]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Vj5Rg10WLz1F4j for <71067@debbugs.gnu.org>; Sun, 19 May 2024 16:16:31 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-l8l4k (unknown [10.110.113.134]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D7C3A1FD49; Sun, 19 May 2024 16:16:30 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-l8l4k with ESMTPSA id 4czMMN4lSmb5CAAAZ5YPGg (envelope-from ); Sun, 19 May 2024 16:16:30 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G001800573ec-3553-475c-b61b-5d3a69da7953, 8F9042FB94FE21B7310FA1A939C635510802798D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves Date: Sun, 19 May 2024 18:16:06 +0200 Message-ID: <20240519161612.700-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240519161612.700-1-ngraves@ngraves.fr> References: <20240519161612.700-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 2728899900473991906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdehkedgleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddrleehnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejuddtieejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedupdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/game-development.scm (godot-lts): Re-indent and ensure max column length to 79. [arguments]: Use gexp. Change-Id: I0bedb66a4e7e0ebe6242df885f1e687ce3a43ce0 --- gnu/packages/game-development.scm | 166 ++++++++++++++++-------------- 1 file changed, 88 insertions(+), 78 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 9591fae7f9e..03b6f1df8b9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 dan ;;; Copyright © 2023 John Kehayias +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -1972,86 +1973,95 @@ (define-public godot-lts "vhacd" "xatlas"))) (for-each delete-file-recursively - (lset-difference string=? - (scandir ".") - (cons* "." ".." preserved-files))))))))) + (lset-difference + string=? + (scandir ".") + (cons* "." ".." preserved-files))))))))) (build-system scons-build-system) (arguments - `(#:scons-flags (list "platform=x11" "target=release_debug" - ;; Avoid using many of the bundled libs. - ;; Note: These options can be found in the SConstruct file. - "builtin_bullet=no" - "builtin_freetype=no" - "builtin_glew=no" - "builtin_libmpdec=no" - "builtin_libogg=no" - "builtin_libpng=no" - "builtin_libtheora=no" - "builtin_libvorbis=no" - "builtin_libvpx=no" - "builtin_libwebp=no" - "builtin_mbedtls=no" - "builtin_opus=no" - "builtin_pcre2=no" - "builtin_wslay=no" - "builtin_zlib=no" - "builtin_zstd=no") - #:tests? #f ; There are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'scons-use-env - (lambda _ - ;; Scons does not use the environment variables by default, - ;; but this substitution makes it do so. - (substitute* "SConstruct" - (("env_base = Environment\\(tools=custom_tools\\)") - (string-append - "env_base = Environment(tools=custom_tools)\n" - "env_base = Environment(ENV=os.environ)"))))) - ;; Build headless tools, used for packaging games without depending on X. - (add-after 'build 'build-headless - (lambda* (#:key scons-flags #:allow-other-keys) - (apply invoke "scons" - `(,(string-append "-j" (number->string (parallel-job-count))) - "platform=server" ,@(delete "platform=x11" scons-flags))))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (headless (assoc-ref outputs "headless")) - (zenity (assoc-ref inputs "zenity"))) - ;; Strip build info from filenames. - (with-directory-excursion "bin" - (for-each - (lambda (file) - (let ((dest (car (string-split (basename file) #\.)))) - (rename-file file dest))) - (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) - (install-file "godot" (string-append out "/bin")) - (install-file "godot_server" (string-append headless "/bin"))) - ;; Tell the editor where to find zenity for OS.alert(). - (wrap-program (string-append out "/bin/godot") - `("PATH" ":" prefix (,(string-append zenity "/bin"))))))) - (add-after 'install 'wrap-ld-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (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 (,pulseaudio_path ,alas_lib_path)))))) - (add-after 'install 'install-godot-desktop - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (applications (string-append out "/share/applications")) - (icons (string-append out "/share/icons/hicolor"))) - (mkdir-p applications) - (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" - (string-append applications "/godot.desktop")) - (for-each (lambda (icon dest) - (mkdir-p (dirname dest)) - (copy-file icon dest)) - '("icon.png" "icon.svg") - `(,(string-append icons "/256x256/apps/godot.png") - ,(string-append icons "/scalable/apps/godot.svg"))))))))) + (list + ;; Avoid using many of the bundled libs. + ;; Note: These options can be found in the SConstruct file. + #:scons-flags #~(list "platform=x11" "target=release_debug" + "builtin_bullet=no" + "builtin_freetype=no" + "builtin_glew=no" + "builtin_libmpdec=no" + "builtin_libogg=no" + "builtin_libpng=no" + "builtin_libtheora=no" + "builtin_libvorbis=no" + "builtin_libvpx=no" + "builtin_libwebp=no" + "builtin_mbedtls=no" + "builtin_opus=no" + "builtin_pcre2=no" + "builtin_wslay=no" + "builtin_zlib=no" + "builtin_zstd=no") + #:tests? #f ; There are no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'scons-use-env + (lambda _ + ;; Scons does not use the environment variables by default, + ;; but this substitution makes it do so. + (substitute* "SConstruct" + (("env_base = Environment\\(tools=custom_tools\\)") + (string-append + "env_base = Environment(tools=custom_tools)\n" + "env_base = Environment(ENV=os.environ)"))))) + ;; Build headless tools, to package games without depending on X. + (add-after 'build 'build-headless + (lambda* (#:key scons-flags #:allow-other-keys) + (apply invoke "scons" + `(,(string-append + "-j" (number->string (parallel-job-count))) + "platform=server" + ,@(delete "platform=x11" scons-flags))))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (headless (assoc-ref outputs "headless")) + (zenity (assoc-ref inputs "zenity"))) + ;; Strip build info from filenames. + (with-directory-excursion "bin" + (for-each + (lambda (file) + (let ((dest (car (string-split (basename file) #\.)))) + (rename-file file dest))) + (find-files "." "godot.*\\.x11\\.opt\\.tools.*")) + (install-file "godot" (string-append out "/bin")) + (install-file "godot_server" + (string-append headless "/bin"))) + ;; Tell the editor where to find zenity for OS.alert(). + (wrap-program (string-append out "/bin/godot") + `("PATH" ":" prefix (,(string-append zenity "/bin"))))))) + (add-after 'install 'wrap-ld-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (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 + (,pulseaudio_path ,alas_lib_path)))))) + (add-after 'install 'install-godot-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (applications (string-append out "/share/applications")) + (icons (string-append out "/share/icons/hicolor"))) + (mkdir-p applications) + (copy-file "misc/dist/linux/org.godotengine.Godot.desktop" + (string-append applications "/godot.desktop")) + (for-each (lambda (icon dest) + (mkdir-p (dirname dest)) + (copy-file icon dest)) + '("icon.png" "icon.svg") + `(,(string-append icons "/256x256/apps/godot.png") + ,(string-append icons + "/scalable/apps/godot.svg"))))))))) (outputs '("out" "headless")) (native-inputs (list pkg-config)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 23 23:10:56 2024 Received: (at control) by debbugs.gnu.org; 24 Jun 2024 03:10:56 +0000 Received: from localhost ([127.0.0.1]:35473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLa6Z-0000Hz-LC for submit@debbugs.gnu.org; Sun, 23 Jun 2024 23:10:56 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:58866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLa6X-0000Hd-9Z for control@debbugs.gnu.org; Sun, 23 Jun 2024 23:10:53 -0400 Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6b5136965a7so17447406d6.1 for ; Sun, 23 Jun 2024 20:10:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719198586; x=1719803386; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=TMe64CptykeNv8ITUj/F5F00QTcuMWFLfyKy2oJPgvc=; b=mFcJtLNYFVMrYq3jvrbS47U/4OoTyUOppn4kQR8GFXfjHWuALQfGVxPz+7a6Pay7ww dY+mEQ34N9ClnEYKCMoEPUucIprZcf+5OOdXOH7QMEsXn4S9xSQKFV99m1OPqD4weWek uB+/TiU7MpCwCxsXB4NGnQHNVxFUzoBnz0Qcpn4kzIdVnV6RDdDLq5loboEl7v+S4uTx r+JxNOYZD+sLa0zGHtYXKRGyNQSqzxyGVHgWW6GmI713rSxjzVuMQJC9gh5+zZUyWgiL CNwV9iYVfQFavuF9LgFR5gYOhOyGjx1E+GPq1vVxrXMA0UEOdcFmjoI6asSYoLi4SHL7 AXHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719198586; x=1719803386; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TMe64CptykeNv8ITUj/F5F00QTcuMWFLfyKy2oJPgvc=; b=ZMdB5tf1MrSj+muB8MewrktlEeMQRJGqCZikGjoM5OV/G3Tm54PbPghYnysevXDI5F O31ujVPiZ+5e/QJj6080z10lP9jZQ3DyApURs6kMdH5wo5QkyoIG5GmOXgP15hs6XPoO OEHJ5TfGZ62z5UUgURY0awdvolenBQ+X3vLBnsX8wYOjOuGH0n8Ms47cX2UHwLH0wbmb 7vsb8nLRXtKifLMfuMFm22wUR+LsvGkH+3mg2vUgN951SDwza5SBqhGB1Xc2e1qYTGoe ugq+F+AomjQQ9T5P4s74M6I7dsRs1DQQVpZ+UDh55M3B78wSTpJEnP878K/3Yw5av/5D IWKw== X-Gm-Message-State: AOJu0YwZRF5S9UnVmSub3h43cC9m/GBTp1fVTkHWdUgtGwEv7ecI2a8m J2Mcz6Td/ykbCS/7u6nbTW/kK8szaEzt5Fsk3Hf0gqzPRB7UgdA0qze2r/gcDzg= X-Google-Smtp-Source: AGHT+IEJ0TgM6wMb8ExRUNEUhRDXXRrXxSgoKU7m8kxqdyCY9lFoKSslM814XEsOx+EywBK/kPuztw== X-Received: by 2002:a05:6214:d06:b0:6b5:49c9:ed51 with SMTP id 6a1803df08f44-6b549c9ef51mr31169306d6.31.1719198585994; Sun, 23 Jun 2024 20:09:45 -0700 (PDT) Received: from hurd (dsl-205-233-124-241.b2b2c.ca. [205.233.124.241]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b536d02d65sm15948646d6.26.2024.06.23.20.09.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Jun 2024 20:09:45 -0700 (PDT) Date: Sun, 23 Jun 2024 23:09:44 -0400 Message-Id: <87y16v3ukn.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #71067 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 71067 quit