gnu: vigra: Update to 1.11.0.

* gnu/packages/image.scm (vigra)[source]: Update to 1.11.0.
  [arguments]: Disable parallel builds.
master
Andreas Enge 2016-03-17 23:09:48 +01:00
parent c5e2b69d59
commit 019b38758c
1 changed files with 51 additions and 54 deletions

View File

@ -45,7 +45,6 @@
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
@ -547,62 +546,60 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.")
(home-page "http://freeimage.sourceforge.net"))) (home-page "http://freeimage.sourceforge.net")))
(define-public vigra (define-public vigra
(let ((commit "a378732")) (package
(package (name "vigra")
(name "vigra") (version "1.11.0")
(version (string-append "1.10.0-1-" commit)) (source
(source (origin
(origin (method url-fetch)
(method git-fetch) (uri (string-append "https://github.com/ukoethe/vigra/releases/download/"
(uri (git-reference "Version-1-11-0/vigra-"
(url "https://github.com/ukoethe/vigra.git") version "-src.tar.gz"))
(commit commit))) (sha256 (base32
(file-name (string-append name "-" version)) "1jzm79kqiiilvys3b8mlzy9cvmiirrcwsrlg19qd9rza8zipsqb8"))))
(sha256 (build-system cmake-build-system)
(base32 (inputs
"0gvbfrnss1vnkmajsv716yy317j4mx5kn1rxrblxqqyghws47jm5")))) `(("boost" ,boost)
(build-system cmake-build-system) ("fftw" ,fftw)
(inputs ("fftwf" ,fftwf)
`(("boost" ,boost) ("hdf5" ,hdf5)
("fftw" ,fftw) ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
("fftwf" ,fftwf) ; to create a configure-flag
("hdf5" ,hdf5) ("libjpeg" ,libjpeg)
("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly ("libpng" ,libpng)
; to create a configure-flag ("libtiff" ,libtiff)
("libjpeg" ,libjpeg) ("openexr" ,openexr)
("libpng" ,libpng) ("python" ,python-2) ; print syntax
("libtiff" ,libtiff) ("python2-numpy" ,python2-numpy)
("openexr" ,openexr) ("zlib" ,zlib)))
("python" ,python-2) ; print syntax (native-inputs
("python2-numpy" ,python2-numpy) `(("doxygen" ,doxygen)
("zlib" ,zlib))) ("python2-nose" ,python2-nose)
(native-inputs ("python2-sphinx" ,python2-sphinx)))
`(("doxygen" ,doxygen) (arguments
("python2-nose" ,python2-nose) `(#:test-target "check"
("python2-sphinx" ,python2-sphinx))) #:parallel-build? #f ; parallel builds trigger an ICE
(arguments #:configure-flags
`(#:test-target "check" (list "-Wno-dev" ; suppress developer mode with lots of warnings
#:configure-flags (string-append "-DVIGRANUMPY_INSTALL_DIR="
(list "-Wno-dev" ; suppress developer mode with lots of warnings (assoc-ref %outputs "out")
(string-append "-DVIGRANUMPY_INSTALL_DIR=" "/lib/python2.7/site-packages")
(assoc-ref %outputs "out") ;; OpenEXR is not enabled by default.
"/lib/python2.7/site-packages") "-DWITH_OPENEXR=1"
;; OpenEXR is not enabled by default. ;; The header files of ilmbase are not found when included
"-DWITH_OPENEXR=1" ;; by the header files of openexr, and an explicit flag
;; The header files of ilmbase are not found when included ;; needs to be set.
;; by the header files of openexr, and an explicit flag (string-append "-DCMAKE_CXX_FLAGS=-I"
;; needs to be set. (assoc-ref %build-inputs "ilmbase")
(string-append "-DCMAKE_CXX_FLAGS=-I" "/include/OpenEXR"))))
(assoc-ref %build-inputs "ilmbase") (synopsis "Computer vision library")
"/include/OpenEXR")))) (description
(synopsis "Computer vision library") "VIGRA stands for Vision with Generic Algorithms. It is an image
(description
"VIGRA stands for Vision with Generic Algorithms. It is an image
processing and analysis library that puts its main emphasis on customizable processing and analysis library that puts its main emphasis on customizable
algorithms and data structures. It is particularly strong for algorithms and data structures. It is particularly strong for
multi-dimensional image processing.") multi-dimensional image processing.")
(license license:expat) (license license:expat)
(home-page "https://hci.iwr.uni-heidelberg.de/vigra")))) (home-page "https://hci.iwr.uni-heidelberg.de/vigra")))
(define-public libwebp (define-public libwebp
(package (package