From 04d52b1a950199a0f340bd3e72d448ee6b6e6120 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Jul 2019 15:04:11 -0400 Subject: [PATCH] gnu: OpenImageIO: Update to 1.8.17. * gnu/packages/graphics.scm (openimageio): Update to 1.8.17. (openimageio-1.7): New variable. (blender-2.79)[inputs]: Use openimageio-1.7. --- gnu/packages/graphics.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f9baf49fe9..bda5132e33 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Tomáš Čech -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 Andreas Enge @@ -230,7 +230,7 @@ WARNING: This is a beta build of Blender.") `(("boost" ,boost) ("jemalloc" ,jemalloc) ("libx11" ,libx11) - ("openimageio" ,openimageio) + ("openimageio" ,openimageio-1.7) ("openexr" ,openexr) ("ilmbase" ,ilmbase) ("openjpeg" ,openjpeg-1) @@ -456,7 +456,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (define-public openimageio (package (name "openimageio") - (version "1.7.19") + (version "1.8.17") (source (origin (method git-fetch) (uri (git-reference @@ -465,7 +465,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (file-name (git-file-name name version)) (sha256 (base32 - "0yxxy43l3lllw7maqg42dlkgqms2d4772sxzxk7kmxg4lnhsvndc")))) + "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2")))) (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 @@ -492,6 +492,22 @@ visual effects work for film.") (home-page "http://www.openimageio.org") (license license:bsd-3))) +;; This older version of OpenImageIO is required for Blender 2.79. +(define-public openimageio-1.7 + (package + (inherit openimageio) + (name "openimageio") + (version "1.7.19") + (source (origin + (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 + "0yxxy43l3lllw7maqg42dlkgqms2d4772sxzxk7kmxg4lnhsvndc")))))) + (define-public openscenegraph (package (name "openscenegraph")