[bug#68112] Update openimageio and Blender [1/2]

[bug#68112] Update openimageio and Blender [1/2]

[Christine Lemmer-Webber]

[-- Attachment #1.1: Type: text/plain, Size: 730 bytes --]


Two patches.  We need a newer version of openimageio to update to the
newest Blender LTS version.  However the newer version of openimageio
doesn't work with our old version of openshadinglanguage... for now,
I've just preserved an older version of openimageio for
openshadinglanguage to use.

It would be ideal to update openshadinglanguage and add that as an input
to Blender too since that would open up custom shading nodes for our
Blender users, but alas, I ran into trouble upgrading
openshadinglanguage and don't have time to do that right now.
I suggest we get in the Blender update and if someone wants to take a
crack at upgrading OSL and adding to Blender too they can do that as a
future patch series.

 - Christine


[-- Attachment #1.2: 0001-gnu-openimageio-Update-to-2.5.6.0.patch --]
[-- Type: text/x-patch, Size: 3602 bytes --]

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(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 9bc81a3a81..edbdc74dc8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

[bug#68112] Update openimageio and Blender [1/2]

[Christine Lemmer-Webber]

[-- Attachment #1.1: Type: text/plain, Size: 22 bytes --]


And here's Blender!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0002-gnu-blender-Update-to-3.6.7.patch --]
[-- Type: text/x-patch, Size: 2963 bytes --]

From db6f54bd2555efe0bd16a384b0444c6c72490130 Mon Sep 17 00:00:00 2001
Message-ID: <db6f54bd2555efe0bd16a384b0444c6c72490130.1703867045.git.cwebber@dustycloud.org>
In-Reply-To: <e3f1d5554676dc40bd4e76b6b01554472aa8a939.1703867045.git.cwebber@dustycloud.org>
References: <e3f1d5554676dc40bd4e76b6b01554472aa8a939.1703867045.git.cwebber@dustycloud.org>
From: Christine Lemmer-Webber <cwebber@dustycloud.org>
Date: Fri, 29 Dec 2023 11:16:09 -0500
Subject: [PATCH 2/2] gnu: blender: Update to 3.6.7.

* gnu/packages/graphics.scm (blender): Update to 3.6.7.
[arguments]<#:phases>: Remove no longer required fix-broken-import phase.
[inputs] Switch freetype to freetype-with-brotli and add libepoxy.

Change-Id: I42690a2de4b36806f9ad3aa08c71ff78e87b1651
Signed-off-by: Christine Lemmer-Webber <cwebber@dustycloud.org>
---
 gnu/packages/graphics.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index edbdc74dc8..69320521d9 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -494,14 +494,14 @@ (define-public openvdb
 (define-public blender
   (package
     (name "blender")
-    (version "3.3.5")                   ;3.3.x is the current LTS version
+    (version "3.6.7")                   ;3.6.x is the current LTS version
     (source (origin
               (method url-fetch)
               (uri (string-append "https://download.blender.org/source/"
                                   "blender-" version ".tar.xz"))
               (sha256
                (base32
-                "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
+                "10i42w5l0xrz30x9y0ba5q2g05ixlzw1gprhrgzzvrjgy1vgp00x"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -544,25 +544,19 @@ (define-public blender
                 ;; satisfy the dependency on "half.h" and "Iex.h".
                 (string-append "-DCMAKE_CXX_FLAGS=-I"
                                (search-input-directory %build-inputs
-                                                       "include/OpenEXR"))))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-broken-import
-            (lambda _
-              (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
-                (("import encode_bin")
-                 "from . import encode_bin")))))))
+                                                       "include/OpenEXR"))))))
     (inputs
      (list boost
            embree
            ffmpeg-5
            fftw
-           freetype
+           freetype-with-brotli
            glew
            gmp                        ;needed for boolean operations on meshes
            ilmbase
            jack-1
            jemalloc
+           libepoxy
            libjpeg-turbo
            libpng
            libsndfile
-- 
2.41.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

bug#68112: Update openimageio and Blender [1/2]

[Vinicius Monego]

Em sex, 2023-12-29 às 11:24 -0500, Christine Lemmer-Webber escreveu:
> 
> Two patches.  We need a newer version of openimageio to update to the
> newest Blender LTS version.  However the newer version of openimageio
> doesn't work with our old version of openshadinglanguage... for now,
> I've just preserved an older version of openimageio for
> openshadinglanguage to use.
> 
> It would be ideal to update openshadinglanguage and add that as an
> input
> to Blender too since that would open up custom shading nodes for our
> Blender users, but alas, I ran into trouble upgrading
> openshadinglanguage and don't have time to do that right now.
> I suggest we get in the Blender update and if someone wants to take a
> crack at upgrading OSL and adding to Blender too they can do that as
> a
> future patch series.
> 
>  - Christine
> 

Hi,

I pushed an update to the latest Blender LTS (3.6.10) and some of its
dependencies, including OSL.

I'll submit another patch for review to add OSL and other optional
inputs to Blender.

Vinicius