From debbugs-submit-bounces@debbugs.gnu.org Fri May 16 08:52:05 2025 Received: (at submit) by debbugs.gnu.org; 16 May 2025 12:52:06 +0000 Received: from localhost ([127.0.0.1]:36913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFuXj-0002uc-WA for submit@debbugs.gnu.org; Fri, 16 May 2025 08:52:05 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42306) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uFuXg-0002t0-1t for submit@debbugs.gnu.org; Fri, 16 May 2025 08:52:01 -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 1uFuXa-0004vu-L0 for guix-patches@gnu.org; Fri, 16 May 2025 08:51:54 -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 1uFuXZ-0000Nd-IX; Fri, 16 May 2025 08:51:53 -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=pjO26VqPMmkRo7yBbzAgf5/UbEtd53zGRoGNO0FR+uM=; b=lWvDPbNSBWl6gC TFdqsuLGCf2JT/AjEIPWe3nb/1jIobhR0HcBwaiqsp8MeUKcG7ZtMVsAFHjiS7J9emyzH5EX+WAmp iQIh3viX6sdCbYuOMaqcwVyhQzwfB2leIdrGBNuxAv8GqkLDhRlUyavYxycG9I9HxoMkhwHf2M9i1 fG94ZzSOxNNhza/3YlMeNDhTKXbQ6bpLGVdqiUnPJH4wzWTumLLYDoFoa/0kv27b4EyhzCRNmKMpZ FuP7Anku+v6Qlx7XXV9LHIXX9WnTezyWPMDgXp2/tt1tyXYH2oHVwVNy2cFH1hvt5UBJHl6f/BEcd XfWmfkeaT5X4KNa8fF1w==; From: Adrien 'neox' Bourmault To: guix-patches@gnu.org Subject: [PATCH 0/1] gnu: speed-dreams: Update to 2.4.1 Date: Fri, 16 May 2025 14:50:55 +0200 Message-ID: <20250516125130.10672-2-neox@gnu.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: Adrien 'neox' Bourmault 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 (-) Hi there. I'm proposing here an update for the Speed Dreams package to v2.4.1. After discussing with the project maintainer, it appears that some changes were necessary in our package as the project forked FreeSOLID for their own use. This patch is thus adding the speed-dreams-freesolid hidden package for Speed Dreams to build properly. Have a nice day and happy hacking! Adrien 'neox' Bourmault (1): gnu: speed-dreams: Update to 2.4.1. gnu/packages/games.scm | 50 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Fri May 16 08:54:32 2025 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 To: 78454@debbugs.gnu.org Subject: [PATCH 1/1] gnu: speed-dreams: Update to 2.4.1. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78454 Cc: Adrien 'neox' Bourmault 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: -3.3 (---) * 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 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 02 05:59:33 2025 Received: (at 78454-done) by debbugs.gnu.org; 2 Jun 2025 09:59:33 +0000 Received: from localhost ([127.0.0.1]:48536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uM1x6-0006cx-SE for submit@debbugs.gnu.org; Mon, 02 Jun 2025 05:59:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59558) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uM1x5-0006cF-3M for 78454-done@debbugs.gnu.org; Mon, 02 Jun 2025 05:59:31 -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 1uM1wz-0002dP-8w; Mon, 02 Jun 2025 05:59:25 -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:References:In-Reply-To:Subject:To: From; bh=S8ffNp9FtHj3aUX7VQXo3Qs+duPLoReQUHvF6zILY4M=; b=GXFrY3mn8tg7mZvkgwea 96mTne3PYqusimgfdHHl+++GBG0cd8m/aW/y5cX151V/sJJBRe6Iamg48bwyXSrqaJ3IdsM52EYoE Xdx4ZdQhO6ItuTeAC4nObV2kixivG8L7l5xTVD2+BQmemTGd4M1SU3sHXWLgeRBDy3bdllp4RvxZp Co/gFoGeQ8qQqTV/sA8lTLIxS3zMffEfk32SM36nDXyqQQPgENcvefB2+FZ3YE35yBiSK+yFnlyWr GZNRcbK6R5ooGzCqrnZ1HeM3Z+iUw1pOcLUTRlSLLO87V7fVzlGclu1PDrfFIUPwMDv7OtUBq+ekM 8BrSfOZRakyRyg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Adrien 'neox' Bourmault Subject: Re: [bug#78454] [PATCH 1/1] gnu: speed-dreams: Update to 2.4.1. In-Reply-To: <20250516125413.11401-1-neox@gnu.org> (Adrien Bourmault's message of "Fri, 16 May 2025 14:54:07 +0200") References: <20250516125130.10672-2-neox@gnu.org> <20250516125413.11401-1-neox@gnu.org> Date: Mon, 02 Jun 2025 10:23:21 +0200 Message-ID: <87y0uar1qe.fsf@inria.fr> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78454-done Cc: 78454-done@debbugs.gnu.org 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: -3.3 (---) Hello, Adrien 'neox' Bourmault writes: > * 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. Applied, thanks!