From 2e58f6ffadcc60224a09cd36aa743739a5bc49b7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 21 Mar 2023 16:18:40 +0100 Subject: [PATCH 1/2] Build: upgrade OpenImageIO to 2.4.9.0 Fix #105955: Cycles crash loading multiple PNG, TIFF and other image textures concurrently. This OpenImageIO version includes a fix for this problem. --- build_files/build_environment/cmake/versions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index f3cc398c91c..0fbde22a9b6 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.4.6.0) +set(OPENIMAGEIO_VERSION v2.4.9.0) set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz) -set(OPENIMAGEIO_HASH c7acc1b9a8fda04ef48f7de1feda4dae) +set(OPENIMAGEIO_HASH 7da92a7d6029921a8599a977ff1efa2a) set(OPENIMAGEIO_HASH_TYPE MD5) set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz) -- 2.30.2 From d834b7d4194fe138876231afe779d312dd006b4f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 21 Mar 2023 19:16:43 +0100 Subject: [PATCH 2/2] Update install_deps as well --- build_files/build_environment/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index a0d0414fbb0..b29ed1651ef 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -517,7 +517,7 @@ OPENEXR_FORCE_REBUILD=false OPENEXR_SKIP=false _with_built_openexr=false -OIIO_VERSION="2.4.6.0" +OIIO_VERSION="2.4.9.0" OIIO_VERSION_SHORT="2.4" OIIO_VERSION_MIN="2.2.0" OIIO_VERSION_MEX="2.5.0" -- 2.30.2