From patchwork Sun Feb 2 06:42:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 38172 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 D2D8F27BBE9; Sun, 2 Feb 2025 06:43:34 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 5E5F927BBE2 for ; Sun, 2 Feb 2025 06:43:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1teThH-0004FF-JP; Sun, 02 Feb 2025 01:43:11 -0500 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 1teThB-0004ER-W8 for guix-patches@gnu.org; Sun, 02 Feb 2025 01:43:06 -0500 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 1teThB-0004g6-Mx for guix-patches@gnu.org; Sun, 02 Feb 2025 01:43:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lZxIqBM17Na8CQ5SUKr9RJa8rdiJSGqmtZVqOjmrKY8=; b=kNI955xfd9qvCWZFBNd/cVCTwhrqaH8gUly1+4aPL6Td7JcBcQJzgbUWShCyZPlvhaFtijxqic/VrWztElgYPczAX6B0gL3ZvuQ9qmAM0so4MpJNZ/ijj9kelQ04k5S+A0ecD1J8GTxX3PvyX+unL4SEql45AGd4QB6n8YOp9nUeK5DQn/Vv8Zs97Aj9c9fZh6Q0A+1S78JMk1TFPlx3TfDczWTb2x2MBPX+nbBNHZqzVbTbqnGYUAxbJghjvaAEijY84S0gJ0SlmTOHd2eoP51XKqV0vLWW2qKMZDwpx7ggNKL036/4Isq+JdXAGqER9puD/lOeYrwdDEr0AbMf7A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1teTh9-0006LD-G0; Sun, 02 Feb 2025 01:43:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75991] [PATCH v2 3/3] gnu: speed-dreams: Update to 2.4.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 06:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75991 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75991@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75991-submit@debbugs.gnu.org id=B75991.173847857024324 (code B ref 75991); Sun, 02 Feb 2025 06:43:03 +0000 Received: (at 75991) by debbugs.gnu.org; 2 Feb 2025 06:42:50 +0000 Received: from localhost ([127.0.0.1]:32775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teTgt-0006KC-VP for submit@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:49 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:56659) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teTgn-0006JY-Nu for 75991@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:46 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2166360285dso54649075ad.1 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 22:42:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738478555; x=1739083355; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lZxIqBM17Na8CQ5SUKr9RJa8rdiJSGqmtZVqOjmrKY8=; b=hu3H9ojZglOwg+JRgkTJt8F2z81Hbiq8Ab0bCoVTEl8/XkbHvuKzdMkDaKEoTbS5+i eyMFOW6gTCu1Z/TsiTCtudEcKuHa7/WbtgPbCp9nrdciLE4htSwZ/iw6cmizN2n7cEF+ ATWlmrR6flhF8mib+BhPd6uLdVrLYYmn+dDGO02hrM/kXcN1kc/UicVXqv57efvB56cY olTAHeaC6lL2MWdWkl14rhJA04mOblXApG1aK4CJh5Pj77SCz19KLRyKYeEjxEyZy01T EODxtmuYXk5JyGVSePZXLFEugz/FHUmE/MkIRL8+57EmEDD0UUT5ulI3vUHdaowc2lvm 0t3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738478555; x=1739083355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lZxIqBM17Na8CQ5SUKr9RJa8rdiJSGqmtZVqOjmrKY8=; b=bUWHbl9YljD7F3U7pyc4IjhBdQBx7lbzhK8Pmu2p8/cv2nOTJfR+HdXn4ZpG+zZkr8 +mO+8wPdAVHe1fX21QB0G1qByMU6t+E9FgKPccpI3aNTrzsEYgDhQy1kcw8zoAKAoWs3 aawewN9rkjd3smBbi3duB6OrV5wd1nkJsRwZ9OshJgUx1ut11RRgAq02tYxyP85ipqd+ FSmzXKgJJXs/8ZQoohcjLxmKlwshfsoAnn0BeGWjgkP3gTclZ6YNxhOaA8sJMQyovnyt 0JcJac+l0aiJuUivF9OJE1/6jO1yWBzWldSAnshQXw1xI2w8WI6n8hDCI1eFmqTV20Ws o8xQ== X-Gm-Message-State: AOJu0YwBt1UrLOlfpzuQc8Ez81LE7wUAX8p1PvwnpfLlrKmqq+HuSb4l LNsWQOslxLkdc4U2XZGXi7gvmRoJjJW4+nV2PcBdmu4KLpgXAEAT9aHZhQ== X-Gm-Gg: ASbGncuodCUcfRbM1VO4PQ3NDXaPzeWKKtwbF5cYCZTOH4kXLmtGnVlZtqp061ydl98 /xbeFP400NEsNtL/GemzeO4qQQFd+JCDrl3VaUu47p0EandQtbyFRK6Cde/C14JFWBEwmx4rCaD G/ekWjYtyACvG5sZV7SxvXoBNJ07/KCfj+x61V2v6Y+cWBQFEbEsKRYg9Tj/IaHKvWb7hKi7J4M P1XCAnWlBHmvstBK7eQWlhsapg9uLuXiu7SmrA8WuCfb6w0NrKJ3tVO5IDvFvzmnWFuXeV7l1gG TYnndTpSo+5RGLQhcE6nCHaX6VfTfSQf3A== X-Google-Smtp-Source: AGHT+IEThoWO7ELqafBnsOoVBnyPl81PCUAa4G1vkz0RG2XVvYb+nl34T2VWm4KyVqSVhq1fML1W5Q== X-Received: by 2002:a17:902:cf01:b0:216:1367:7e3d with SMTP id d9443c01a7336-21dd7d80811mr262942625ad.31.1738478552374; Sat, 01 Feb 2025 22:42:32 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de3323e74sm54022495ad.249.2025.02.01.22.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 22:42:31 -0800 (PST) From: Maxim Cournoyer Date: Sun, 2 Feb 2025 15:42:03 +0900 Message-ID: <8dbe02c407751789c6bfe24035ed09dc6cfd6fbe.1738478514.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <427f052503ef3d9785cf457d72812802a7e3bbf0.1738478514.git.maxim.cournoyer@gmail.com> References: <427f052503ef3d9785cf457d72812802a7e3bbf0.1738478514.git.maxim.cournoyer@gmail.com> 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-svn-revision): Delete variables. (speed-dreams-source-tarball): Delete procedure. (speed-dreams-base-tarball, speed-dreams-hq-cars-and-tracks-tarball) (speed-dreams-more-hq-cars-and-tracks-tarball) (speed-dreams-wip-cars-and-tracks-tarball) (speed-dreams-unmaintained-tarball): Delete variables. (speed-dreams-data): New variable. (speed-dreams): Update to 2.4.0. [source]: Fetch from git. Apply patches. [configure-flags]: Remove the SD_DATADIR, SD_LIBDIR, OPTION_3RDPARTY_SOLID, CMAKE_MODULE_LINKER_FLAGS, and CMAKE_BUILD_RPATH_USE_ORIGIN flags. Add the VERSION_LONG flag. [phases]: Delete phases. [native-inputs]: Add speed-dreams-data. [inputs]: Add cjson, glm, minizip, rhash and tinygltf. Change-Id: Ie782a65dadaafb5d6c3a7d4d6c28212eef2b36f7 --- gnu/packages/games.scm | 138 +++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 88 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0e5dc016a1..75a669d577 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9332,116 +9332,78 @@ (define-public endless-sky license:cc-by-sa4.0 license:public-domain)))) -(define speed-dreams-version "2.3.0") -(define speed-dreams-svn-revision "8786") -(define (speed-dreams-source-tarball name sha256sum) - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/speed-dreams/" - speed-dreams-version "/" - "speed-dreams-src-" name "-" speed-dreams-version "-r" - speed-dreams-svn-revision ".tar.xz")) - (sha256 (base32 sha256sum)))) - -;;; We use the release tarballs instead of the SVN repository for their -;;; reduced weight (the tarballs do not provide the sources of the 3D models -;;; used, which are heavy, for example). -(define speed-dreams-base-tarball ;about 240 MiB - (speed-dreams-source-tarball - "base" "190480qzkllykl07s6bxd5wdbjgavs7haw6mk0hgdm7bs6rqqk0d")) - -(define speed-dreams-hq-cars-and-tracks-tarball ;about 670 MiB - (speed-dreams-source-tarball - "hq-cars-and-tracks" "16zcgwax3n0gf79hw1dg42lzsyxbnxfw6hjxdi919q5hxgm9cgsr")) - -(define speed-dreams-more-hq-cars-and-tracks-tarball ;about 760 MiB - (speed-dreams-source-tarball - "more-hq-cars-and-tracks" - "1acwiacf77qk5azyg3bbxsydk3wsp5fvgwwnhxpk273mwszjkh56")) - -;;; Although these are marked as 'WIP', the game throws (non-fatal) errors -;;; when it fails finding some "drivers" included within this pack. -(define speed-dreams-wip-cars-and-tracks-tarball ;about 400 MiB - (speed-dreams-source-tarball - "wip-cars-and-tracks" - "0wqd9bpis9bg87rsqk0dyvljax4zrp9h57mz7z3zrn6fayl1nh1q")) - -;;; This is to allow selecting the legacy Simu V2 engine (configurable in the -;;; game options). -(define speed-dreams-unmaintained-tarball ;about 60 KiB - (speed-dreams-source-tarball - "unmaintained" "1cxcrjm2508najpz2b65i8gxgvgiq7fcp13xvicpiqp6xhq3hsyi")) +(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). + (hidden-package + (package + (name "speed-dreams-data") + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://forge.a-lec.org/speed-dreams/" + name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ki620pq5gcn10l5328qsh6jdjsgrvyb4fhvgi0s9fvflzzg6905")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) ;no test suite + (home-page "https://www.speed-dreams.net/en") + (synopsis "Data for the Speed Dreams racing game") + (description "This package contains the non-functional data for the +Speed Dreams racing game.") + (license license:gpl2+)))) (define-public speed-dreams (package (name "speed-dreams") - (version speed-dreams-version) - (source speed-dreams-base-tarball) + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://forge.a-lec.org/" + name "/" name "-code.git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "150mwjdv9pmc3cjchfbkprnlbsnw2gv57350lir5vbh77xrgpn8c")))) (build-system cmake-build-system) (arguments (list #:tests? #f ;no test suite #:build-type "Release" #:configure-flags - #~(list - "-DOPTION_OFFICIAL_ONLY=ON" ;build with content - (string-append "-DSD_BINDIR=" #$output "/bin") ;instead of 'games' - (string-append "-DSD_DATADIR=" #$output "/share/speed-dreams-2") - ;; Libdir defaults to a 'lib64/games' prefix. - (string-append "-DSD_LIBDIR=" #$output "/lib/speed-dreams-2") - ;; Use system-provided Expat and FreeSOLID - ;; libraries instead of the bundled ones. - "-DOPTION_3RDPARTY_EXPAT=ON" - "-DOPTION_3RDPARTY_SOLID=ON" - ;; Drivers and other shared objects are linked to private/internal - ;; shared libraries; have their location on the RUNPATH to satisfy - ;; the validate-runpath phase. - (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" - #$output "/lib/speed-dreams-2/lib") - ;; The following flag is to avoid bogus RUNPATH warnings from the - ;; validate-runpath phase; without it, -rpath links referring to the - ;; build directory would be baked in driver modules. - "-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'extract-cars-and-tracks-data - (lambda _ - ;; XXX: The current working directory is inside the cmake/ - ;; sudbirectory following the unpack phase, for some reason. - (chdir "..") - (invoke "tar" "-xvf" #$speed-dreams-hq-cars-and-tracks-tarball) - (invoke "tar" "-xvf" #$speed-dreams-more-hq-cars-and-tracks-tarball) - (invoke "tar" "-xvf" #$speed-dreams-wip-cars-and-tracks-tarball) - (invoke "tar" "-xvf" #$speed-dreams-unmaintained-tarball))) - (add-after 'install 'install-desktop-entry - (lambda* (#:key outputs #:allow-other-keys) - (make-desktop-entry-file - (string-append #$output - "/share/applications/speed-dreams.desktop") - #:name "Speed Dreams 2" - #:comment "3D racing cars simulator" - #:exec (search-input-file outputs "bin/speed-dreams-2") - #:icon (search-input-file - outputs "share/speed-dreams-2/data/icons/icon.png") - #:categories '("Game" "Simulation"))))))) - (native-inputs - (list pkg-config)) + #~(list "-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)) (inputs - (list curl + (list cjson + curl enet expat freeglut freesolid freetype + glm libjpeg-turbo libogg libpng libvorbis + minizip openal openscenegraph plib + rhash sdl2 sdl2-mixer + tinygltf zlib)) (home-page "https://sourceforge.net/projects/speed-dreams/") (synopsis "Car racing simulator") @@ -9450,9 +9412,9 @@ (define-public speed-dreams realism. Initially forked from TORCS, it features improvements to the graphics and physics simulation, and supports modern input methods such as gamepads by use of the SDL library. It features more than 20 tracks and more -than 80 cars to race with.") - (license (list license:gpl2+ ;game code - license:lal1.3)))) ;assets +than 80 cars to race with. Extra (freely licensed) assets can be downloaded +via the in-game download manager.") + (license (list license:gpl2+)))) (define-public stepmania (package