From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YOD5ODIvH2cKVwAA62LTzQ:P1 (envelope-from ) for ; Mon, 28 Oct 2024 06:29:07 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YOD5ODIvH2cKVwAA62LTzQ (envelope-from ) for ; Mon, 28 Oct 2024 07:29:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TgmUgpGJ; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ACgF8sQa; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730096946; a=rsa-sha256; cv=none; b=n7uX7TM91+L2vdbWplzU3yvWlphrXnl+wIvlCJWCcYbQj7zzpe612b/igilGXahWNL96wX 0jRIG5Ejnd8zNMdOUpG6LWBAn/ETj4jXm8Mv3BcJquGpphXE54n/v9qwjBVFgoVEEsonhV N/qns3olufHdRp5imFBwgIRxLSI73QE9/iUDIgShIWgVFYdK29d8dRe9jVjWu9SWeaUvak syTizwK+ae08W+DPUnzlHsCnXTiSVH353w6LP6+TGJPFayLxPak8cWOIKDvR9aI+dC6/Cs pafQKTfq8U8jQid4LnxqkUG3qOZOGrmPuVrsPP3etr18PxsbHeDPlqSlcEvlyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TgmUgpGJ; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ACgF8sQa; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730096946; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=SDiCYsnnsQDv6MKjwOQXZLo1DtRNJCXD8TvR6w6obho=; b=WQxD3BqwBedtBkwzigNo6NnjDQJf3rQrHCCYxPnpcYDwvkYvHhQHVhJPAog0NOLp+QgVTZ aklimx372VDoLFyKTkTP/D+QbJWaZQCjLLIuvnR1rgEWHZGMtYNTeU+TcBsNOEf9slek5e 9bw6WJVBU6/cutN9s/J2tnR7yxcby2X13dvwev1t0sBnSEK6t41y/0VA7P4KZ4vojVplLd Nb6iTkFxMEwAyrPMbjU/6GhsHTD5+F7UKxWHs6vcEBUjTJDT43MseqI1jhaN90xk3Kz/o1 msy3ru/Gj4kwOZAzyUtsQSK6aCvo1kMqXw2h+2/WRGojI2eVLos+9xTbmVkj6Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8BA851911A for ; Mon, 28 Oct 2024 07:29:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5JF4-0005Yn-CD; Mon, 28 Oct 2024 02:28:42 -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 1t5JEs-0005XM-Ci for guix-patches@gnu.org; Mon, 28 Oct 2024 02:28: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 1t5JEr-0006im-AP for guix-patches@gnu.org; Mon, 28 Oct 2024 02:28: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:Date:From:To:In-Reply-To:References:Subject; bh=SDiCYsnnsQDv6MKjwOQXZLo1DtRNJCXD8TvR6w6obho=; b=TgmUgpGJ3fQXoLQeLijZ3VMlWQWs1FJ4oftGIpw/t6SnwTC4FhGRWTJbAhjNcJekFGW50c3knlGMbgucGCdem1iiLZSb9FTrjuf0Fp7EL/Fm0e73PtkMTPSQMNJuilW1BaUBNKGrgCR8Ni8ijNz+Na+uexa3rxya6Soi+FRkpNd2QYV/l2kb0Brg3hxshXB/60u/VwErqgDsKY5VGrTIXjWhpqtALOLWmbLB74jEGsmTwztsBBedN8r927i3wDy575eyQE+PbdvERzv0cQea1eUOEEiP74b/1sb2pw4nwj8NcYwEbATF+liyLrez8zDE5CY3XVeBv5q4yDv+4kucAw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5JFO-0003kK-8O; Mon, 28 Oct 2024 02:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74054] [PATCH v2 1/3] gnu: Add freesolid. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 28 Oct 2024 06:29: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 , Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 74054-submit@debbugs.gnu.org id=B74054.173009689314284 (code B ref 74054); Mon, 28 Oct 2024 06:29:02 +0000 Received: (at 74054) by debbugs.gnu.org; 28 Oct 2024 06:28:13 +0000 Received: from localhost ([127.0.0.1]:51407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5JEa-0003iK-By for submit@debbugs.gnu.org; Mon, 28 Oct 2024 02:28:13 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:51254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5JEW-0003i3-LF for 74054@debbugs.gnu.org; Mon, 28 Oct 2024 02:28:10 -0400 Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-7ede82dbb63so461328a12.2 for <74054@debbugs.gnu.org>; Sun, 27 Oct 2024 23:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730096791; x=1730701591; 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=SDiCYsnnsQDv6MKjwOQXZLo1DtRNJCXD8TvR6w6obho=; b=ACgF8sQaxqb87mBFtEXYyhZcSnW5RLlz35FbaFMZ3YjSx7zc5nJXhG7Td3tw+INvIh arwtVps85+u0m4gm8yXasvrXZkbjcxZVd3pf9IkGFpXvP/Q5OUukJNDj6YLpBa4QbZbH w+np8teVdzFRWyrdvdL8tfK5N+1DfyZddrpAJNJoY6mTRsVnDpc4Ojwdl+gUen76LTek dIIdfvK0Et+Pi0Iyny7DaMzyPSeevxr7+Ft6Y0YNteee9DkS6X/CfyaJzeObQPSoMi/L HWj+lZgy2QmBgZ9F/foF8XcUXpxEa545U0RvNZhhNuXAzD6ZdzVEAhBQ4+rKyB64/nLs KyoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730096791; x=1730701591; 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=SDiCYsnnsQDv6MKjwOQXZLo1DtRNJCXD8TvR6w6obho=; b=SY+vr+6++cugLe7lcXJjNouQuiz3wyN+KJzyzaVfrq4a5LBaHLghnVuYRbTQcbO9in tjnccx4zaCC1CQp0FyfvBPRkaI6IlzC33O2NVFYksYmB2QNpVMBlWNdMpYKdDl/ClLO5 5R3QalcD7MNLZcdCLK9tC0FSyWAOUY7NXE2qNyc4dyWd+H0ZQoOhIdMz+qyrDysFJq2V gX7dAbjnfspRVV4o9bR2Tto/rXSFK+tea2JUc9bxz5Dv0U+3gWd9R6/Z4PUsUQhsGsxw +Sbnnm2ifQZzCHGnoMQmfn6qfH9FhFe46NyuDxiHJjm0UR4mj9tSYMRDPckRjgMrumSo 23Fw== X-Gm-Message-State: AOJu0YygD+IHzoXdoggCjfsx5L0fqMNL6iUJg83/YtiybeJjZJUg+Dvk itWJ1miT7stD+GlfRNuV3Jik93T+kTMGrSwiBKk+mBziW2WbpF5hsvQllQS2 X-Google-Smtp-Source: AGHT+IEvbMM4d/G+ksNaxqP9yB0HobZe/IXn0LlbBiTryvdlLQTt+vYHAU0sTsQTVV3VtgSGl8v0hw== X-Received: by 2002:a05:6a21:e92:b0:1d9:282f:3d16 with SMTP id adf61e73a8af0-1d9a84de027mr9686360637.32.1730096790407; Sun, 27 Oct 2024 23:26:30 -0700 (PDT) Received: from localhost.localdomain (vps-6234970c.vps.ovh.ca. [51.222.13.224]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72057a3fdf2sm4993850b3a.214.2024.10.27.23.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 23:26:29 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 28 Oct 2024 15:26:06 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.04 X-Spam-Score: -0.04 X-Migadu-Queue-Id: 8BA851911A X-Migadu-Scanner: mx12.migadu.com X-TUID: 2XnuolijkGVI * 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 --- Changes in v2: - Fix corrupted freesolid-automake.patch 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 | 58 +++++++++++++++ .../patches/freesolid-pkgconfig.patch | 46 ++++++++++++ 6 files changed, 271 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..09e6b905a9 --- /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 15:17:22.787773430 +0900 ++++ b/Makefile.am 2024-10-28 15:19:02.367752961 +0900 +@@ -1,8 +1,24 @@ + 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..0460b631a7 --- /dev/null +++ b/gnu/packages/patches/freesolid-configure.patch @@ -0,0 +1,58 @@ +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/ + +--- FreeSOLID-2.1.1/configure.in.orig 2012-05-24 20:58:30.000000000 +0200 ++++ FreeSOLID-2.1.1/configure.in 2012-05-24 21:08:00.932445488 +0200 +@@ -1,8 +1,11 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(sample/sample.cpp) ++AC_INIT + AC_CONFIG_MACRO_DIR([m4]) ++AC_CONFIG_SRCDIR([sample/sample.cpp]) + +-AC_CANONICAL_SYSTEM ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AC_CANONICAL_TARGET + PACKAGE=FreeSOLID + VERSION=2.1.1 + FREESOLID_CURRENT=2 +@@ -15,15 +18,14 @@ + + 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) +@@ -52,11 +54,6 @@ + AC_CHECK_FUNCS(sqrt) + AC_CHECK_FUNCS(fabs) + +-AC_OUTPUT([ doc/Makefile +- sample/Makefile +- Makefile +- libbroad/Makefile +- libmoto/Makefile +- libsolid/Makefile +- freesolid-config +- FreeSOLID.pc]) ++AC_CONFIG_FILES([doc/Makefile sample/Makefile Makefile libbroad/Makefile libmoto/Makefile libsolid/Makefile freesolid-config]) ++AC_CONFIG_FILES([FreeSOLID.pc]) ++AC_OUTPUT 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 base-commit: e4e1e16bc1b27684b55e6bf047f9f669e1a0c7b5 -- 2.46.0