From patchwork Mon Jun 6 03:41:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 39756 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 A831127BBEA; Mon, 6 Jun 2022 04:43:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2B4B627BBE9 for ; Mon, 6 Jun 2022 04:43:15 +0100 (BST) Received: from localhost ([::1]:42446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny3e6-0007kL-At for patchwork@mira.cbaines.net; Sun, 05 Jun 2022 23:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny3dv-0007ia-04 for guix-patches@gnu.org; Sun, 05 Jun 2022 23:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ny3du-0001QM-MY for guix-patches@gnu.org; Sun, 05 Jun 2022 23:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ny3du-0004GY-Hn for guix-patches@gnu.org; Sun, 05 Jun 2022 23:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55816] [PATCH] gnu: meshlab: Update to 2022.02. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Jun 2022 03:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55816 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55816@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165448692916327 (code B ref -1); Mon, 06 Jun 2022 03:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Jun 2022 03:42:09 +0000 Received: from localhost ([127.0.0.1]:34045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny3cz-0004FE-TU for submit@debbugs.gnu.org; Sun, 05 Jun 2022 23:42:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:48370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ny3cn-0004Ef-Va for submit@debbugs.gnu.org; Sun, 05 Jun 2022 23:42:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny3cn-0006dO-Om for guix-patches@gnu.org; Sun, 05 Jun 2022 23:41:53 -0400 Received: from mail-40136.proton.ch ([185.70.40.136]:54040) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny3cj-0001Jz-GD for guix-patches@gnu.org; Sun, 05 Jun 2022 23:41:53 -0400 Date: Mon, 06 Jun 2022 03:41:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1654486898; x=1654746098; bh=mj6+K5LwDHFy5v3HsJMfzdYEQCyiN2DswYMYJZf5FFQ=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=PU9RXJeKS6opRafKgGJZs95xjfJhsKOX1SOcUxM9yh5AK/JzEpzw7NESeJyoNeIWQ wbMwm8hGveNykJ+X6mBDmf8Iq6GpnvRZSZFZkNd/8TVUZQmoqbXy7d7hY9oC7MFl1a 3s0/JqCdsgFBkBKh8L6c5OxWNy2nCGNcW8o7aMmGsVU9GPFLUgESyDANrWtO9q1Vgp mbxvDI6VlVfa9djtMGd5HNv24zvGBIp8k8pNEZiMNpwmJr+eUJMHJ28sxVIyJUyy9q 3mwPwSfw+/gFmp876EvnkjlQq8S8CorD3Lt22EIXUcsJf0tHLRCd6kVOHN/hmruOEq dWM+nLyp1EKbw== From: "Paul A. Patience" Message-ID: <20220606034115.803815-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.136; envelope-from=paul@apatience.com; helo=mail-40136.proton.ch 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Note that the previous version no longer compiled (this one does). * gnu/packages/engineering.scm (meshlab): Update to 2022.02. [inputs]: Remove the no longer required qtscript and qtxmlpatterns. Add (uncomment) qhull. [arguments]: Use G-expressions. <#:configure-flags>: Set the rpath to fix missing libraries (presumably new since the previous version) detected during the 'validate-runpath' phase. <#:phases>: Remove trailing boolean from 'go-to-source-dir' phase. Remove the 'move-files' phase, which was made redundant by the manually provided rpath. [description]: Move a word and add some commas to improve the readability. Typeset a program name in @samp{}. --- gnu/packages/engineering.scm | 53 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 30 deletions(-) -- 2.36.0 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6b11fc54f0..f782bb87fb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2740,21 +2740,19 @@ (define-public lib3ds (define-public meshlab (package (name "meshlab") - (version "2020.06") + (version "2022.02") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cnr-isti-vclab/meshlab") - (commit (string-append "Meshlab-" version)) + (commit (string-append "MeshLab-" version)) (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd")))) + (base32 "0dkh9qw9z2160s6gjiv0a601kp6hvl66cplvi8rfc892zcykgiwd")))) (build-system cmake-build-system) (inputs (list qtbase-5 - qtscript - qtxmlpatterns mesa glu glew @@ -2764,34 +2762,29 @@ (define-public meshlab libfreenect lib3ds openctm - ;; FIXME: Compilation fails with system qhull: - ;; https://github.com/cnr-isti-vclab/meshlab/issues/678 - ;; ("qhull" ,qhull) - )) + qhull)) (arguments - `(#:tests? #f ; Has no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'go-to-source-dir - (lambda _ (chdir "src") #t)) - (add-after 'install 'move-files - (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (string-append (assoc-ref outputs "out") - "/lib"))) - (rename-file - (string-append lib "/meshlab/libmeshlab-common.so") - (string-append lib "/libmeshlab-common.so")) - #t)))))) + (list #:tests? #f ; Has no tests + #:configure-flags + #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath=" + #$output "/lib/meshlab") + (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath=" + #$output "/lib/meshlab") + (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" + #$output "/lib/meshlab")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'go-to-source-dir + (lambda _ (chdir "src")))))) (synopsis "3D triangular mesh processing and editing software") (home-page "https://www.meshlab.net/") - (description "MeshLab is a system for the processing and -editing of unstructured large 3D triangular meshes. It is aimed to help the -processing of the typical not-so-small unstructured models arising in 3D -scanning, providing a set of tools for editing, cleaning, healing, inspecting, -rendering and converting this kind of meshes. These tools include MeshLab -proper, a versatile program with a graphical user interface, and meshlabserver, -a program that can perform mesh processing tasks in batch mode, without a -GUI.") + (description "MeshLab is a system for the processing and editing of large, +unstructured, 3D triangular meshes. It is aimed to help the processing of the +typical, not-so-small unstructured models arising in 3D scanning, providing a +set of tools for editing, cleaning, healing, inspecting, rendering and +converting this kind of meshes. These tools include MeshLab proper, a +versatile program with a graphical user interface, and @samp{meshlabserver}, a +program that can perform mesh processing tasks in batch mode, without a GUI.") (license license:gpl3+))) (define-public poke