ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: meshlab: Update to 2022.02.

Browse source 
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{}.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Paul A. Patience 2022-06-06 03:41:35 +00:00 committed by Ludovic Courtès
parent c09cc71724
commit f2d9d283b6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gnu/packages/engineering.scm
View file

@ -2741,21 +2741,19 @@ (define-public lib3ds
(define-public meshlab (define-public meshlab
(package (package
(name "meshlab") (name "meshlab")
(version "2020.06") (version "2022.02")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/cnr-isti-vclab/meshlab") (url "https://github.com/cnr-isti-vclab/meshlab")
(commit (string-append "Meshlab-" version)) (commit (string-append "MeshLab-" version))
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1cgx24wxh2ah5pff51rcrk6x8qcdjpkxcdak7s4cfzmxvjlshydd")))) (base32 "0dkh9qw9z2160s6gjiv0a601kp6hvl66cplvi8rfc892zcykgiwd"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
(list qtbase-5 (list qtbase-5
qtscript
qtxmlpatterns
mesa mesa
glu glu
glew glew
@ -2765,34 +2763,29 @@ (define-public meshlab
libfreenect libfreenect
lib3ds lib3ds
openctm openctm
;; FIXME: Compilation fails with system qhull: qhull))
;; https://github.com/cnr-isti-vclab/meshlab/issues/678
;; ("qhull" ,qhull)
))
(arguments (arguments
`(#:tests? #f ; Has no tests (list #:tests? #f ; Has no tests
#:phases #:configure-flags
(modify-phases %standard-phases #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
(add-after 'unpack 'go-to-source-dir #$output "/lib/meshlab")
(lambda _ (chdir "src") #t)) (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath="
(add-after 'install 'move-files #$output "/lib/meshlab")
(lambda* (#:key outputs #:allow-other-keys) (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
(let ((lib (string-append (assoc-ref outputs "out") #$output "/lib/meshlab"))
"/lib"))) #:phases
(rename-file #~(modify-phases %standard-phases
(string-append lib "/meshlab/libmeshlab-common.so") (add-after 'unpack 'go-to-source-dir
(string-append lib "/libmeshlab-common.so")) (lambda _ (chdir "src"))))))
#t))))))
(synopsis "3D triangular mesh processing and editing software") (synopsis "3D triangular mesh processing and editing software")
(home-page "https://www.meshlab.net/") (home-page "https://www.meshlab.net/")
(description "MeshLab is a system for the processing and (description "MeshLab is a system for the processing and editing of large,
editing of unstructured large 3D triangular meshes. It is aimed to help the unstructured, 3D triangular meshes. It is aimed to help the processing of the
processing of the typical not-so-small unstructured models arising in 3D typical, not-so-small unstructured models arising in 3D scanning, providing a
scanning, providing a set of tools for editing, cleaning, healing, inspecting, set of tools for editing, cleaning, healing, inspecting, rendering and
rendering and converting this kind of meshes. These tools include MeshLab converting this kind of meshes. These tools include MeshLab proper, a
proper, a versatile program with a graphical user interface, and meshlabserver, versatile program with a graphical user interface, and @samp{meshlabserver}, a
a program that can perform mesh processing tasks in batch mode, without a program that can perform mesh processing tasks in batch mode, without a GUI.")
GUI.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public poke (define-public poke