From patchwork Mon Oct 28 03:35:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69576 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 9B4DF27BBE9; Mon, 28 Oct 2024 04:43:05 +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,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 68BEF27BBEA for ; Mon, 28 Oct 2024 04:43:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5HaL-0007tk-Jd; Mon, 28 Oct 2024 00:42:33 -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 1t5HaI-0007sU-HI for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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 1t5HaG-00056J-Hd for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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:References:In-Reply-To:Date:From:To:Subject; bh=Bs2tmgr9eZFTVvTDpnkhZOtjo90YdVrGbaC44avjlJo=; b=CrSihocxwz0gXWihiTL6hJd4uWNRCTiuUTRaO3W+ymb7MHk4ayks/1ODeATVuTTOw9slYq2clEN6d+QuXXt76NVkxEETE+0Z1Aex7d42QM3Nd3ROufiphUx2zANOpQxLXlh64DPnrpaCGUvmKNGHMMDGRamdoEH2d4TG02eqwORKjU1YiTGI7VnhiqUqIprIwpjFrccP7p0qKz3VLIARdhzyFinOd5kpL79aypv4u0zpy/d6j+4ErXuHCDeZ0VrE5iV+cXd6DL8W4S++CQ28SZsz9eanGSQDIIMOTuCzbch4y53CD0E2rOz1CkGes2qK4tM3lDs2z1JgLse8Mz40Dw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5Hao-0006LW-Hn; Mon, 28 Oct 2024 00:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74054] [PATCH 1/3] gnu: Add freesolid. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 04:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74054 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74054@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74054-submit@debbugs.gnu.org id=B74054.173009057124346 (code B ref 74054); Mon, 28 Oct 2024 04:43:02 +0000 Received: (at 74054) by debbugs.gnu.org; 28 Oct 2024 04:42:51 +0000 Received: from localhost ([127.0.0.1]:50388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Hab-0006KU-F8 for submit@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:50 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:53446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5HaX-0006KI-OC for 74054@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:47 -0400 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-20ca388d242so33049895ad.2 for <74054@debbugs.gnu.org>; Sun, 27 Oct 2024 21:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730090468; x=1730695268; 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=Bs2tmgr9eZFTVvTDpnkhZOtjo90YdVrGbaC44avjlJo=; b=OP/oJVBxCsEgO9nnPoUnpMd/yA4WaYIg4+nudp4n/m4hS0jaU6EKt+onZJxviuLjpD hCm1fM42EmszeiOaNDE6L7Yw5Ax7XJzWULYd1cs4ajkQ2jB4nlXgwkwXz61KXLP68hlh QyOYHpDVZTJ8S9TcCewsiyu5ce2IkePzTv7k+uSqgceUL0nqmekAaFbDzHwOSkFF5dHr mHrjQrFF+R3l5KFLNyTRoxxwkHVvLdgj5i6CtzHP6ao3Isa/NqBLvlv4gZ+kVIXkoZZt Ol3gX50Vg2wKlEMAPMh+Ur3bPG0oYRXjPpY5Qei13LPw9gr8b5lBsUnDPP4mjQv8v+EC aTvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730090468; x=1730695268; 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=Bs2tmgr9eZFTVvTDpnkhZOtjo90YdVrGbaC44avjlJo=; b=KzfHTGqCaY72JeRRR5FZD6tdSieBOq0XOILPFB9aP2RoR5xjhstRgYB7l7BCbm/7GJ Bo+PjeJUi0k/hoTwB+3aXSlbZhjobnVFfYy0sSBg181aK6L2AqHvos0hvBgl7yjvwpGW pdB5u8RBayYZpLdWnhvfNp/L/bJQwggtL9qWZLYmAQS+U/Zm3gaZ3JEDNdsCIvyg+lcw C/srcygJfpNCt+s7/BPc8jzVUEcB17nBzkktGhJ0rsXlZhIX3d0Es/BbCaFtlfCJFG7V wmg0Q2K+0CtvzFh7fEG74I6g4PQVhjjglWSpRXlSvDBNQaWwuSX/+g3qtHa4QQXH5YQm NFUQ== X-Gm-Message-State: AOJu0YzpvxPpTwHVCDqmR24LxqkxLcE2G8bq0bDRum71iatJV1Pnaeb2 J8+ycErNquE7gj9lQAJAuu/o5N5qF89USN/9CWBiB7DJVfEp8tYPr5v0jw== X-Google-Smtp-Source: AGHT+IHyDozGZEFxXKylpyOY4v1JmQgeqv7DFPOGYh7b/Dqc9UOgRu8pMvM0d18Ae+q1XE+3TG9AdQ== X-Received: by 2002:a17:902:d4c1:b0:20c:b090:c87 with SMTP id d9443c01a7336-210c69eb354mr102497885ad.29.1730090467855; Sun, 27 Oct 2024 21:41:07 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-210bbf702f1sm42612985ad.105.2024.10.27.21.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 21:41:07 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 28 Oct 2024 12:35:15 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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/game-development.scm (freesolid): New variable. * gnu/packages/patches/freesolid-configure.patch: New file. * gnu/packages/patches/freesolid-pkgconfig.patch: Likewise. * gnu/packages/patches/freesolid-automake.patch: Likewise. * gnu/packages/patches/freesolid-autotools.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: I557332031a30d944f451d0a62c763e5b41c4e29b --- gnu/local.mk | 4 + gnu/packages/game-development.scm | 30 ++++++++ gnu/packages/patches/freesolid-automake.patch | 60 +++++++++++++++ .../patches/freesolid-autotools.patch | 73 +++++++++++++++++++ .../patches/freesolid-configure.patch | 40 ++++++++++ .../patches/freesolid-pkgconfig.patch | 46 ++++++++++++ 6 files changed, 253 insertions(+) create mode 100644 gnu/packages/patches/freesolid-automake.patch create mode 100644 gnu/packages/patches/freesolid-autotools.patch create mode 100644 gnu/packages/patches/freesolid-configure.patch create mode 100644 gnu/packages/patches/freesolid-pkgconfig.patch diff --git a/gnu/local.mk b/gnu/local.mk index 911af88627..73121dce5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1289,6 +1289,10 @@ dist_patch_DATA = \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-CVE-2020-21428.patch \ %D%/packages/patches/freeimage-CVE-2020-22524.patch \ + %D%/packages/patches/freesolid-automake.patch \ + %D%/packages/patches/freesolid-autotools.patch \ + %D%/packages/patches/freesolid-configure.patch \ + %D%/packages/patches/freesolid-pkgconfig.patch \ %D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch \ %D%/packages/patches/fuse-glibc-2.34.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ee869c9cc5..25cc021f6f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2022 dan ;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2024 Nicolas Graves +;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -2796,6 +2797,35 @@ (define-public flatzebra double-buffering.") (license license:gpl2+))) +(define-public freesolid + (package + (name "freesolid") + (version "2.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/" name "/FreeSOLID-" + version ".zip")) + (sha256 + (base32 + "0wxqiv1ba227kwxpgwf6in9ai1lcamhmp1ib1c1chq4xvnpwdvc9")) + (patches (search-patches "freesolid-autotools.patch" + "freesolid-pkgconfig.patch" + "freesolid-configure.patch" + "freesolid-automake.patch")))) + (build-system gnu-build-system) + (arguments (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'force-reboostrap + (lambda _ + (delete-file "bootstrap.sh") + (delete-file "configure")))))) + (native-inputs (list autoconf automake libtool unzip)) + (home-page "https://sourceforge.net/projects/freesolid/") + (synopsis "3D collision detection C++ library") + (description "FreeSOLID is a library for collision detection of +three-dimensional objects undergoing rigid motion and deformation. FreeSOLID +is designed to be used in interactive 3D graphics applications.") + (license license:lgpl2.0+))) + (define-public libccd (package (name "libccd") diff --git a/gnu/packages/patches/freesolid-automake.patch b/gnu/packages/patches/freesolid-automake.patch new file mode 100644 index 0000000000..157d308641 --- /dev/null +++ b/gnu/packages/patches/freesolid-automake.patch @@ -0,0 +1,60 @@ +FreeSOLID-2.1.1-Makefile.am-update.patch + +From: Alec Leamas + +This patch causes a few extra header files to be installed; they are used by +Speed-Dreams for example. + +Source: https://src.fedoraproject.org/rpms/FreeSOLID/raw/rawhide/f/FreeSOLID-2.1.1-Makefile.am-update.patch +Rebased on top of 2.1.2 by Maxim Cournoyer +Upstream-status: https://sourceforge.net/p/freesolid/patches/11/ + +--- + + Makefile.am | 20 ++++++++++++++++++-- + libsolid/Makefile.am | 2 +- + 2 files changed, 19 insertions(+), 3 deletions(-) + +--- a/Makefile.am 2024-10-28 10:57:11.026754300 +0900 ++++ b/Makefile.am 2024-10-28 10:59:13.178729378 +0900 +@@ -1,5 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = libmoto libbroad libsolid sample doc + +-EXTRA_DIST = include ++EXTRA_DIST = FreeSOLID.pc.in + bin_SCRIPTS = freesolid-config + + pkgconfigdir = $(libdir)/pkgconfig +-dist_pkgconfig_DATA = FreeSOLID.pc ++nodist_pkgconfig_DATA = FreeSOLID.pc ++ ++FreeSOLID_3Ddir = $(includedir)/FreeSOLID/3D ++FreeSOLID_3D_HEADERS = ++FreeSOLID_3D_HEADERS += include/3D/Basic.h ++FreeSOLID_3D_HEADERS += include/3D/Matrix.h ++FreeSOLID_3D_HEADERS += include/3D/Point.h ++FreeSOLID_3D_HEADERS += include/3D/Quaternion.h ++FreeSOLID_3D_HEADERS += include/3D/Tuple3.h ++FreeSOLID_3D_HEADERS += include/3D/Tuple4.h ++FreeSOLID_3D_HEADERS += include/3D/Vector.h ++ ++FreeSOLID_SOLIDdir = $(includedir)/FreeSOLID/SOLID ++FreeSOLID_SOLID_HEADERS = ++FreeSOLID_SOLID_HEADERS += include/SOLID/solid.h ++FreeSOLID_SOLID_HEADERS += include/SOLID/broad.h ++FreeSOLID_SOLID_HEADERS += include/SOLID/types.h + +diff --git a/libsolid/Makefile.am b/libsolid/Makefile.am +index f722be3..623b2e8 100644 +--- a/libsolid/Makefile.am ++++ b/libsolid/Makefile.am +@@ -21,7 +21,7 @@ libFreeSOLID_la_SOURCES = \ + ../libmoto/MT_Vector4.cpp + + +-libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ -release @VERSION@ ++libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ + + AM_CPPFLAGS = @CPPFLAGS@ + LIBS = @QHULL_LIBS@ -lm diff --git a/gnu/packages/patches/freesolid-autotools.patch b/gnu/packages/patches/freesolid-autotools.patch new file mode 100644 index 0000000000..df99bdcd67 --- /dev/null +++ b/gnu/packages/patches/freesolid-autotools.patch @@ -0,0 +1,73 @@ +Upstream-status: https://sourceforge.net/p/freesolid/patches/1/ + +Resolve Autoconf warnings. + +diff --git a/Makefile.am b/Makefile.am +index 4914f44..77b157a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = libmoto libbroad libsolid sample doc + + EXTRA_DIST = include +-bin_SCRIPTS = freesolid-config +\ No newline at end of file ++bin_SCRIPTS = freesolid-config +diff --git a/configure.in b/configure.in +index 7d61ba5..41a761c 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,5 +1,6 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(sample/sample.cpp) ++AC_CONFIG_MACRO_DIR([m4]) + + AC_CANONICAL_SYSTEM + PACKAGE=FreeSOLID +@@ -22,17 +23,14 @@ AC_PROG_CXX + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL +-AC_PROG_RANLIB + AC_PROG_LIBTOOL + + CPPFLAGS="$CPPFLAGS -I../include -I./include -I. -I../libbroad -I../libmoto" + AC_SUBST(CPPFLAGS) + + dnl Checks for libraries. +-dnl Replace `main' with a function in -lm: +-AC_CHECK_LIB(m, main) +-dnl Replace `main' with a function in -lqhull: +-AC_CHECK_LIB(qhull, main, s_have_qhull=yes) ++AC_CHECK_LIB(m, ceil) ++AC_CHECK_LIB(qhull, qh_initbuild, s_have_qhull=yes) + + if test "X${s_have_qhull}" = Xyes; then + QHULL_LIBS="-lqhull" +diff --git a/libsolid/Makefile.am b/libsolid/Makefile.am +index cc295c7..f722be3 100644 +--- a/libsolid/Makefile.am ++++ b/libsolid/Makefile.am +@@ -23,7 +23,7 @@ libFreeSOLID_la_SOURCES = \ + + libFreeSOLID_la_LDFLAGS = -no-undefined -version-info @FREESOLID_CURRENT@:@FREESOLID_REVISION@:@FREESOLID_AGE@ -release @VERSION@ + +-CPPFLAGS = @CPPFLAGS@ ++AM_CPPFLAGS = @CPPFLAGS@ + LIBS = @QHULL_LIBS@ -lm + + pkginclude_HEADERS = \ +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 5559fb0..eaa705f 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -4,7 +4,7 @@ sample_SOURCES = sample.cpp + x_wing_SOURCES = x_wing.cpp + teapot_SOURCES = teapot.cpp + +-CPPFLAGS = @CPPFLAGS@ ++AM_CPPFLAGS = @CPPFLAGS@ + + LDADD = ../libsolid/libFreeSOLID.la + diff --git a/gnu/packages/patches/freesolid-configure.patch b/gnu/packages/patches/freesolid-configure.patch new file mode 100644 index 0000000000..6d1c434b6f --- /dev/null +++ b/gnu/packages/patches/freesolid-configure.patch @@ -0,0 +1,40 @@ +Fixes an incompatibility with Libtool 2+. + +Rebased on FreeSOLID-2.1.2. + +Originally retrieved from Fedora (see: +https://src.fedoraproject.org/rpms/FreeSOLID/raw/rawhide/f/FreeSOLID-2.1.1-configure.patch). + +Upstream-status: https://sourceforge.net/p/freesolid/patches/10/ + +--- a/configure.in 2024-10-28 10:54:46.642783784 +0900 ++++ b/configure.in 2024-10-28 10:55:47.558771350 +0900 +@@ -1,8 +1,8 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(sample/sample.cpp) ++AC_INIT + AC_CONFIG_MACRO_DIR([m4]) + +-AC_CANONICAL_SYSTEM ++AC_CANONICAL_TARGET + PACKAGE=FreeSOLID + VERSION=2.1.1 + FREESOLID_CURRENT=2 +@@ -15,15 +14,15 @@ + + AM_INIT_AUTOMAKE($PACKAGE, $VERSION) + +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADERS([include/config.h]) + + dnl Checks for programs. +-AC_LIBTOOL_WIN32_DLL + AC_PROG_CXX + AC_PROG_CC + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_LIBTOOL ++LT_INIT([win32-dll]) + + CPPFLAGS="$CPPFLAGS -I../include -I./include -I. -I../libbroad -I../libmoto" + AC_SUBST(CPPFLAGS) diff --git a/gnu/packages/patches/freesolid-pkgconfig.patch b/gnu/packages/patches/freesolid-pkgconfig.patch new file mode 100644 index 0000000000..564293c082 --- /dev/null +++ b/gnu/packages/patches/freesolid-pkgconfig.patch @@ -0,0 +1,46 @@ +Upstream-status: https://sourceforge.net/p/freesolid/patches/5/ + +diff --git a/FreeSOLID.pc.in b/FreeSOLID.pc.in +new file mode 100644 +index 0000000..c354f05 +--- /dev/null ++++ b/FreeSOLID.pc.in +@@ -0,0 +1,12 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: FreeSolid ++Description: 3D collision detection C++ library ++Version: @VERSION@ ++ ++Libs: -L${libdir} -lFreeSOLID @QHULL_LIBS@ ++Cflags: -I${includedir} -I${includedir}/FreeSOLID ++ +diff --git a/configure.in b/configure.in +index 41a761c..a4bc7d4 100644 +--- a/configure.in ++++ b/configure.in +@@ -52,4 +52,11 @@ dnl Checks for library functions. + AC_CHECK_FUNCS(sqrt) + AC_CHECK_FUNCS(fabs) + +-AC_OUTPUT(doc/Makefile sample/Makefile Makefile libbroad/Makefile libmoto/Makefile libsolid/Makefile freesolid-config) ++AC_OUTPUT([ doc/Makefile ++ sample/Makefile ++ Makefile ++ libbroad/Makefile ++ libmoto/Makefile ++ libsolid/Makefile ++ freesolid-config ++ FreeSOLID.pc]) +--- a/Makefile.am 2024-10-28 10:49:24.006849578 +0900 ++++ b/Makefile.am 2024-10-28 10:50:13.378839511 +0900 +@@ -3,3 +3,6 @@ + + EXTRA_DIST = include + bin_SCRIPTS = freesolid-config ++ ++pkgconfigdir = $(libdir)/pkgconfig ++dist_pkgconfig_DATA = FreeSOLID.pc From patchwork Mon Oct 28 03:35:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69578 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 5FF0427BBEA; Mon, 28 Oct 2024 04:43:13 +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,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 22D7727BBE2 for ; Mon, 28 Oct 2024 04:43:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5HaL-0007tO-7u; Mon, 28 Oct 2024 00:42:33 -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 1t5HaI-0007sR-HI for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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 1t5HaH-00056I-7R for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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:References:In-Reply-To:Date:From:To:Subject; bh=evrV9cZCaO6jn2OlbpnV2f3btrUKzAEfD58INIu7+co=; b=lFYjsJbywjEitgYE/eLr+Gg/qLaNGhaWHtEKss9OsrnC9Zsw+3n1pQzrdDIdy67hYxKfANLDbIpYFvhgi0S2AOQmdKlkrBByEgHflZ4/nzsOMxGlT8TNa/8+Hh0glYZf2K9XBB3dcYnV5it5OXQ4z0/z90Ac1qsDgYzi+cl4utyWrkdyJM+68jiPm+YdB0q8v9xNlW9PK9ZA+glI9NRyRPQJs62fin87GO4TbUqdPcyj3luR+tWt7zZa6dUM8m7+vEEW59/zd2B1okgFxGsx+pG9zT3W9xu6+SGcURO61T/vbqXQCsTSA+OeSjQRrhX1s+1rrMyp9v7rumIHmA80iw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5Hap-0006Li-FH; Mon, 28 Oct 2024 00:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74054] [PATCH 2/3] gnu: plib: Build with -fPIC. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 04:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74054 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74054@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74054-submit@debbugs.gnu.org id=B74054.173009057924381 (code B ref 74054); Mon, 28 Oct 2024 04:43:03 +0000 Received: (at 74054) by debbugs.gnu.org; 28 Oct 2024 04:42:59 +0000 Received: from localhost ([127.0.0.1]:50394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Hak-0006LA-P2 for submit@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:59 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:61914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Hae-0006KL-B2 for 74054@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:52 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20cb89a4e4cso25331045ad.3 for <74054@debbugs.gnu.org>; Sun, 27 Oct 2024 21:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730090470; x=1730695270; 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=evrV9cZCaO6jn2OlbpnV2f3btrUKzAEfD58INIu7+co=; b=ZjNM+Fgtck02cUTGpRatOa5w24CIeBUQ+pjFyg7e6nuX6W03B64u02209YO1j3+gQw JSc4AY1k1F1xFIdwglCl6qi4iRBfmCYPw78pxgc9FFG0Gf1xzSYGqWzKVIvAPZWUp1lR j1RvU0kjX/oarqlKtHb828CAMtOrq2vLjM7NffylPzXRu0ADiHw+1QvdMnhFfBxRu8hk XolpzSaEYloGKEonJNIXbESn9zMYZY7BMFuedXR9z2lnpYpOmx7SGfKiVF4EkYMlkTf8 rWTNm/q0CPWFux7gIbLKORVpCPb9oYVn96xiKap6cTNAY02+Ne6PluzGU3+g0ri02ETQ t/6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730090470; x=1730695270; 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=evrV9cZCaO6jn2OlbpnV2f3btrUKzAEfD58INIu7+co=; b=ug8WRJLJ8Vykye+7vBTwzNAgMY0RpivCIQZjZibtpTPgDzr8f4dx9w0u/5+cm1JJDz jwSVkn/e+HPHJQNnf3q1gxyXBOeY5BCl9JN64rE9gL448VaNgwSlrPulCQoPzsEzoISL YDwl14PqIWFGVSxrXEgYEKULw4U7rxBuFcavBqcgR16jVYL5l6vDKvM1AgbiBmnrtDpx SbdJsy3MUG7FoMkxPUNXytNhBJhvjaPVhj2wfVY9wU4ttnPndXmcZK3Y/nC4d/PQPCtO XcYDeG+WMvtgoLNCVWrclZgsZfPGVhxG9rUDNvrYV7z2M6rPOwaOUs0L5tIX2x71A02O fyKQ== X-Gm-Message-State: AOJu0YzDbCMAb1ttud1LBaQ1JrzhVkkJ9b6pmqN3V4Z3ZQ9WD/OQWqbH frOar60bY2oivMNaKXK/U9YM87lW/yPf4A1QMT2ht4ldV5em2wbkeqC1jw== X-Google-Smtp-Source: AGHT+IEbxyb75/jplTD3NhFDPjSctNhgaZT9peenWaKKiZcyCbOz0gzDzLhKETkElG0jxInQn+LCVg== X-Received: by 2002:a17:902:e547:b0:20c:d5c5:4039 with SMTP id d9443c01a7336-210c687a03bmr97068525ad.10.1730090469939; Sun, 27 Oct 2024 21:41:09 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-210bbf702f1sm42612985ad.105.2024.10.27.21.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 21:41:09 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 28 Oct 2024 12:35:16 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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/game-development.scm (plib) [configure-flags]: New argument. [inputs]: Move field after... [native-inputs]: ... this one. Change-Id: Ieddfb8814632f74c98d0e2cda949709b718c7a0d --- gnu/packages/game-development.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 25cc021f6f..73ae3ef084 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2573,10 +2573,12 @@ (define-public plib (patches (search-patches "plib-CVE-2011-4620.patch" "plib-CVE-2012-4552.patch")))) (build-system gnu-build-system) - (inputs - (list mesa libxi libxmu)) - (native-inputs - (list pkg-config)) + ;; plib exists only as a static library, per the author's choice (see: + ;; https://sourceforge.net/p/plib/mailman/message/10289018/). Build it + ;; with PIC, so that shared programs can at least "link" to it. + (arguments (list #:configure-flags #~(list "CXXFLAGS=-fPIC"))) + (native-inputs (list autoconf automake pkg-config)) + (inputs (list mesa libxi libxmu)) (home-page "https://plib.sourceforge.net/") (synopsis "Suite of portable game libraries") (description "PLIB is a set of libraries that will permit programmers to From patchwork Mon Oct 28 03:35:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69577 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 EBF9E27BBE9; Mon, 28 Oct 2024 04:43:05 +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,URIBL_BLOCKED autolearn=unavailable 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 266E227BBE2 for ; Mon, 28 Oct 2024 04:43:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5HaK-0007tA-Kc; Mon, 28 Oct 2024 00:42:32 -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 1t5HaI-0007sT-H5 for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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 1t5HaG-00056H-S8 for guix-patches@gnu.org; Mon, 28 Oct 2024 00:42:30 -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:References:In-Reply-To:Date:From:To:Subject; bh=QLKoNGm/FyeoFi9UscAGg0/nYg+qH3nXFlTokxsUCZE=; b=O9o5qISC5CZWhu+Ba3oTd4RCr0DAgRlwls9gI81izRxdiNqmkYTkQBVLZmTRRsGsO5lk473DHMpWKj9tp0FpSr4hDCkRlJkDAwmYEUJD7F4pVORxMdeaxOUY+YNtyoRk7nrD3/j0AM5+R6r87mmsmmty40rE6mO+9SOiNu+YtbX1jpG8HliDfkKX9TZbCkeEt5f2s2fmb+fEk+URKOGjceI8mDGJaqO6XJROZp07iOW3O7dvIgXKC1Q6t9YDPVj6D4sfPHTDoI/jReapbGqcMOU4L8JdCarpwmdypCml6MmGb8ouB5KcL4bFRPlvTkBSGkYLlcExYMjMd7Rl76XMQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5Hap-0006Lc-15; Mon, 28 Oct 2024 00:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74054] [PATCH 3/3] gnu: Add speed-dreams. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 04:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74054 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74054@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 74054-submit@debbugs.gnu.org id=B74054.173009057424363 (code B ref 74054); Mon, 28 Oct 2024 04:43:02 +0000 Received: (at 74054) by debbugs.gnu.org; 28 Oct 2024 04:42:54 +0000 Received: from localhost ([127.0.0.1]:50391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Hag-0006Kt-5X for submit@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:54 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:61538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5Hab-0006KS-4y for 74054@debbugs.gnu.org; Mon, 28 Oct 2024 00:42:50 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-20c7ee8fe6bso31557285ad.2 for <74054@debbugs.gnu.org>; Sun, 27 Oct 2024 21:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730090472; x=1730695272; 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=QLKoNGm/FyeoFi9UscAGg0/nYg+qH3nXFlTokxsUCZE=; b=UTDSCmefSrBRBRrZBN976MGNe3OVeSj0VjtBi1wbxAYNJ5XA59jksfYhgXqvAM+XSX wcDAHgOAFs/mLcv21sQdTzJ3qiOR8bi+6wjN+V+ZIhe1BP0xGxfv+fMWe/JUPcWgx/vR JwkN5mMZqM3mgkw0DyD7RSguHHrUl8gDXUkpL292e18bHqMm5Wm3KN0+vZNWKFvQ2YmV B5yl3wurVezuKugXhw8ergKAtPxTNtUTz+s7r6Jr93VTkrAx4i8wUj8zg0usyawGDBdQ 9cFVL18zP8S6AIKxLUkinKQ7BH10c2z0KGI/pHX4zRadfwBj3RihJ+SFhrFVeoiS3t7y 39+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730090472; x=1730695272; 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=QLKoNGm/FyeoFi9UscAGg0/nYg+qH3nXFlTokxsUCZE=; b=J5Es0FNnuBN3TzF97tkBXoTbFgw5E20F+g3Gs7/kyHORZ3lqJNzwmOIxwPztBUSHZs NVT5U0ORBMx+hwvhCysywrkqusQkrjGR9cOcN45uLZSIrkIiLLHkqpFT2bl2d3frqsfr k0XGYM0neTwN2wawKmDICTn4+E9TN9BAxzOdVs6+T5VZMbDybhaJmFdohxXc/52dvgfs XzK2iAYxh3NBiXy3v/3Lf/Vpq3TC2D9veqP10cl3eqYMfBGFB3pLHeuOjTsqcKlZZ5k7 b0vMb9K7KFOkarvrm5/YqSqsM7jXxyrQIHaLQqY2LekIdZYu3S/MgsVqOtdvAMmU0aZN sdgw== X-Gm-Message-State: AOJu0Yz+cwgDziVva8OTkn1TZYQmNg5N6m8Pd0meQ81XgftkQOAJu0Ge WztuBrCKckK8iC8V1QOIGosl1v3XAlF9EpRUfYOx1YZWPlwMKjVs6Bmrag== X-Google-Smtp-Source: AGHT+IEFUppfKHYzeqj0zEw2+7ClGOHQMkvl1RJXq/gJG9Xt4pOantJAh0X6u4HqObtPUYvYKJzj1g== X-Received: by 2002:a17:902:ea0e:b0:20d:27f8:d72a with SMTP id d9443c01a7336-210c6cd6531mr98372765ad.61.1730090471716; Sun, 27 Oct 2024 21:41:11 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-210bbf702f1sm42612985ad.105.2024.10.27.21.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 21:41:11 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 28 Oct 2024 12:35:17 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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): New variable. (speed-dreams-version, speed-dreams-svn-revision): New variables. (speed-dreams-source-tarball): New procedure. (speed-dreams-base-tarball, speed-dreams-more-hq-cars-and-tracks-tarball) (speed-dreams-wip-cars-and-tracks-tarball) (speed-dreams-unmaintained-tarball): New variable. Change-Id: Id14f3556d47a80c508177940f959448520b406fc --- gnu/packages/games.scm | 122 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 64b6b0941a..be96ed895b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8964,6 +8964,128 @@ (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 + (package + (name "speed-dreams") + (version speed-dreams-version) + (source speed-dreams-base-tarball) + (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)) + (inputs + (list curl + enet + expat + freeglut + freesolid + freetype + libjpeg-turbo + libogg + libpng + libvorbis + openal + openscenegraph + plib + sdl2 + sdl2-mixer + zlib)) + (home-page "https://sourceforge.net/projects/speed-dreams/") + (synopsis "Car racing simulator") + (description "Speed Dreams is a car racing simulator featuring +high-quality 3D graphics and an accurate physics engine, aiming for maximum +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 + (define-public stepmania (package (name "stepmania")