From patchwork Wed Feb 5 20:29:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 38292 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 9A86F27BBE9; Wed, 5 Feb 2025 20:31:30 +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=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 0A5F027BBE2 for ; Wed, 5 Feb 2025 20:31:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfm39-0002gn-Lz; Wed, 05 Feb 2025 15:31:07 -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 1tfm34-0002gR-Dm for guix-patches@gnu.org; Wed, 05 Feb 2025 15:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tfm33-0005b6-SI for guix-patches@gnu.org; Wed, 05 Feb 2025 15:31:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=JbibCvs9uUdIwXXy4Gfp2POu9DgqyLHGlKwiJgcvlX0=; b=DfJXISWInPmWhtDO9uTTIe5UdVM3kTXc1iuWp16V3LgEPqGLS+Iu3q15gx9d4bSWL1aIVIQqXzJLzixsOp6PCmo930lO5ZNaxKv8g7nlWn9gEInGtcYcoXnJPriLjPMQGaBacfxr73vckUrjDWvonhVyMrnhM6bdVUbm0HLiDJmSjBQUYWpoksy8bCGJhgSfkZe0BBmLdOGx+7XfS2xK53E+xXMxT+OI7TVrc6QQvvqAcukq2tgBmnYIYfwLVevxXlUg7K8oEYA7Dju6G2qp92KC7C4X4JydDllpTdDHyNwdYvt4tJon1KZUWly6tddYMs2LdAztYmdMVz2GH/ChAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tfm33-0004Nj-LX for guix-patches@gnu.org; Wed, 05 Feb 2025 15:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73934] [v2] Add CloudCompare 2.13 Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Feb 2025 20:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mattia Bunel Cc: Sharlatan Hellseher , 73934@debbugs.gnu.org, Eric Bavier Received: via spool by 73934-submit@debbugs.gnu.org id=B73934.17387874047203 (code B ref 73934); Wed, 05 Feb 2025 20:31:01 +0000 Received: (at 73934) by debbugs.gnu.org; 5 Feb 2025 20:30:04 +0000 Received: from localhost ([127.0.0.1]:52813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfm27-0001qE-5H for submit@debbugs.gnu.org; Wed, 05 Feb 2025 15:30:04 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:36120) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tfm23-0001nd-NK for 73934@debbugs.gnu.org; Wed, 05 Feb 2025 15:30:00 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0DDA6206; Wed, 5 Feb 2025 21:29:53 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id 1f4TvSsu4W_T; Wed, 5 Feb 2025 21:29:52 +0100 (CET) Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 9CCFA2F8; Wed, 5 Feb 2025 21:29:49 +0100 (CET) Date: Wed, 5 Feb 2025 21:29:47 +0100 From: Andreas Enge Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Rspamd-Action: no action X-Rspamd-Server: hera X-Rspamd-Queue-Id: 0DDA6206 X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.59 / 15.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM(-2.99)[-0.996]; MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_ATTACHMENT(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; RCPT_COUNT_THREE(0.00)[4]; FREEMAIL_CC(0.00)[debbugs.gnu.org,posteo.net,gmail.com] 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 Hello Mattia, apologies for the exceptionally long delay in treating your patches, which are very nice and well prepared. I have slightly adapted libe57format. For the license, I kept only boost1.0, as this is given in the licence file and also in a few headers I checked. I have tried to make the tests work - it is possible to add the external test data in a separate origin, but even then there are complaints about googletest not working. So I have updated the explanations, removed the googletest native input and kept the tests disabled. This one is pushed. For cloudcompare, please find a v2 attached. The git tag did not correspond to the version, and the licence is gpl2+ ("or later"). I wonder whether the recursive git download is the way to go, or whether it does not pull bundled libraries that we had better unbundle? A few of the submodules contain "extern" in their name. For instance, it looks as if there is a second copy of libe57format that is downloaded. I also wonder whether the mixture of qt@5 and qt@6 packages is a good idea. In any case, the package compiles, and the binary starts. What do you think? Andreas From 5a42727e4625470406a47650e525a1667f9b7514 Mon Sep 17 00:00:00 2001 Message-ID: <5a42727e4625470406a47650e525a1667f9b7514.1738786951.git.andreas@enge.fr> From: Mattia Bunel Date: Wed, 5 Feb 2025 20:01:36 +0100 Subject: [PATCH] gnu: Add cloudcompare. * gnu/packages/geo.scm (cloudcompare): New variable. Change-Id: If7ec6bc74ade4df662e5e66eda13979efa53161b Signed-off-by: Andreas Enge --- gnu/packages/geo.scm | 96 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) base-commit: cc2b236e3777c0f7c758805289f42b3932668c57 prerequisite-patch-id: 0289950ff5d75c0e49094995eef252869b9b875f diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 368ea01ca17..0dd5ca921cc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -3725,3 +3725,99 @@ (define-public libe57format attributes associated with 3D point data (color and intensity), and 2D images (photos taken using a 3D imaging system).") (license license:boost1.0))) + +(define-public cloudcompare + (package + (name "cloudcompare") + (version "2.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CloudCompare/CloudCompare") + (commit "v2.13.2") + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wck05zbfkw7cg8h6fjiinjzrsk55858qg0k2m5rmr9dfdzjbzbb")))) + (inputs (list qtbase-5 + qtsvg-5 + qtlocation + qttools-5 + gdal + laszip + xerces-c + libe57format + zlib)) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list + ;; Options + "-DOPTION_BUILD_CCVIEWER=NO" + "-DBUILD_TESTING=ON" + "-DOPTION_USE_SHAPE_LIB=YES" + "-DOPTION_USE_DXF_LIB=YES" + "-DOPTION_USE_GDAL=YES" + ;; Shaders + ;; At least a shader is needed + "-DPLUGIN_GL_QEDL=YES" + "-DPLUGIN_GL_QSSAO=YES" + ;; IO + "-DPLUGIN_IO_QCORE=YES" + "-DPLUGIN_IO_QADDITIONAL=NO" + "-DPLUGIN_IO_QCSV_MATRIX=NO" + ;; No guix package for DRACO + "-DPLUGIN_IO_QDRACO=NO" + "-DPLUGIN_IO_QE57=YES" + ;; No guix package for FBX + "-DPLUGIN_IO_QFBX=NO" + ;; laszip will replace PDAL in CloudCompare 2.13 + "-DPLUGIN_IO_QLAS=YES" + "-DPLUGIN_IO_QPDAL=NO" + "-DPLUGIN_IO_QPHOTOSCAN=YES" + ;; No guix package for Riegl RDBlib + "-DPLUGIN_IO_QRDB=NO" + "-DPLUGIN_IO_QSTEP=NO" + ;; Plugins + "-DPLUGIN_STANDARD_QANIMATION=YES" + "-DQANIMATION_WITH_FFMPEG_SUPPORT=NO" + "-DPLUGIN_STANDARD_QBROOM=YES" + ;; Compilation error + "-DPLUGIN_STANDARD_QCANUPO=YES" + "-DPLUGIN_STANDARD_QCLOUDLAYERS=YES" + "-DPLUGIN_STANDARD_QCOLORIMETRIC_SEGMENTER=YES" + "-DPLUGIN_STANDARD_QCOMPASS=YES" + ;; Only for Windows at the moment + "-DPLUGIN_STANDARD_QCORK=NO" + "-DPLUGIN_STANDARD_QCSF=YES" + "-DPLUGIN_STANDARD_QFACETS=YES" + ;; Error with eigen + "-DPLUGIN_STANDARD_QHOUGH_NORMALS=NO" + "-DPLUGIN_STANDARD_QHPR=YES" + ;; Need qtWebSocket engine + "-DPLUGIN_STANDARD_QJSONRPC=NO" + "-DPLUGIN_STANDARD_QM3C2=YES" + ;; Need PCL lib + "-DPLUGIN_STANDARD_MASONRY_QAUTO_SEG=NO" + "-DPLUGIN_STANDARD_MASONRY_QMANUAL_SEG=NO" + "-DPLUGIN_STANDARD_QPCL=NO" + ;; Need CGAL + "-DPLUGIN_STANDARD_QMESH_BOOLEAN=NO" + "-DPLUGIN_STANDARD_QMPLANE=YES" + "-DPLUGIN_STANDARD_QPCV=NO" + "-DPLUGIN_STANDARD_QPOISSON_RECON=YES" + "-DPLUGIN_STANDARD_QRANSAC_SD=YES" + "-DPLUGIN_STANDARD_QSRA=YES") + #:build-type "Release" + #:tests? #f)) + (home-page "https://cloudcompare.org/") + (synopsis "Point cloud processing software") + (description + "CloudCompare is a 3D point cloud (and triangular mesh) processing +software. It was originally designed to perform comparison between two +3D point clouds (such as the ones obtained with a laser scanner) or between +a point cloud and a triangular mesh. It relies on an octree structure that +is highly optimized for this particular use-case. It is also meant to deal +with huge point clouds.") + (license license:gpl2+)))