;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix hg-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils))
(define-public cgal
(package
(name "cgal")
- (version "4.8.1")
+ (version "4.14.2")
(source (origin
(method url-fetch)
(uri (string-append
"CGAL-" version "/CGAL-" version ".tar.xz"))
(sha256
(base32
- "1c41yzl2jg3d6zx5k0iccwqwibp950q7dr7z7pp4xi9wlph3c87s"))))
+ "08lrp3hfwdypggz4138bnkh6bjxn441zg2y9xnq5mrjfc5ini6w1"))))
(build-system cmake-build-system)
(arguments
- '(;; "RelWithDebInfo" is not supported.
- #:build-type "Release"
-
- ;; No 'test' target.
- #:tests? #f))
+ '(#:tests? #f)) ; no test target
(inputs
`(("mpfr" ,mpfr)
("gmp" ,gmp)
("boost" ,boost)))
- (home-page "http://cgal.org/")
+ (home-page "https://www.cgal.org/")
(synopsis "Computational geometry algorithms library")
(description
"CGAL provides easy access to efficient and reliable geometric algorithms
#t))))
(build-system cmake-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'change-directory
(lambda _
(chdir "OpenEXR")
#t))
- (add-after 'change-directory 'disable-broken-test
- ;; This test fails on i686. Upstream developers suggest that
- ;; this test is broken on i686 and can be safely disabled:
- ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
+ (add-before 'check 'increase-test-timeout
(lambda _
- (substitute* "IlmImfTest/main.cpp"
- (("#include \"testOptimizedInterleavePatterns.h\"")
- "//#include \"testOptimizedInterleavePatterns.h\"")
- (("TEST \\(testOptimizedInterleavePatterns")
- "//TEST (testOptimizedInterleavePatterns"))
- #t)))))
+ ;; On armhf-linux, we need to override the CTest default
+ ;; timeout of 1500 seconds for the OpenEXR.IlmImf test.
+ (setenv "CTEST_TEST_TIMEOUT" "2000")
+ #t))
+ ,@(if (not (target-64bit?))
+ `((add-after 'change-directory 'disable-broken-test
+ ;; This test fails on i686. Upstream developers suggest that
+ ;; this test is broken on i686 and can be safely disabled:
+ ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
+ (lambda _
+ (substitute* "IlmImfTest/main.cpp"
+ ((".*testOptimizedInterleavePatterns.*") "")
+ ;; This test is broken in 2.4.0 and will be fixed in a later
+ ;; release: <https://github.com/openexr/openexr/issues/571>.
+ ((".*testLargeDataWindowOffsets.*") ""))
+ #t)))
+ '()))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(propagated-inputs
(list "COMPILED_BY=Guix"
(string-append "--with-boost-libdir="
(assoc-ref %build-inputs "boost") "/lib")
- "CXXFLAGS=-std=c++11"
"--disable-optimiz-arch")
#:phases
(modify-phases %standard-phases
("graphviz" ,graphviz)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("xvfb" ,xorg-server)))
+ ("xvfb" ,xorg-server-for-tests)))
(home-page "https://rapicorn.testbit.org/")
(synopsis "Toolkit for rapid development of user interfaces")
(description
(define-public opensubdiv
(package
(name "opensubdiv")
- (version "3_4_0")
+ (version "3.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/PixarAnimationStudios/OpenSubdiv")
- (commit (string-append "v" version))))
+ (url "https://github.com/PixarAnimationStudios/OpenSubdiv")
+ (commit (string-append "v" (string-join (string-split version #\.)
+ "_")))))
(file-name (git-file-name name version))
(sha256
(base32
(setenv "DISPLAY" ":1")
#t)))))
(native-inputs
- `(("xorg-server" ,xorg-server)))
+ `(("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("glew" ,glew)
("libxrandr" ,libxrandr)
(license license:gpl2))))
(define-public coin3D
- (package
- (name "coin3D")
- (version "4.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://bitbucket.org/Coin3D/coin/downloads/coin-"
- version "-src.zip"))
- (sha256
- (base32
- "1mqwlqzvc9ydfxi0bfskwlil16mbnkphfz36p0zl2mvw6h05aqh0"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (for-each delete-file
- '("cfg/csubst.exe"
- "cfg/wrapmsvc.exe"))
- #t))))
- (build-system cmake-build-system)
- (native-inputs
- `(("doxygen" ,doxygen)
- ("graphviz" ,graphviz)))
- (inputs
- `(("boost" ,boost)
- ("freeglut" ,freeglut)
- ("glew" ,glew)))
- (arguments
- `(#:configure-flags
- (list
- "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
- (string-append "-DBOOST_ROOT="
- (assoc-ref %build-inputs "boost")))))
- (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
- (synopsis
- "High-level 3D visualization library with Open Inventor 2.1 API")
- (description
- "Coin is a 3D graphics library with an Application Programming Interface
+ ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release. See:
+ ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified
+ (let ((revision 1)
+ (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d"))
+ (package
+ (name "coin3D")
+ (version
+ (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7)))
+ (source
+ (origin
+ (method hg-fetch)
+ (uri (hg-reference
+ (url "https://bitbucket.org/Coin3D/coin")
+ (changeset changeset)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (for-each delete-file
+ '("cfg/csubst.exe"
+ "cfg/wrapmsvc.exe"))
+ #t))))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("graphviz" ,graphviz)))
+ (inputs
+ `(("boost" ,boost)
+ ("freeglut" ,freeglut)
+ ("glew" ,glew)))
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DCOIN_BUILD_DOCUMENTATION_MAN=ON"
+ (string-append "-DBOOST_ROOT="
+ (assoc-ref %build-inputs "boost")))))
+ (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home")
+ (synopsis
+ "High-level 3D visualization library with Open Inventor 2.1 API")
+ (description
+ "Coin is a 3D graphics library with an Application Programming Interface
based on the Open Inventor 2.1 API. For those who are not familiar with
Open Inventor, it is a scene-graph based retain-mode rendering and model
interaction library, written in C++, which has become the de facto
standard graphics library for 3D visualization and visual simulation
software in the scientific and engineering community.")
- (license license:bsd-3)))
+ (license license:bsd-3))))
HCoop / jackhill / guix / guix.git / blobdiff