From 36f0e7813d37624b1bd3c4f8985abcd43e9eaeb0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 2 Jun 2022 22:59:48 +1000
Subject: [PATCH] Blender3: fix build with OpenImageIO 2.3

---
 media-gfx/blender/blender3-3.0.0.recipe       |  2 +-
 .../blender/patches/blender3-3.0.0.patchset   | 59 +++++++++++++++----
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/media-gfx/blender/blender3-3.0.0.recipe b/media-gfx/blender/blender3-3.0.0.recipe
index 3c04e96b2..a0db54699 100644
--- a/media-gfx/blender/blender3-3.0.0.recipe
+++ b/media-gfx/blender/blender3-3.0.0.recipe
@@ -10,7 +10,7 @@ benefit from its unified pipeline and responsive development process."
 HOMEPAGE="https://www.blender.org/"
 COPYRIGHT="2002-2021 Blender Foundation"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.xz"
 CHECKSUM_SHA256="50f0f32bcdf8825a12ba5c8d853b6e6c6b2da65ef01e858ea5900a06cccbf1cb"
 SOURCE_DIR="blender-$portVersion"
diff --git a/media-gfx/blender/patches/blender3-3.0.0.patchset b/media-gfx/blender/patches/blender3-3.0.0.patchset
index 3ecc0b72c..2351709b0 100644
--- a/media-gfx/blender/patches/blender3-3.0.0.patchset
+++ b/media-gfx/blender/patches/blender3-3.0.0.patchset
@@ -1,4 +1,4 @@
-From a3c450d7c077a76ddc6e892529a61e7aa649a5c8 Mon Sep 17 00:00:00 2001
+From 2a7b89415c224f98da7b5446bb72ac2f823461d7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 19 Mar 2021 08:13:09 +1000
 Subject: Fix for Haiku
@@ -52,10 +52,10 @@ index 54fc454..89514f3 100644
    return result;
  }
 -- 
-2.30.2
+2.36.1
 
 
-From e42f83b51d19c603044a187fecaa602978898300 Mon Sep 17 00:00:00 2001
+From 576f9f2955496a8e7b6f42d1e7185dbfd1ee2526 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 19 Mar 2021 11:33:53 +1000
 Subject: Fix hangs on exit
@@ -88,10 +88,10 @@ index 1a45e53..df233cb 100644
    CLG_exit();
  
 -- 
-2.30.2
+2.36.1
 
 
-From 1b366a4083109e8eb645bdcb1a8e71a64a93d914 Mon Sep 17 00:00:00 2001
+From e9d00effce02c5b653bb0eba5045bfb0a2d2a715 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 26 Dec 2021 17:05:15 +1000
 Subject: applying patch openexr3.patch
@@ -140,10 +140,10 @@ index adf09f8..4784a9b 100644
  #include <ImfPixelType.h>
  #include <ImfStandardAttributes.h>
 -- 
-2.30.2
+2.36.1
 
 
-From d6c36dcc77d6f7b691dddee7c17fb8749f0e77f9 Mon Sep 17 00:00:00 2001
+From 8acab75d5413ca825ae06754dc21eb6a2560058a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 26 Dec 2021 20:55:05 +1000
 Subject: Link with icu
@@ -163,10 +163,10 @@ index fc0c37e..1876bae 100644
    list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm)
  endif()
 -- 
-2.30.2
+2.36.1
 
 
-From f3c84cddd8ca36f931e7260194dd69f93c776ccf Mon Sep 17 00:00:00 2001
+From b48c8032d508c7498855f8d295b13ad4c00608a7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 26 Dec 2021 20:55:26 +1000
 Subject: Use clock_gettime for Haiku
@@ -186,5 +186,44 @@ index de4602b..300aa93 100644
       * supported by Blender, use another function to get the timespec.
       *
 -- 
-2.30.2
+2.36.1
+
+
+From 6abe7bee48c854abbb96ed9ea68d6800f031adb1 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 2 Jun 2022 22:43:54 +1000
+Subject: applying gentoo patch blender-3.0.1-openimageio-2.3.patch
+
+
+diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
+index aac5b5c..9456ea5 100644
+--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
++++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
+@@ -48,6 +48,15 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY
+     lib64 lib
+   )
+ 
++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY
++  NAMES
++    OpenImageIO_Util
++  HINTS
++    ${_openimageio_SEARCH_DIRS}
++  PATH_SUFFIXES
++    lib64 lib
++  )
++
+ FIND_FILE(OPENIMAGEIO_IDIFF
+   NAMES
+     idiff
+@@ -64,7 +73,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG
+     OPENIMAGEIO_LIBRARY OPENIMAGEIO_INCLUDE_DIR)
+ 
+ IF(OPENIMAGEIO_FOUND)
+-  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
++  SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
+   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
+   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
+     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
+-- 
+2.36.1