[Bf-blender-cvs] [a44a6cf4c49] tmp-vfx-platform-2023: OpenImageIO: update to 2.4.6.0

[Brecht Van Lommel]

Commit: a44a6cf4c4943a7cb47f92653fe77af45969ece3
Author: Brecht Van Lommel
Date:   Tue Dec 6 20:37:23 2022 +0100
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBa44a6cf4c4943a7cb47f92653fe77af45969ece3

OpenImageIO: update to 2.4.6.0

===================================================================

M	build_files/build_environment/cmake/versions.cmake
M	build_files/build_environment/patches/openimageio.diff

===================================================================

diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index 92141239ea1..f54fcd5715f 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -165,9 +165,9 @@ set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${
 set(OPENMP_HASH_TYPE MD5)
 set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 
-set(OPENIMAGEIO_VERSION v2.3.20.0)
+set(OPENIMAGEIO_VERSION v2.4.6.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH defb1fe7c8e64bac60eb3cacaf5c3736)
+set(OPENIMAGEIO_HASH c7acc1b9a8fda04ef48f7de1feda4dae)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
diff --git a/build_files/build_environment/patches/openimageio.diff b/build_files/build_environment/patches/openimageio.diff
index d05fc1f295f..f4a4627fa03 100644
--- a/build_files/build_environment/patches/openimageio.diff
+++ b/build_files/build_environment/patches/openimageio.diff
@@ -21,16 +21,3 @@ diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler
  endif (MSVC)
  
  if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD"
-diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/include/OpenImageIO/platform.h
---- orig/src/include/OpenImageIO/platform.h	2020-05-10 21:43:52 -0600
-+++ external_openimageio/src/include/OpenImageIO/platform.h	2020-05-13 17:04:36 -0600
-@@ -41,6 +41,9 @@
- #    ifndef NOMINMAX
- #        define NOMINMAX
- #    endif
-+#    ifndef NOGDI
-+#        define NOGDI
-+#    endif
- #    include <windows.h>
- #endif
-