From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSoDz-0005nR-Gk for guix-patches@gnu.org; Sun, 26 Apr 2020 16:50:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSoDy-0003Nk-KN for guix-patches@gnu.org; Sun, 26 Apr 2020 16:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSoDy-0003LU-73 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSoDy-00089I-30 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:50:02 -0400 Subject: [bug#40492] [PATCH] gnu: Add meshlab Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <_UXapokzwPRYl41j0bjkPGSDUNXahWNWsEn72py7ch7Rd6DBsxW9B8rw8wTbmzj1O2HfWXz7XLbEdWCYQsFCa5DgMlGn0CKVPr779J2PFuo=@elenq.tech> <87a733v3hh.fsf@gnu.org> <87wo67ti07.fsf@gnu.org> Date: Sun, 26 Apr 2020 22:49:27 +0200 In-Reply-To: (Ekaitz Zarraga's message of "Sat, 25 Apr 2020 19:47:03 +0000") Message-ID: <87blneynu0.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ekaitz Zarraga Cc: "40492@debbugs.gnu.org" <40492@debbugs.gnu.org> --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Saluton! Ekaitz Zarraga skribis: > From 814e44cb90b1427a9af5d6a66392c5a39910e8fd Mon Sep 17 00:00:00 2001 > From: Ekaitz Zarraga > Date: Tue, 7 Apr 2020 18:56:06 +0200 > Subject: [PATCH] gnu: Add meshlab. > > * gnu/packages/engineering.scm (meshlab): New variable. Great! I added a copyright line for you, fixed up indentation (see the bit in the manual for how to do that automatically), and added a comment=E2=80=94patch attached. It built for me, but then I realized I had missed something: the external/ sub-directory contains lots of bundled copies of external tools, and indeed, the =E2=80=98configure=E2=80=99 phase shows: --8<---------------cut here---------------start------------->8--- -- Could NOT find Lib3ds (missing: LIB3DS_INCLUDE_DIR LIB3DS_LIBRARY)=20 -- Could NOT find GMP (missing: GMP_INCLUDE_DIR GMP_LIBRARY)=20 -- Could NOT find muparser (missing: MUPARSER_INCLUDE_DIR MUPARSER_LIBRARY)= =20 -- Could NOT find OpenCTM (missing: OPENCTM_INCLUDE_DIR OPENCTM_LIBRARY)=20 -- Could NOT find Qhull (missing: QHULL_qhull_LIBRARY QHULL_qhull_INCLUDE_D= IR qhull)=20 -- Found OpenMP_C: -fopenmp (found version "4.5")=20 -- Found OpenMP_CXX: -fopenmp (found version "4.5")=20 -- Found OpenMP: TRUE (found version "4.5")=20=20 -- - jhead - using bundled source -- - glew - using bundled source -- - Eigen - using bundled source -- - newuoa - using bundled source -- - levmar - using bundled source -- - lib3ds - using bundled source -- - muparser - using bundled source -- - OpenCTM - using bundled source -- - structure-synth - using bundled source -- - qhull - using bundled source --8<---------------cut here---------------end--------------->8--- Some of these are already packaged, so it should be a matter of adding them to =E2=80=98inputs=E2=80=99. For the remaining ones, it would be extr= a packaging work to do. The goal is to address all of these, but if we can address the majority of these, perhaps we can commit a first version of the package with a FIXME stating what remains to be done, if you prefer. Thanks, and apologies for overlooking it before! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2fc2ecdd88..ee90e3b429 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -16,6 +16,7 @@ ;;; Copyright =C2=A9 2019 John Soo ;;; Copyright =C2=A9 2020 Brice Waegeneire ;;; Copyright =C2=A9 2020 Vincent Legoll +;;; Copyright =C2=A9 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -2520,43 +2521,43 @@ official SDK.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/cnr-isti-vclab/meshlab") - (commit (string-append "Meshlab-" version)) - (recursive? #t))) + (url "https://github.com/cnr-isti-vclab/meshlab") + (commit (string-append "Meshlab-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) (sha256 - (base32 "1vx9jcsnnxvzi90pcxpp7p72cqg3cm6jiivdmrxkzhr2fiz= 3pfvr")))) + (base32 "1vx9jcsnnxvzi90pcxpp7p72cqg3cm6jiivdmrxkzhr2fiz3= pfvr")))) (build-system cmake-build-system) (native-inputs - `(("qtbase" ,qtbase) - ("qtscript" ,qtscript) - ("qtxmlpatterns" ,qtxmlpatterns) - ("mesa", mesa) - ("glu", glu))) + `(("qtbase" ,qtbase) + ("qtscript" ,qtscript) + ("qtxmlpatterns" ,qtxmlpatterns) + ("mesa", mesa) + ("glu", glu))) (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-commo= n.so") - (string-append lib "/libmeshlab-common.so")) - #t)))))) + `(#: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) + ;; The RUNPATH on plugins is set to OUT/lib. Move + ;; libmeshlab-common.so there so it can be found. + (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)))))) (synopsis "3D triangular mesh processing and editing software") - (home-page "http://www.meshlab.net/") - (description "MeshLab is a system for the processing and -editing of unstructured large 3D triangular meshes. It is aimed to help t= he -processing of the typical not-so-small unstructured models arising in 3D -scanning, providing a set of tools for editing, cleaning, healing, inspect= ing, -rendering and converting this kind of meshes. These tools include MeshLab -proper, a versatile program with a graphical user interface, and meshlabse= rver, -a program that can perform mesh processing tasks in batch mode, without a -GUI.") - (license license:gpl3+)))) + (home-page "http://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 processi= ng +of the typical not-so-small unstructured models arising in 3D scanning, +providing a set of tools for editing, cleaning, healing, inspecting, rende= ring +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 GU= I.") + (license license:gpl3+)))) --=-=-=--