me/guix
Archived
1
0
Fork 0
Code Activity

gnu: vigra: Update to a development snapshot.

Browse source 
* gnu/packages/image.scm (vigra): Update to a git snapshot to fix build
  problems with the current python-numpy.
This commit is contained in:
Andreas Enge 2016-03-05 00:30:56 +01:00
parent d7c4619bd1
commit 451b5c5dc6
1 changed files with 55 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
gnu/packages/image.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014 Ricardo Wurmus <rekado@elephly.net>
@ -44,6 +44,7 @@
#: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))
@ -545,58 +546,62 @@ 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
(package (let ((commit "a378732"))
(name "vigra") (package
(version "1.10.0") (name "vigra")
(source (version (string-append "1.10.0-1-" commit))
(origin (source
(method url-fetch) (origin
(uri (string-append "https://hci.iwr.uni-heidelberg.de/vigra/vigra-" (method git-fetch)
version "-src.tar.gz")) (uri (git-reference
(sha256 (base32 (url "https://github.com/ukoethe/vigra.git")
"16d0jvz3k49niljg9qvvlyxxl15yk0300xkymvyznlmvn1hs7m22")))) (commit commit)))
(build-system cmake-build-system) (file-name (string-append name "-" version))
(inputs (sha256
`(("boost" ,boost) (base32
("fftw" ,fftw) "0gvbfrnss1vnkmajsv716yy317j4mx5kn1rxrblxqqyghws47jm5"))))
("fftwf" ,fftwf) (build-system cmake-build-system)
("hdf5" ,hdf5) (inputs
("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly `(("boost" ,boost)
; to create a configure-flag ("fftw" ,fftw)
("libjpeg" ,libjpeg) ("fftwf" ,fftwf)
("libpng" ,libpng) ("hdf5" ,hdf5)
("libtiff" ,libtiff) ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
("openexr" ,openexr) ; to create a configure-flag
("python" ,python-2) ; print syntax ("libjpeg" ,libjpeg)
("python2-numpy" ,python2-numpy) ("libpng" ,libpng)
("zlib" ,zlib))) ("libtiff" ,libtiff)
(native-inputs ("openexr" ,openexr)
`(("doxygen" ,doxygen) ("python" ,python-2) ; print syntax
("python2-nose" ,python2-nose) ("python2-numpy" ,python2-numpy)
("python2-sphinx" ,python2-sphinx))) ("zlib" ,zlib)))
(arguments (native-inputs
`(#:test-target "check" `(("doxygen" ,doxygen)
#:configure-flags ("python2-nose" ,python2-nose)
(list "-Wno-dev" ; suppress developer mode with lots of warnings ("python2-sphinx" ,python2-sphinx)))
(string-append "-DVIGRANUMPY_INSTALL_DIR=" (arguments
(assoc-ref %outputs "out") `(#:test-target "check"
"/lib/python2.7/site-packages") #:configure-flags
;; OpenEXR is not enabled by default. (list "-Wno-dev" ; suppress developer mode with lots of warnings
"-DWITH_OPENEXR=1" (string-append "-DVIGRANUMPY_INSTALL_DIR="
;; The header files of ilmbase are not found when included (assoc-ref %outputs "out")
;; by the header files of openexr, and an explicit flag "/lib/python2.7/site-packages")
;; needs to be set. ;; OpenEXR is not enabled by default.
(string-append "-DCMAKE_CXX_FLAGS=-I" "-DWITH_OPENEXR=1"
(assoc-ref %build-inputs "ilmbase") ;; The header files of ilmbase are not found when included
"/include/OpenEXR")))) ;; by the header files of openexr, and an explicit flag
(synopsis "Computer vision library") ;; needs to be set.
(description (string-append "-DCMAKE_CXX_FLAGS=-I"
"VIGRA stands for Vision with Generic Algorithms. It is an image (assoc-ref %build-inputs "ilmbase")
"/include/OpenEXR"))))
(synopsis "Computer vision library")
(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