From patchwork Fri May 16 12:54:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien 'neox' Bourmault X-Patchwork-Id: 42639 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 DF89C27BC4B; Fri, 16 May 2025 13:55:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,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 8F86827BC49 for ; Fri, 16 May 2025 13:55:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFuaf-0005DQ-FR; Fri, 16 May 2025 08:55:05 -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 1uFuae-0005DG-F3 for guix-patches@gnu.org; Fri, 16 May 2025 08:55:04 -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 1uFuae-0000ah-39 for guix-patches@gnu.org; Fri, 16 May 2025 08:55:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=PG1nWCgoFn+LpfUCmPWhi97C4ynmMTUXuiQqseEfJlk=; b=R9wNMQd9b7bfixSV1i9TTMcGtQ1TONY09jON0V18fh79jks93X/1R/NpQWfCrsveXjWRwvHaYLh/xIlj2saRt2VLS0dB8HhfXJZn1cWphELOFEemt3MVJc3CvEHYwIPjiNfSRJX6t4u9lmyQzXjXeCM4P/zrCq/s9zV7PUM3D0rq/UshkN80XPbcQCGQd0RgPw/9GOfbgkfWUWL1Mv7EViacpO9mLOU+CMMSPXri32eZG3CcK/nIzMxDOi1J3Dsmo3NZlg6GjyciAa3vGBJ7gl7EN6h8tECQzYLkKcwE23V13tSmX7E9tWRwoxM0HfO/LGh9APuZsP4xbpcSwv7JQQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFuad-0003IS-K6 for guix-patches@gnu.org; Fri, 16 May 2025 08:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78454] [PATCH 1/1] gnu: speed-dreams: Update to 2.4.1. References: <20250516125130.10672-2-neox@gnu.org> In-Reply-To: <20250516125130.10672-2-neox@gnu.org> Resent-From: Adrien 'neox' Bourmault Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 May 2025 12:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78454@debbugs.gnu.org Cc: Adrien 'neox' Bourmault Received: via spool by 78454-submit@debbugs.gnu.org id=B78454.174740007212411 (code B ref 78454); Fri, 16 May 2025 12:55:03 +0000 Received: (at 78454) by debbugs.gnu.org; 16 May 2025 12:54:32 +0000 Received: from localhost ([127.0.0.1]:36959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFua5-0003DV-BG for submit@debbugs.gnu.org; Fri, 16 May 2025 08:54:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56770) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uFua0-0003CH-Ho for 78454@debbugs.gnu.org; Fri, 16 May 2025 08:54:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uFuZv-0000W0-4R; Fri, 16 May 2025 08:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=PG1nWCgoFn+LpfUCmPWhi97C4ynmMTUXuiQqseEfJlk=; b=BQ2LrqHRC0PDfa jQtF0NmT1IxdXtflqqVQiN7sd4LbQYDNwI5waa5lQq0pGwvdvfNTk8XaXUNOimvniqSHzbO5IZaQ9 iG83xvjFttvmVHWf3tKyg7hKQJAwpPc4Sj0aTenFSNu22O7vhAsVKwuZBizyrwSc8uWEyJADOs5wN JslSq9SlZzn+5Z4ed74KMbAJavmsSw7LoBOYo4PnexmEOizQ8HNFgwinXby83b8raqmt+tPueti6m iJRr3nw76nWZtM6Y7rJkp3KOBX2jrVLn8nkOgIjHI11aBZMbHlbTGyWlsIvNbnLxEEHHzfgbutMJ3 XQ8P+JJYFwzN5lamnPag==; From: Adrien 'neox' Bourmault Date: Fri, 16 May 2025 14:54:07 +0200 Message-ID: <20250516125413.11401-1-neox@gnu.org> X-Mailer: git-send-email 2.49.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (speed-dreams-version) (speed-dreams-freesolid): New variable. [source]: Fetch from git. Use submodule commit hash. [build-system]: Use cmake-build-system. [tests]: Disable tests. [configure-flags]: Add BUILD_SHARED_LIBS=ON. (speed-dreams-data): Update to 2.4.1. (speed-dreams): Update to 2.4.1. [inputs]: Delete freesolid. Add speed-dreams-freesolid. [configure-flags]: Add OPTION_TRACKEDITOR=OFF. Signed-off-by: Adrien 'neox' Bourmault --- gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 62edc1bebf..c452361b8d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9677,12 +9677,11 @@ (define-public endless-sky license:public-domain)))) (define-public speed-dreams-data - ;; Use the commit corresponding to the 'speed-dreams-data' submodule - ;; (https://forge.a-lec.org/speed-dreams/speed-dreams-data). + ;; Use the same tag version as speed-dreams package. (hidden-package (package (name "speed-dreams-data") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -9693,7 +9692,7 @@ (define-public speed-dreams-data (file-name (git-file-name name version)) (sha256 (base32 - "0ki620pq5gcn10l5328qsh6jdjsgrvyb4fhvgi0s9fvflzzg6905")))) + "1w7j2znqy4ixsild1v0qz7hw3m42gqg1jnq7nnb48d6fc64hv3bn")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ;no test suite (home-page "https://www.speed-dreams.net/en") @@ -9702,10 +9701,42 @@ (define-public speed-dreams-data Speed Dreams racing game.") (license license:gpl2+)))) +(define-public speed-dreams-freesolid + ;; Use the commit corresponding to the 'freesolid' submodule + ;; (https://forge.a-lec.org/speed-dreams/speed-dreams-code). + (hidden-package + (package + (name "speed-dreams-freesolid") + (version "2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://forge.a-lec.org/speed-dreams/freesolid")) + (commit "2c0071923be6afb487ed4e3b84da501f0a2e7e2d"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "025ml2nzhkfki28ckjjggqpkr1gd02c2blpr4afc5175r8bfh2w4")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:build-type "Release" + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON"))) ;speed-dreams build system needs a shared library + + (home-page "https://forge.a-lec.org/speed-dreams/freesolid") + (synopsis "Speed-Dreams 3D collision detection C++ library") + (description "Speed Dreams FreeSOLID is a fork of FreeSOLID, a library for +collision detection of three-dimensional objects undergoing rigid motion and +deformation. It is designed to be used in interactive 3D graphics +applications.") + (license license:lgpl2.0+)))) + (define-public speed-dreams (package (name "speed-dreams") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -9716,14 +9747,15 @@ (define-public speed-dreams (file-name (git-file-name name version)) (sha256 (base32 - "150mwjdv9pmc3cjchfbkprnlbsnw2gv57350lir5vbh77xrgpn8c")))) + "17acjfgffw39w05rha2r89q4cb97z1qg1z5rpy8ipn0v6dipw0i7")))) (build-system cmake-build-system) (arguments (list - #:tests? #f ;no test suite + #:tests? #f ;no test suite #:build-type "Release" #:configure-flags - #~(list "-DOPTION_3RDPARTY_EXPAT=ON" ;use system expat library + #~(list "-DOPTION_TRACKEDITOR=OFF" ;not detecting jdk properly + "-DOPTION_3RDPARTY_EXPAT=ON" ;use system expat library "-DSD_BINDIR:PATH=bin" ;install to /bin instead of /games (string-append "-DVERSION_LONG=" #$version)))) (native-inputs (list pkg-config speed-dreams-data)) @@ -9733,7 +9765,7 @@ (define-public speed-dreams enet expat freeglut - freesolid + speed-dreams-freesolid freetype glm libjpeg-turbo