From e3f1d5554676dc40bd4e76b6b01554472aa8a939 Mon Sep 17 00:00:00 2001
Message-ID: <e3f1d5554676dc40bd4e76b6b01554472aa8a939.1703867045.git.cwebber@dustycloud.org>
From: Christine Lemmer-Webber <cwebber@dustycloud.org>
Date: Fri, 29 Dec 2023 11:07:20 -0500
Subject: [PATCH 1/2] gnu: openimageio: Update to 2.5.6.0.
For the sake of supporting the older version of openshadinglanguage
we have, we also introduce openimageio-2.2 which preserves the
older version
* gnu/packages/graphics.scm (openimageio): Update to 2.5.6.0.
(openimageio-2.2): New variable, inherits from openimageio
and provides old version of 2.2.21.0.
(openshadinglanguage): Switch input to using openimageio-2.2.
Change-Id: I6e9b9563a367f86d2159ac0079c69ce38207fd14
Signed-off-by: Christine Lemmer-Webber <cwebber@dustycloud.org>
---
gnu/packages/graphics.scm | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
@@ -37,6 +37,7 @@
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2023 Eric Bavier <bavier@posteo.net>
;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -759,7 +760,7 @@ (define-public openshadinglanguage
(list boost
imath
openexr-2
- openimageio
+ openimageio-2.2
pugixml
qtbase-5
zlib))
@@ -1313,16 +1314,16 @@ (define-public openexr-2
(define-public openimageio
(package
(name "openimageio")
- (version "2.2.21.0")
+ (version "2.5.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/OpenImageIO/oiio")
- (commit (string-append "Release-" version))))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr"))))
+ "14hxydp55cqp5v1kqjpqz7ifv4j9h92hgycqql8hi7n3s4vzjc6j"))))
(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
@@ -1354,6 +1355,23 @@ (define-public openimageio
on formats and functionality used in professional, large-scale animation and
visual effects work for film.")
(home-page "https://www.openimageio.org")
+ (license license:asl2.0)))
+
+;; This is here to support our older version of openimageio.
+;; Once openimageio is upgraded, this can be removed.
+(define-public openimageio-2.2
+ (package
+ (inherit openimageio)
+ (version "2.2.21.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OpenImageIO/oiio")
+ (commit (string-append "Release-" version))))
+ (file-name (git-file-name "openimageio" version))
+ (sha256
+ (base32
+ "0aicxbshzv1g9d8d08vsj1a9klaycxaifvvp565qjv70wyma2vkr"))))
(license license:bsd-3)))
(define-public openscenegraph
base-commit: 4d8b93e865ba71d2baa606d11529c3ecb5f14aea
--
2.41.0