From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 09:49:08 2025 Received: (at submit) by debbugs.gnu.org; 1 Feb 2025 14:49:08 +0000 Received: from localhost ([127.0.0.1]:57157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teEo0-0008Oq-CE for submit@debbugs.gnu.org; Sat, 01 Feb 2025 09:49:08 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35128) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teEnx-0008OL-D8 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 09:49:05 -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 1teEnr-0004Vt-Rb for guix-patches@gnu.org; Sat, 01 Feb 2025 09:48:59 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1teEnq-0003lT-EI for guix-patches@gnu.org; Sat, 01 Feb 2025 09:48:59 -0500 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2ee989553c1so4994349a91.3 for ; Sat, 01 Feb 2025 06:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738421335; x=1739026135; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NWfIMRpKIOcHIRzeVrcTWFwgs8Ge2S3kroU7rsVgeOo=; b=D0+c+eKyceuM63G4B1YBIyfQUrHmn4pPYpsWhT4yNvcwvvCj5fLAX8zR8bHibRjE0+ Py3HB0m0QDseW0oKSvvxKQM4BHLFf5KyCMAfBaaxUx+5nGfWz1kgIKmRo/V7ym1cnqNh TdRVYg4UwORHcJ7E9o6uyA9CWWgme5c+A2RYOsq0JADPFM/0DLWYXoPWOTxaScpt74Ft af6rfykp+AAgI4litcdDoD3zUs5HskvTTB1ZUSCq81pOfRI9qCg/p05NEJQISAhAA+f/ xaaCqZTZU8hd1ApH7DcTNPMVkCzuEQ+i+kj6AsEnI2eTxXC2TtwCJg5wI6YSm6nXKntW Po1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738421335; x=1739026135; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NWfIMRpKIOcHIRzeVrcTWFwgs8Ge2S3kroU7rsVgeOo=; b=htPQpznMbJEmRCony6pe1i+lhl7Dx3eub43YSLTWW3/qaiuLJGi91LWQj7ixlRxNl/ EmJfQlG1PvBsLFTt7KeejyhYeeFI5dKlC30P2kn1a6zwwAHZdzsmT+76F66RgQWaiajI zJvxDC8fceAlt4Hh3009EYCzQd9qAGMpa/52aPQRywx/CFA9srmZq+Z0fxCcAW/4z9G3 awRe49b1438vVokoGW18lWyz1DjKzzsOnMaVfj9LYHtXhg8yFM2GxbUsnuF/G9SLH0GM RrrFGJ8/Ny9zDVPsxnY+xDkGzlg09NQuKcW7fgbeky6FL3O5TTTxW0+UqBZj70ZTzPyA KNQA== X-Gm-Message-State: AOJu0YwkaUTgcFbGsQG/sbM7+SOpiuVnWl1QLvMrnE2GCBuWJwJkGJbM 63CzzYb8HmPtkHt/6uXhzCjYGbdC/j6UMenFknYkhzvauEOV4CLgU9SBDA== X-Gm-Gg: ASbGncvux6amZhwcDtLZTCoBM/4z3zHheWV84ocHmiGFkaWGUZQ24vBOvFpLoYlP/VV Y2awVS4lvonI2nFNGebC23fxU+N8AhGUfj5WKoLeffZ+XtcTcgc6ikSix+yc+q/brfn6L6EYFiX 44j/oLJDVhX6jvKHMSOYMQV5IMRmqmTAFcCqKa8Fxy7+ZYSKkO3hkNc9CPT8KpbNravZvla+9Ey DIQpbr405XAAATe/mqRfcRKeWq8PpxbD92My4yEDDQ6xWK7FlRo9VQO2bnS/m639BGOdGJm38V8 r2j59rbigS26032zI4+PyEQ0iTHFi2fF2g== X-Google-Smtp-Source: AGHT+IG4NgRSnu6qZ2ZPGp/mLRTsCmxp3X+yWi/lb8PByXtL4s1sB77WBfwXeYh9InqoP9fw5izzVA== X-Received: by 2002:a17:90b:1808:b0:2ea:8d1e:a85f with SMTP id 98e67ed59e1d1-2f83abff37bmr25957954a91.17.1738421335405; Sat, 01 Feb 2025 06:48:55 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f848acea2csm5608680a91.47.2025.02.01.06.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 06:48:54 -0800 (PST) From: Maxim Cournoyer To: guix-patches@gnu.org Subject: [PATCH 0/3] Udate Speed Dreams game to 2.4.0-rc1 Date: Sat, 1 Feb 2025 23:48:38 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer 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: -0.0 (/) Hello, The current stable release of Speed Dreams has a serious bug which makes it nearly unplayable (the tire model is wrong, they get too hot and the experience is akin to ice skating more than driving), so I'm proposing to update it to 2.4.0-rc1 already. I've made a few patches for it which have mostly been merged already, so updating to 2.4.0 should be easy when it is released. Maxim Cournoyer (3): gnu: tinygltf: Update to 2.9.3. gnu: tinygltf: Install a library. gnu: speed-dreams: Update to 2.4.0-rc1. gnu/local.mk | 4 + gnu/packages/games.scm | 145 +++++++----------- gnu/packages/graphics.scm | 9 +- .../patches/speed-dreams-desktop-file.patch | 37 +++++ .../speed-dreams-freesolid-include-dir.patch | 26 ++++ .../patches/speed-dreams-runpath.patch | 50 ++++++ .../patches/speed-dreams-version.patch | 13 ++ 7 files changed, 190 insertions(+), 94 deletions(-) create mode 100644 gnu/packages/patches/speed-dreams-desktop-file.patch create mode 100644 gnu/packages/patches/speed-dreams-freesolid-include-dir.patch create mode 100644 gnu/packages/patches/speed-dreams-runpath.patch create mode 100644 gnu/packages/patches/speed-dreams-version.patch base-commit: fcf0cd23d899b1fbf01e2463ee5f26af495a67dc -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 10:51:17 2025 Received: (at 75991) by debbugs.gnu.org; 1 Feb 2025 15:51:17 +0000 Received: from localhost ([127.0.0.1]:59668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teFm8-0003Ud-W7 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:17 -0500 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:42106) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teFm6-0003UM-BW for 75991@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:14 -0500 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2ef714374c0so4500742a91.0 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 07:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738425068; x=1739029868; 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=dz408onE0DpULejfmUAamNsIt3cnEAYBrHSzkc0w4wo=; b=HmbKdzNedvu13c0adAAohMfSxe2WathEeRFiwKTzwg9GUxI4ipDQ3XCN4KtgTRdWsY KEXKGIhYfzK1f5lnjDW44VkGn4Ha4GTDwNJqckZppiH/PJ3GH2AhPGNebJoyCaQRrZ7N GayDE5aTWf9JYELsNSOtXMbq0DtcC8n17cT2M6vJegabTPPQuB5px1R9tLgxKXNaJoBY xolScUfqpGEakVx6MY23S1/nSj8Zr7HOr6bBF0tV3VB/yHFZgugMYsGKCTYxqsUmv3fB SfR4d8mZUL5htxcOEh2DjdVSrr+crlxfGl1G6UkP5SPuItwZAiJK4lEUDrRHN5k/LGIi UZtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738425068; x=1739029868; 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=dz408onE0DpULejfmUAamNsIt3cnEAYBrHSzkc0w4wo=; b=Q91atMPEbY8XrsWzOQMLQ3y1z87EFXEw66//LvEYAKE6aKNDo5kxhqVCfvn0gSe3Yi XscWX9eSONuHe5Uc0ZLdcO4s37hOH6wc81SLIth0/zOcWvFrv22mCWTv/2u7PIflhe5x o/adCCq/nneStsPC/EddYuerfWi7WGQYdqa4/4ljnf/dcU2LGxiYv5lIn5l9ucD4hcW+ dDfTQXGwm9XdNjh7PxwpyeMtu+uLczGSrzhoMr91AGJI/uJG974nSBKOZDGgQkHxmZpH WRiA05CAgGja/3qXqcj2+F2ph01Onizq0Mr/y/PfQ0Sl3Sp2N2kSQLg6PAU9aoYd4CNC QU9A== X-Gm-Message-State: AOJu0Yy3N3Fgx/1+FR9jLilO3TpFQOcIfiN3DOMN3mW8zSkhVVSo2COV KV8paanTBO6c8AhMxDL3sBRFsvDHJhikU7YgAHpazax/UFw1T2g2myHxcQ== X-Gm-Gg: ASbGncviYIJzPHZoC+T6bPbCny1EJV5zRNvDUgI8QSPCwQQd5nC8w3m2QraA5r7Bi+1 ctuDpkQRszMdShCJnbyX9YvC9x0mq9uzBdJ0KHCKt82tC1BOjcZ+XgbzRMa80/qpUzzXYLHiJnd RnwgkucJVRklLHER9Jpq1UnzU62pK9ar/8QRRB3njwHX2plufwakdBPd3lPSMDPZbJ/ywVEukT2 ViHl07PKdpAe4WtIVPsgudkrHS4muR8DI80D254s7sXhs9aEht9EC9JEh0RzPH6Roa7vHtyVdQg DF7jvgesGyVTI9735/agtFe7HrgvF3xRhw== X-Google-Smtp-Source: AGHT+IEPYLlnyr9kW23Wmj9on4l8StbPBcoZ++ylaapS7brZsg3XIwPI6cE9I+qqNY7ks7AkOOnm9Q== X-Received: by 2002:a17:90b:1f8e:b0:2ef:ad48:7175 with SMTP id 98e67ed59e1d1-2f994f638ebmr12269301a91.15.1738425067783; Sat, 01 Feb 2025 07:51:07 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bfbfe6bsm8780583a91.46.2025.02.01.07.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 07:51:07 -0800 (PST) From: Maxim Cournoyer To: 75991@debbugs.gnu.org Subject: [PATCH 1/3] gnu: tinygltf: Update to 2.9.3. Date: Sun, 2 Feb 2025 00:50:44 +0900 Message-ID: <143b0d882fd0bc94fc1471032ee64c1a5e948440.1738421170.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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/graphics.scm (tinygltf): Update to 2.9.3. Change-Id: I680a26da98f26ed4c25de614954b59cf4d5833d3 --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2a5dd4a75c..595e188de1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2587,7 +2587,7 @@ (define-public openxr (define-public tinygltf (package (name "tinygltf") - (version "2.8.21") + (version "2.9.3") (source (origin (method git-fetch) @@ -2596,7 +2596,7 @@ (define-public tinygltf (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14712lndwlk4y001jxf2rxhwrw0w5gbc2hyh9kpik1galdzg41ii")) + (base32 "1dhzsffz25fib3362044d8qlnhrav0wf29bbgcdxi42275l6ax5k")) (modules '((guix build utils))) (snippet #~(begin (for-each delete-file-recursively -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 10:51:21 2025 Received: (at 75991) by debbugs.gnu.org; 1 Feb 2025 15:51:21 +0000 Received: from localhost ([127.0.0.1]:59671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teFmD-0003Uu-As for submit@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:21 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:46361) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teFmB-0003UU-HD for 75991@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:19 -0500 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ef87d24c2dso3981029a91.1 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 07:51:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738425073; x=1739029873; 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=+mLh8F+U+DH58lxehPTsZRAoBBpEhykBdz4SpBJxc4E=; b=ELGfGP4d5X29Za8eFWN5tQxNlE5ThckWf360O3BLjVCHMBcO79IyzWOSiPde6RTY+E GNamen22K/yjman7Dng/uOMazyIHzjjELzbTjvKztOjyCcKcg1+V7BgC5//H+KA+mLdP idnmuOQbMXzm2/K+KZJM5BoWzooXKUUmfiAeUuVIrQ5qKh0NDaOCbqrnB8Kj59hxGuAN nIBYKGOsEj37fUtWNOGfTzxgKPtvp1c5nXcu5x99ySfwDo+Cf/y34mcs0ChE8eNv2O1E X/6/xOTqM4x2EH3gkw25xmV5/vIWV5omfLwYnIwMuJCJFz8E3mxr0MJxUnyiZi8x0ES2 3NGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738425073; x=1739029873; 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=+mLh8F+U+DH58lxehPTsZRAoBBpEhykBdz4SpBJxc4E=; b=d41lA/FIUf9ftSuAzE3r5LpTViPIa23lMd0oTjb2MpNrUOxuqWUNzujuTY+8xob6tV QPQW+MCWKZGCpywZpsxFWz1ZCn3zJywPpkmJN+/mJ9cP/JTNS87x92/L65EwMe9VPkQ8 2kgK3CLMAOy/QpYghkDi+4XXvjFOKbhWstkRJqOwpzJb2XLRwjp7EHXZUHr1xaIgbVK1 DGm6HuHfb33oB2X1kdkGVF+eApeysZ9h+O0NOElhkMzRmHIetINUgYKTv/hmRxDJAvMl Nb3oULM7jXd99hwVzR7SzvLQvlDN0cbfklrIDQ41QUeD2zaVY//WvO3C5Adv/Skt5Nva Fxbg== X-Gm-Message-State: AOJu0Yw7Wlsw9CYMf8HcR21fdjj2vwU/sQf4DG/vKDxEwUCzNLKtqy59 /h6CEMVTanN3zySHaG3E7Bw1kWOQSKScnwxbo9Q6bC7+zPSCVsrSm3A5Sg== X-Gm-Gg: ASbGnctmS8HKVatkL4+6eX7aZXPBE8WinotmbMuvmosifahkOsq/kwSMta4oF74GS3R DSEgrYBZtHye7BdZgeQ+G3yYO4thayTsnYfgjgp3so4w+tOFOLmTn2XlwLmmU+y1EazNwpWZ9SA t3uJE97Fm8OEeDURuapKeFMXXy+VG4CVCkZ53W3HI3UkzFPidRCtcDyMxfWIUKbdU9HTrfMVklE Gemqqjh4JDFp5uF8u7etzh/BQw5TYy25EUK1UF1COCuNbi6/OPI6yyfydrPURwrlzQ65KWf+iFh zxvBsQalTa3vAeV0Eni+9ArRiBBm2tH3sQ== X-Google-Smtp-Source: AGHT+IGiHvzzFET8CPg02/ocgFx/j98FxUaD23HO0kgx1DfE0QLwuZIMWqxuQHSZ1Lr5/4JDEzdpbw== X-Received: by 2002:a17:90b:37ce:b0:2ee:ba0c:1726 with SMTP id 98e67ed59e1d1-2f83acb10e5mr19374856a91.34.1738425073035; Sat, 01 Feb 2025 07:51:13 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bfbfe6bsm8780583a91.46.2025.02.01.07.51.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 07:51:12 -0800 (PST) From: Maxim Cournoyer To: 75991@debbugs.gnu.org Subject: [PATCH 2/3] gnu: tinygltf: Install a library. Date: Sun, 2 Feb 2025 00:50:45 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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 (-) Previously, only a static library would be produced and then deleted in a phase. * gnu/packages/graphics.scm (tinygltf) [arguments]: Add #:configure-flags. : Remove delete-static-lib. Change-Id: I019a87a4fbf68fc19270a41d58af3a2184b77215 --- gnu/packages/graphics.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 595e188de1..1492740f9c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2611,6 +2611,7 @@ (define-public tinygltf (build-system cmake-build-system) (arguments (list + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'use-our-packages @@ -2623,10 +2624,6 @@ (define-public tinygltf "stb_image_write.h") (symlink (search-input-file inputs "include/catch.hpp") "catch.hpp"))) - (add-after 'install 'delete-static-lib - (lambda _ - (delete-file (string-append #$output - "/lib/libtinygltf.a")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 10:51:27 2025 Received: (at 75991) by debbugs.gnu.org; 1 Feb 2025 15:51:28 +0000 Received: from localhost ([127.0.0.1]:59674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teFmI-0003VF-O1 for submit@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:27 -0500 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:47137) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teFmF-0003Ul-EE for 75991@debbugs.gnu.org; Sat, 01 Feb 2025 10:51:25 -0500 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2f833af7a09so3972373a91.2 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 07:51:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738425076; x=1739029876; 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=oojB5257dazt0zGCZjkP2nWPXXyvVsaCLB4QaMQcKt0=; b=cOF4oE131lNC/h620Ih5z0APqAgrpDB72qXZYpxy7NMR5UFmIPKH6wTgpmgC8VR87Z +lyXHlsjTrcovpfYSULUlVbJvkLtoXYnUbAQ2wdXwfNeePSCMrq+G4gYs8DMqttiaGO7 DvCQfI5RwrtYAOnr/hinlICCsl8Jw8FEv/AQ991BlL28PB7m0auH1gB8x6dlmnrKci/v hn8KlzlpRse9pqtvIfaGFR5gwPYYauWAU8ItkI61z5fdjsjFEwnUwdN5Jzm8fSi93nSq aHE5SeGy5UogBx2fhL5pwBQRwJj3Kz7goBb6lR9iFJ8yTcB4nCc1VZ9NubtIuoxOhCAw mxFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738425076; x=1739029876; 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=oojB5257dazt0zGCZjkP2nWPXXyvVsaCLB4QaMQcKt0=; b=CyutaGAv5ffEk5mrVq9Xs38VjT0NFFgw9Nsf5IWFELeFE8zKHyoI25uSFe26cZpNeP /HaHfANyab1wUNZF2RVEMYpW4K0515hpWAtkR8VDVawSnqaCEMUFP3UlDQ1+KSFJKDhy VWOtq66NJGJ8in1gkqJn1mesWPg/JVI2mrJuPrWRAS+QfIbYxnfwNT8Gojv1Po4H/9Bh FMjMfYuUely85za7UT7Lp/BqhJ0iQCB32RLJLKPXJucyPNgMjG91dWahTLhlcslJaXXB Uz7TsHaoIHA8bawBQjUrYGlY6Qk/F/J8q8+gcfikzvwH99jmUAANNit+FQpHp4JgPbGu RKvw== X-Gm-Message-State: AOJu0YxaPrU5TdlGBmgxfBjKHH8NIl7jq7KttdBVD6VfzvcE6g0HOWVQ 2hXGvJvEG+eljETxwHzRP0aMkjRCFLZ19DKV6lUgz1TmvDqrX22TKKkJ9Q== X-Gm-Gg: ASbGncubvx4hvbWCXRDXTO/W+dZ6d8wQKyPW32xOZgwinw5eJ2JcJjDNGS5rLw1TcaK iFBnqNRY0Bly8og08WQZg/8WzWBVTaPHhuMh/ZQBRH4QdPmpsKSRLGg3QdQXSzwFPC5kVjfZ5+/ gYltFiramxj196P/7OWJxi0S/u6Tl+iaO2p/kCVnYagQsanMc54GiQl1DIOlnRvHIEtFLsmBier z48qNwBGm9JudWt0+u3stjjv1wP0sY+qOJwTht636IA2TPGTgubUSXuKFZJsizrGAqFQG1agE3J PTP1sTOnKi4ADvEEMLeB18+NU6hD2fk5Yg== X-Google-Smtp-Source: AGHT+IG+a/+busi9kYH/tWIT7ZzURbqk/NtA/k8xDlAYjjebF5YgS9lqtgByI13PmdStPI+kq0s2lQ== X-Received: by 2002:a17:90b:534b:b0:2ee:edae:780 with SMTP id 98e67ed59e1d1-2f83abff356mr24150391a91.15.1738425076237; Sat, 01 Feb 2025 07:51:16 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f83bfbfe6bsm8780583a91.46.2025.02.01.07.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 07:51:15 -0800 (PST) From: Maxim Cournoyer To: 75991@debbugs.gnu.org Subject: [PATCH 3/3] gnu: speed-dreams: Update to 2.4.0-rc1. Date: Sun, 2 Feb 2025 00:50:46 +0900 Message-ID: <605e6c4755496a933e339d07bdeb81da6ac5b7a4.1738421170.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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/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-rc1. [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. * gnu/packages/patches/speed-dreams-freesolid-include-dir.patch: New file. * gnu/packages/patches/speed-dreams-runpath.patch: Likewise. * gnu/packages/patches/speed-dreams-desktop-file.patch: Likewise. * gnu/packages/patches/speed-dreams-version.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: Ie782a65dadaafb5d6c3a7d4d6c28212eef2b36f7 --- gnu/local.mk | 4 + gnu/packages/games.scm | 145 +++++++----------- .../patches/speed-dreams-desktop-file.patch | 37 +++++ .../speed-dreams-freesolid-include-dir.patch | 26 ++++ .../patches/speed-dreams-runpath.patch | 50 ++++++ .../patches/speed-dreams-version.patch | 13 ++ 6 files changed, 187 insertions(+), 88 deletions(-) create mode 100644 gnu/packages/patches/speed-dreams-desktop-file.patch create mode 100644 gnu/packages/patches/speed-dreams-freesolid-include-dir.patch create mode 100644 gnu/packages/patches/speed-dreams-runpath.patch create mode 100644 gnu/packages/patches/speed-dreams-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index aa91977391..7aff24ea7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2016,6 +2016,10 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-sans-serif.patch \ %D%/packages/patches/sioyek-fix-build.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ + %D%/packages/patches/speed-dreams-desktop-file.patch \ + %D%/packages/patches/speed-dreams-freesolid-include-dir.patch \ + %D%/packages/patches/speed-dreams-runpath.patch \ + %D%/packages/patches/speed-dreams-version.patch \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c0319dcb20..7e0817666e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9332,116 +9332,85 @@ (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). + (let ((commit "3d26571ada10cd68944896fad39fd68b71c67abd") + (revision "0")) + (hidden-package + (package + (name "speed-dreams-data") + (version (git-version "2.3.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://forge.a-lec.org/speed-dreams/" + name)) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12s02qkbqpgqy4jxj56jfxjahv1z0nbf758wlcgf9a3p3rnnm0rz")))) + (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-rc1") + (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 + "1q4jr4gp9bq0khrjkmxsx1zh3bcij3spk2zrp1pakciqvk3hsj4g")) + (patches + (search-patches "speed-dreams-desktop-file.patch" + "speed-dreams-freesolid-include-dir.patch" + "speed-dreams-runpath.patch" + "speed-dreams-version.patch")))) (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 +9419,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 diff --git a/gnu/packages/patches/speed-dreams-desktop-file.patch b/gnu/packages/patches/speed-dreams-desktop-file.patch new file mode 100644 index 0000000000..806790ffda --- /dev/null +++ b/gnu/packages/patches/speed-dreams-desktop-file.patch @@ -0,0 +1,37 @@ +Upstream-status: https://forge.a-lec.org/speed-dreams/speed-dreams-code/pulls/53 + +diff --git a/speed-dreams.desktop.in b/speed-dreams.desktop.in +new file mode 100644 +index 00000000..45496917 +--- /dev/null ++++ b/speed-dreams.desktop.in +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Name=Speed Dreams ++Comment=3D racing cars simulator ++Exec=@CMAKE_INSTALL_PREFIX@/@SD_BINDIR@/@_TARGET_NAME@ ++Icon=@SD_DATADIR_ABS@/data/icons/icon.png ++Terminal=false ++Type=Application ++Encoding=UTF-8 ++Categories=Game;Simulation; +diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt +index e6de4565..27f1d849 100644 +--- a/src/main/CMakeLists.txt ++++ b/src/main/CMakeLists.txt +@@ -45,7 +45,14 @@ IF(MINGW) + ENDIF(MINGW) + + IF(UNIX) +- SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ++ SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ++ # Install a launcher for desktop environments. ++ configure_file( ++ ${CMAKE_SOURCE_DIR}/speed-dreams.desktop.in ++ ${PROJECT_BINARY_DIR}/speed-dreams.desktop @ONLY) ++ install( ++ FILES ${PROJECT_BINARY_DIR}/speed-dreams.desktop ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + ENDIF(UNIX) + + SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/gnu/packages/patches/speed-dreams-freesolid-include-dir.patch b/gnu/packages/patches/speed-dreams-freesolid-include-dir.patch new file mode 100644 index 0000000000..a6ea131326 --- /dev/null +++ b/gnu/packages/patches/speed-dreams-freesolid-include-dir.patch @@ -0,0 +1,26 @@ +Upstream-status: https://forge.a-lec.org/speed-dreams/speed-dreams-code/pulls/46 + +diff --git a/cmake/FindSOLID.cmake b/cmake/FindSOLID.cmake +index 7adda425..89b07adf 100644 +--- a/cmake/FindSOLID.cmake ++++ b/cmake/FindSOLID.cmake +@@ -20,9 +20,9 @@ ENDIF(SOLID_FOUND) + FIND_PACKAGE(PkgConfig) + IF(PKGCONFIG_FOUND) + +- PKG_CHECK_MODULES(SOLID FreeSOLID) ++ PKG_CHECK_MODULES(SOLID FreeSOLID IMPORTED_TARGET) + IF(NOT SOLID_FOUND) +- PKG_CHECK_MODULES(SOLID SOLID) ++ PKG_CHECK_MODULES(SOLID SOLID IMPORTED_TARGET) + ENDIF (NOT SOLID_FOUND) + + IF(SOLID_FOUND) +@@ -33,6 +33,7 @@ IF(PKGCONFIG_FOUND) + SET(SOLID_MOTO_LIBRARY "NOT-FOUND" CACHE STRING "MOTO libraries") + SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY}) + MESSAGE(STATUS "Looking for SOLID --- found using pkg-config (${SOLID_SOLID_LIBRARY})") ++ add_library(solid ALIAS PkgConfig::SOLID) + RETURN() + ENDIF(SOLID_FOUND) + diff --git a/gnu/packages/patches/speed-dreams-runpath.patch b/gnu/packages/patches/speed-dreams-runpath.patch new file mode 100644 index 0000000000..9c665343f8 --- /dev/null +++ b/gnu/packages/patches/speed-dreams-runpath.patch @@ -0,0 +1,50 @@ +From b6ac12ffd8bfbca0ae830ea5cf52844c55025115 Mon Sep 17 00:00:00 2001 +From: Xavier Del Campo Romero +Date: Sat, 1 Feb 2025 08:02:36 +0100 +Subject: [PATCH] Do not assume Debian-specific CMAKE_INSTALL_RPATH + +6df4b6bf introduced a workaround to allow Ubuntu and Debian packages to +work with default flags, since CPack does not adjust the rpath of the +package executables according to its CPACK_PACKAGING_INSTALL_PREFIX. [1] + +However, this workaround caused a regression on those distributions not +using /usr as their CPACK_PACKAGING_INSTALL_PREFIX, such as Guix. + +Until CPack is fixed, removing this line forces build-deb.yml to set a +non-default CMAKE_INSTALL_PREFIX that matches +CPACK_PACKAGING_INSTALL_PREFIX. + +[1]: https://cmake.org/cmake/help/latest/variable/CPACK_PACKAGING_INSTALL_PREFIX.html +--- + .forgejo/workflows/build-deb.yml | 2 +- + CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/.forgejo/workflows/build-deb.yml b/.forgejo/workflows/build-deb.yml +index 72eb1b622..ee5b5b292 100644 +--- a/.forgejo/workflows/build-deb.yml ++++ b/.forgejo/workflows/build-deb.yml +@@ -25,7 +25,7 @@ jobs: + working-directory: /src + - name: Configure project + working-directory: /src +- run: cmake -B build -DSD_ASSUME_DATADIR=1 ++ run: cmake -B build -DSD_ASSUME_DATADIR=1 -DCMAKE_INSTALL_PREFIX=/usr + - name: Build project + run: cmake --build build -j$(nproc --all) + working-directory: /src +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 196de77e4..b80ca4baf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,6 @@ INCLUDE(cmake/checks.cmake) + set(CMAKE_INSTALL_RPATH + ${CMAKE_INSTALL_RPATH} + ${CMAKE_INSTALL_PREFIX}/${SD_LIBDIR}/lib +- /usr/${SD_LIBDIR}/lib + ) + + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +-- +2.39.5 + diff --git a/gnu/packages/patches/speed-dreams-version.patch b/gnu/packages/patches/speed-dreams-version.patch new file mode 100644 index 0000000000..d6269cd451 --- /dev/null +++ b/gnu/packages/patches/speed-dreams-version.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 196de77e..eff5446b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,7 +114,7 @@ if(NOT result EQUAL 0) + set(VERSION "undefined-version") + endif() + +-set(VERSION_LONG ${VERSION}) ++set(VERSION_LONG ${VERSION} CACHE STRING "The version string displayed") + + # CMAKE_PROJECT_VERSION_TWEAK is used by NSIS packagers + # its what comes after the '-' sign (if anything) -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 02 01:42:36 2025 Received: (at 75991) by debbugs.gnu.org; 2 Feb 2025 06:42:36 +0000 Received: from localhost ([127.0.0.1]:32769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teTgi-0006JX-50 for submit@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:36 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43071) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teTgf-0006JE-Ao for 75991@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:34 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2162c0f6a39so77535135ad.0 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 22:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738478546; x=1739083346; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aAUD9TE12rjnaE+aPRuc7YbkGxpSoTb46XmYSVI/Rq0=; b=VXOYpbcYkwgauNQ3q9LJECz38zofYrUF3giFPKRoiFaFuZh9Z5N13g6CHx6kb3AMu7 hRCA4c/C4YT6NR3yoq6sRyCbiHNnloJ4e/gyoRlDpNlyQc1R+ZU7a/diavEPQ2cc3W0E yLD+cJJQqEJ1E45WvarhL7OtSoB+miQSrK86ENsMEU679mZiFDnlwpEaa+aEW1rLJ3Uj 0c+IAMK+2aCu80VMgMwfq3595qFc9k8GtxI5EtYMUntvDF9L472M7RKPZOsvM5CG5J07 Bd2txesYNJsYLwtCLtp+f1i/05amZwurYFVNj7YieYlcHIHDd2/hZ8YBuoHx85Y6HPsN UNGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738478546; x=1739083346; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aAUD9TE12rjnaE+aPRuc7YbkGxpSoTb46XmYSVI/Rq0=; b=Ob0JLcz/jU+pduXfyw0zYmgzgcRB+nzxfio0PW5hUAoMrhflbd67ghZE99sLlNXWUk 74rj40PxWRhzDsxKnSGs1Z4ATtOp+RbS6bEGmKz1dRgRSjgpGMWQdTYEFJPPpZDRzoEh 3PeJ3oAj1ehdyJTokTHkBm88vxMtxeFL67vOuwcedSNioO7qr5PtG/Hhaf+kT98NS78e te0mcJ8n/nnBnNS09u3mP9lhQd5eixSguNzqBtCY8eC57iUJKZNOVnyxKEHKblf83CP+ FzHKWwNJXPYxcDN1IEzdUWcHT0t318AaIIzxqgdfyTab0Bkr1YZmrSSFT5L+OoYu9vfP sDRQ== X-Gm-Message-State: AOJu0Yysr1ZP3LMeJTJCp3btl8vXOoDOX2l7dZwduN9nEfFkrmoTjMGw 88BnWObyKfHvj6Ei5rzElpdQFiYgo9YAcqlBhbBH525Y+KqkAhpJAkJczg== X-Gm-Gg: ASbGnctf2Jvw+B1qCrTYi6bI+MKgN4YphEsTHa7P4oHUzpCChOY6xwR3DiUZ2cvblCM F8tXGuv6nYELdwCbd7ywYrBXbvxiHACOrc7b0mUdWoWKreNVFlSuySImUqAvUCHXGIoeehGn5k/ inKy/rh8Bq2xVBLfDAuE4WC91gy1N553hsKqLkWVFFoNwEc7itfrbOwfRaNwQFsDPXRRQMhsIgr HFJERlpdXTE/UQcKUxSDgA9MzRunkn9LThjb6tNzDBnD8DzpPMQh+lMWD++ubvEt8NNpJ5Cr3tO sEKih9CoYdM9lUE4qsJv87Wbr6JTjWoROg== X-Google-Smtp-Source: AGHT+IEbAIKQv0iIl6CqyKozneuElyoDk/ZFXnmF2sv+KlQsndWUL8hhcEH2Xem7zzo5MpLejANnYQ== X-Received: by 2002:a17:902:f687:b0:216:6db1:1a6e with SMTP id d9443c01a7336-21edd7ff325mr153154735ad.10.1738478545880; Sat, 01 Feb 2025 22:42:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 22:42:25 -0800 (PST) From: Maxim Cournoyer To: 75991@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: tinygltf: Update to 2.9.3. Date: Sun, 2 Feb 2025 15:42:01 +0900 Message-ID: <427f052503ef3d9785cf457d72812802a7e3bbf0.1738478514.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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/graphics.scm (tinygltf): Update to 2.9.3. Change-Id: I680a26da98f26ed4c25de614954b59cf4d5833d3 --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2a5dd4a75c..595e188de1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2587,7 +2587,7 @@ (define-public openxr (define-public tinygltf (package (name "tinygltf") - (version "2.8.21") + (version "2.9.3") (source (origin (method git-fetch) @@ -2596,7 +2596,7 @@ (define-public tinygltf (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14712lndwlk4y001jxf2rxhwrw0w5gbc2hyh9kpik1galdzg41ii")) + (base32 "1dhzsffz25fib3362044d8qlnhrav0wf29bbgcdxi42275l6ax5k")) (modules '((guix build utils))) (snippet #~(begin (for-each delete-file-recursively base-commit: 66ee8de7522be7b47a74eaf0e199298049efb749 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 02 01:42:38 2025 Received: (at 75991) by debbugs.gnu.org; 2 Feb 2025 06:42:39 +0000 Received: from localhost ([127.0.0.1]:32772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teTgk-0006Jp-Jd for submit@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:38 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:49516) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teTgh-0006JJ-Mf for 75991@debbugs.gnu.org; Sun, 02 Feb 2025 01:42:36 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2166f1e589cso84490845ad.3 for <75991@debbugs.gnu.org>; Sat, 01 Feb 2025 22:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738478549; x=1739083349; 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=+mLh8F+U+DH58lxehPTsZRAoBBpEhykBdz4SpBJxc4E=; b=HWZ6LVLm7n52pCzQDsD5pbfbTCjXka4WvZINOJko7Wof+898SoghGa/HfpwC5ldzwE hK/WmHIBilBhStMfAzeik1ftWCQr3oWfQNWoM1OS6KYHyWZZhNQauvO4Buqs7VGbfvyO FiwvS5kcJyBgNPD0XbRwUGG8R2yQfizqaBw+N6xm8dsCNReBOoiqrjuI0xpxgc+JD8FQ YggKz21Fnk+D7JKY4TEK3GME841dhUrVZK5j/Qda7ydOMsgf+D4I2adAgL2UPi4zvYuJ RV8yDMw5XhCqAXpB19+uAD9mQmGQXX4llvK9q5Cvx7OKfex3JFoaCYGIhx6XZF1CpIwR aSbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738478549; x=1739083349; 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=+mLh8F+U+DH58lxehPTsZRAoBBpEhykBdz4SpBJxc4E=; b=dtcDLQLqUXhUH0fiIWAtLUgRECSEVEBDNtOj+Pl3xGMudHO0gL38GUAhRrusQdX5ES 7uwqGOzuVy1Gj6XmT7FMbeUQfnRZtXJicyUh1cZ+Ln4vKPPSGIX1vmBDsI7Q1q556uC4 RGFEu+uOnCvJwW+7Sm00+xTdvmCo7gpg/RzBQCAto1enHtjYTYzbmzlMLYO7mLB9qVxI zraCq6ouRZ/2HkhufoMt0lurGicEoN2YLQL4Kedh7DWExM8HcmyieLaF7ys1d66hpHxu f76nEO2HJxRL1OuFp9ahyXzrpswSDW1jFejUdUtf3oJnGxEl7Eywe36+9bavpM43gthD 4nTg== X-Gm-Message-State: AOJu0YyA5OYEQTLxrTe84P7BmiAGyBRX0Xv3d1CgenUEy77bwiv4hefb TJdeyxrt7O7FWWqp5nP2gRo5+qeoZxusHONI058bUJbfDIlyewy0A2UK1A== X-Gm-Gg: ASbGncvBO1Hfw1pEqBHU4uN3XU6eqM4n5pOhwnJcI3cUCFcAfUc/fsuMywnZ8m29mzV fLgakCLApWUmZBc1DZQe/KXBrPJkRP/zMMWj99J2pkyZtu+vzEdw+9EU2UcLp0rj/HZoitOiEvm e5fqkg0kf2NM641rghXI7NBekp/QwfzMFcg9FBMkdc+IpmirxKSQjfsJJw2VQ0oQm47KsOAtjiN coLwU4MksB8bgiITjD9Zr4VcKq4N/JFmxoNhglcMq5OZN8CZIwIqcTA6furCeSoZ2EzV58SJ0q2 2+V2VauhrZfmlQ3grPhFN7e2HbZlYf+1ag== X-Google-Smtp-Source: AGHT+IELn4mAvrXi35DZv6VVxLkSOOQijaasB9hIbAW0K/OVhtCQbLroF9ZowcKiRaE9hVyf6LQsjg== X-Received: by 2002:a17:902:f64b:b0:215:8d29:af2d with SMTP id d9443c01a7336-21dd7dccfb4mr322567595ad.38.1738478549114; Sat, 01 Feb 2025 22:42:29 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 22:42:28 -0800 (PST) From: Maxim Cournoyer To: 75991@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: tinygltf: Install a library. Date: Sun, 2 Feb 2025 15:42:02 +0900 Message-ID: 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-Debbugs-Cc: Maxim Cournoyer Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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 (-) Previously, only a static library would be produced and then deleted in a phase. * gnu/packages/graphics.scm (tinygltf) [arguments]: Add #:configure-flags. : Remove delete-static-lib. Change-Id: I019a87a4fbf68fc19270a41d58af3a2184b77215 --- gnu/packages/graphics.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 595e188de1..1492740f9c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2611,6 +2611,7 @@ (define-public tinygltf (build-system cmake-build-system) (arguments (list + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'use-our-packages @@ -2623,10 +2624,6 @@ (define-public tinygltf "stb_image_write.h") (symlink (search-input-file inputs "include/catch.hpp") "catch.hpp"))) - (add-after 'install 'delete-static-lib - (lambda _ - (delete-file (string-append #$output - "/lib/libtinygltf.a")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 02 01:42:50 2025 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 To: 75991@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: speed-dreams: Update to 2.4.0. 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-Debbugs-Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75991 Cc: Maxim Cournoyer 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/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 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 21 08:24:49 2025 Received: (at control) by debbugs.gnu.org; 21 Feb 2025 13:24:49 +0000 Received: from localhost ([127.0.0.1]:56923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tlT1M-0008Gv-T7 for submit@debbugs.gnu.org; Fri, 21 Feb 2025 08:24:49 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:60759) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tlT1K-0008Fs-Va for control@debbugs.gnu.org; Fri, 21 Feb 2025 08:24:47 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-220ec47991aso27774595ad.1 for ; Fri, 21 Feb 2025 05:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740144280; x=1740749080; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=6nnJZQ6OqLUqRvzhMgvctyxb1TcrPGzxGQfmeadkXzU=; b=ZuTyc2aTnV6ehVeMUFtmaVHt4fvNUId+F/LSJ3/kxamPVoUO+SKWTkn1oepC0EWFzc AJ+k9CmT3Oao+4bjOA/0RTCEseArbp1WbGyob++bECgeuhYbHJeSbdiifts+9U5fbhZW Fvz6tGbULki33EI+J0i7fH5W7iu2/YjxroNxA2ksqRQX+GcYjRKqeAvRAO+/fT8T5Go6 gq997s06bLmj1ZQtzsA1qBtG4MJR6Yx2a6C3PTPezPqZvKUY2NPdzO8z+vfr1dn+0A9m uC3gPpUhHvxaL0llNvV+bPket6O6lqFJC3izIaYmN1La0q2XDmGGrqrMDf2Oy4zUOqGE kx0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740144280; x=1740749080; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6nnJZQ6OqLUqRvzhMgvctyxb1TcrPGzxGQfmeadkXzU=; b=HDsVrS3erBMAAjuHcXQSziE3yS871SC+JxRk3LVwNnhnLhMhUWMyK2C+F9DJpml3Em gqS+oz+bHLkXuHBlJIEPiyljlnEcgi5Uf4zXPQ/BQr4CjGymfgbFbiPd9NOOZ+aNBRMV tXZY6/HQgZzIJFuPzifkJbAjBaRkdCcZbfgAIjV/xfv+k+owmbwJBMzVAOsn3/mHtZUB 4Jn1bQZ5oaa2TYPOIrpQUE8TKx5wZ0n0OuiHNggahA9rwVgwgtf2Vw3DPiJseyePUrpJ 233QmoFuxK5vPeofJrsssDRcowIO+xtVmhypFDbFFexz3blymhT93vvV5l4ryQu2po3d Zx8Q== X-Gm-Message-State: AOJu0YyRJco/Rc6dD+bQDWYldopF0HhZf7pwgvrHdYsCP5DOYyaW487l mAvyXK9ls8Zvt444Nc6toFLURfbTsh+6juWCJTrwTHf+ltTmxBZZfU5FuF3v X-Gm-Gg: ASbGncvZR6mng16mWbvM5T3McbCFT77T5ju7Ldn+2f/VPwounqcRB3MEOKOTrr0E83Q x1KzCrVA0k1vzDYpn3GPq+RZ2bNlAk6o4kMR101C9P9KcdjjGy9eCM44IR8Nooa4IeHAIsvAldJ t6KOmZeZ3BOD57qRcFA47bYgZJN7YKa+4QMhHKHknMSQGhIAxdMYPeeOJoerbftulIcZfEiykDV w+eeQTkMxyKST9K1+3scOBAp6DwdTEDURHsnUOFSMOZNcwxdtFtEeqs1VTAUVsYuFMOtHNTknt/ GvX9NUcwsXjdnks772tB0+xZ X-Google-Smtp-Source: AGHT+IHP+srxBYEXyKsb2CDEpoDHuHAii14yhS/PKab0Xblokeq5vd+G7x/xkStWb6h3+rwlNUsraQ== X-Received: by 2002:a17:902:c950:b0:21f:507b:9ad7 with SMTP id d9443c01a7336-2219ff5e619mr57705115ad.25.1740144280400; Fri, 21 Feb 2025 05:24:40 -0800 (PST) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5349047sm137600035ad.7.2025.02.21.05.24.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 05:24:39 -0800 (PST) Date: Fri, 21 Feb 2025 22:24:27 +0900 Message-Id: <87frk7whv8.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #75991 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 75991 quit From unknown Sun Aug 17 22:06:15 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 22 Mar 2025 11:24:23 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator