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