diff options
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 222f500445..a49310c467 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -487,7 +487,7 @@ applications.") `(("boost" ,boost) ("c-blosc" ,c-blosc) ("ilmbase" ,ilmbase) - ("tbb" ,tbb) + ("tbb" ,tbb-2020) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -553,14 +553,19 @@ typically encountered in feature film production.") #t)) (add-after 'set-paths 'add-ilmbase-include-path (lambda* (#:key inputs #:allow-other-keys) - ;; OpenEXR propagates ilmbase, but its include files do not appear - ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to - ;; the CPATH to satisfy the dependency on "half.h". - (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)))))) + ;; OpenEXR propagates ilmbase, but its include files do not + ;; appear in the C_INCLUDE_PATH, so we need to add + ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy + ;; the dependency on "half.h" and "Iex.h". + (let ((headers (string-append + (assoc-ref inputs "ilmbase") + "/include/OpenEXR"))) + (setenv "C_INCLUDE_PATH" + (string-append headers ":" + (or (getenv "C_INCLUDE_PATH") ""))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append headers ":" + (or (getenv "CPLUS_INCLUDE_PATH") "")))))))))) (inputs `(("boost" ,boost) ("jemalloc" ,jemalloc) @@ -587,7 +592,7 @@ typically encountered in feature film production.") ("python" ,python) ("python-numpy" ,python-numpy) ("openvdb" ,openvdb) - ("tbb" ,tbb) + ("tbb" ,tbb-2020) ("zlib" ,zlib) ("embree" ,embree))) (home-page "https://blender.org/") @@ -659,10 +664,9 @@ application can be customized via its API for Python scripting.") ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; the CPATH to satisfy the dependency on "half.h". (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR" - ":" (or (getenv "CPATH") ""))) - #t)))))) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))))))) (inputs `(("boost" ,boost) ("jemalloc" ,jemalloc) @@ -1196,7 +1200,7 @@ with strong support for multi-part, multi-channel use cases.") (define-public openimageio (package (name "openimageio") - (version "2.2.10.1") + (version "2.2.11.1") (source (origin (method git-fetch) (uri (git-reference @@ -1205,7 +1209,7 @@ with strong support for multi-part, multi-channel use cases.") (file-name (git-file-name name version)) (sha256 (base32 - "0wzh5n527l7ia1754cf9xmbvv4ya6hj34dy6cbq9xk9372h8gd9q")))) + "1i9r6vgz15aj1yzbf5a9lqhlyakjs793yrw5gw720l84lcyigad7")))) (build-system cmake-build-system) ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see @@ -1218,6 +1222,7 @@ with strong support for multi-part, multi-channel use cases.") (inputs `(("boost" ,boost) ("fmt" ,fmt) + ("libheif" ,libheif) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) @@ -1814,8 +1819,7 @@ requirements.") (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") #t))))) (native-inputs |