From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iB2wEyUmSmZ+TwAAqHPOHw:P1 (envelope-from ) for ; Sun, 19 May 2024 18:17:41 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iB2wEyUmSmZ+TwAAqHPOHw (envelope-from ) for ; Sun, 19 May 2024 18:17:41 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716135461; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ZymV3jC73GDh8I6skaP9tNFiDkHYWcacJYq3ZVetRuQ=; b=NwJjmIZEf2sMjvlSkC6grvFbasNS3QD+gzr8IexRQxNbre8n5EgFjQITufH/jNXFVo5zgT YPuY2/vppRotGsPkpYlmEGDY8iB1QY0lMLbpd84Z+YQ5KxT6tUfk+y9c8Ku0BQhp54yRnB 1UdRkKLgtlq1IRciYr6hSRPdtkXWHaq7WVm106yqBF38VJHs6dgPO1VMsyXXknk0ujy3T2 ASU1uVK/Rl0PdtSN82LlJ2E0AJX7cqH3JwspegcY61FN7TZcQfFT1+vrSKmFgIn6SCoGKU a0x3VOwyXK532xrYesM3EAvKDww3WI/SMuOgqDAstexIMsTeUMeMp8bolhKC4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716135461; a=rsa-sha256; cv=none; b=hXo9O/2m6W5Tmw4a/j5TXlTgVtvVRb+WS7ErXilm2ksg1nvVdVlLJOOYuVGWZcrWLpZL/g pa3LdsnkfqQHvNtdYjjTlqy9SzkgRTvMO3vDTuqIU5sjTET+xCvEuBl7zqwLompXNe7qsk lwy9Eflp3hZ5PopDpCYzu6QQyC+LvamkrGtJjlxE1E/YgZjTtbeVoyCxoEG4QcsAaRRkv1 3G9nS8aDqwGCq3/w0ERUHUdl8wgsgAIrZj5qDp4//IKX46hooIw/cttYE4zwSCtCX/hyar g/zdbE6DwLBaZpLEEFi3lKtS77KN29pjYa5/e38p10YwbLGdyqg6HKGF3QJIPQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EC42A63845 for ; Sun, 19 May 2024 18:17:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s8jDY-0000ix-3V; Sun, 19 May 2024 12:17:00 -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 1s8jDW-0000iP-Aa for guix-patches@gnu.org; Sun, 19 May 2024 12:16:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s8jDW-00034D-1p for guix-patches@gnu.org; Sun, 19 May 2024 12:16:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s8jDZ-0003Af-Pj for guix-patches@gnu.org; Sun, 19 May 2024 12:17:01 -0400 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 X-OVh-ClientIp: 81.67.146.208 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-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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.36 X-Spam-Score: -6.36 X-Migadu-Queue-Id: EC42A63845 X-Migadu-Scanner: mx13.migadu.com X-TUID: TNu3M1YRFCKQ * 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