diff options
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fffe972659..ad5ff8ed1e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -3,12 +3,13 @@ ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; 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 © 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -160,19 +161,20 @@ application can be customized via its API for Python scripting.") (define-public assimp (package (name "assimp") - (version "3.3.1") + (version "4.1.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/assimp/assimp/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/assimp/assimp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1gy7zlgkf4nmyv8n674p3f30asis0gjz8icyy11i693n13ww71fk")))) + "1rhyqfhzifdj7yibyanph3rh13ykw3i98dnn8mz65j780472hw28")))) (build-system cmake-build-system) (inputs `(("zlib" ,zlib))) - (home-page "http://assimp.org/") + (home-page "http://www.assimp.org/") (synopsis "Asset import library") (description "The Open Asset Import Library loads more than 40 3D file formats into @@ -372,13 +374,14 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (name "openimageio") (version "1.7.19") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/OpenImageIO/oiio/" - "archive/Release-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenImageIO/oiio.git") + (commit (string-append "Release-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1qlmfhvl2wva4aifyiq7c4sdy61ddl7wykwvlpfys9p701xghvj7")))) + "0yxxy43l3lllw7maqg42dlkgqms2d4772sxzxk7kmxg4lnhsvndc")))) (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 @@ -389,7 +392,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (inputs `(("boost" ,boost) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-8) + ("libjpeg" ,libjpeg) ("libtiff" ,libtiff) ("giflib" ,giflib) ("openexr" ,openexr) @@ -408,17 +411,19 @@ visual effects work for film.") (define-public openscenegraph (package (name "openscenegraph") - (version "3.4.0") + (version "3.6.2") (source (origin - (method url-fetch) - (uri (string-append "http://trac.openscenegraph.org/downloads/developer_releases/" - "OpenSceneGraph-" version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openscenegraph/OpenSceneGraph") + (commit (string-append "OpenSceneGraph-" version)))) (sha256 (base32 - "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw")) - (patches (search-patches "openscenegraph-ffmpeg3.patch")) - (file-name (string-append name "-" version ".zip")))) + "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id")) + (file-name (string-append name "-" version "-checkout")))) + (properties + `((upstream-name . "OpenSceneGraph"))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target available @@ -430,11 +435,13 @@ visual effects work for film.") (assoc-ref %outputs "out") "/lib:" (assoc-ref %outputs "out") "/lib64")))) (native-inputs - `(("unzip" ,unzip))) + `(("pkg-config" ,pkg-config) + ("unzip" ,unzip))) (inputs `(("giflib" ,giflib) ("jasper" ,jasper) ("librsvg" ,librsvg) + ("libxrandr" ,libxrandr) ("pth" ,pth) ("qtbase" ,qtbase) ("ffmpeg" ,ffmpeg) |