From 216637ab56c8f976986137bb1e4cef66e71e8bf9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 6 Mar 2024 16:34:27 +0100 Subject: [PATCH] Build: Upgrade OSL to 1.13.7, OIDN to 2.2.1 Fix #118020: Crash with OptiX OSL on Windows Maybe help with #119035: Memory leaks with OIDN GPU Ref #113157 Pull Request: https://projects.blender.org/blender/blender/pulls/119095 --- build_files/build_environment/cmake/versions.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index f9962bc4c91..d74f389d3da 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -219,9 +219,9 @@ set(TIFF_HOMEPAGE http://www.simplesystems.org/libtiff/) # Recent commit from 1.13.5.0 under development, which includes string table # changes that make the Cycles OptiX implementation work. Official 1.12 OSL # releases should also build but without OptiX support. -set(OSL_VERSION 3d52f3906b12d38ad0f4b991a8f9ea678171bd28) -set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/${OSL_VERSION}.tar.gz) -set(OSL_HASH dfe5d69f48930badc1ad39a4e11e2e98) +set(OSL_VERSION 1.13.7.0) +set(OSL_URI https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${OSL_VERSION}.tar.gz) +set(OSL_HASH 769ae444a7df0e6561b3e745fd2eb50d) set(OSL_HASH_TYPE MD5) set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz) @@ -529,9 +529,9 @@ set(MATERIALX_HASH fad8f4e19305fb2ee920cbff638f3560) set(MATERIALX_HASH_TYPE MD5) set(MATERIALX_FILE materialx-v${MATERIALX_VERSION}.tar.gz) -set(OIDN_VERSION 2.2.0-rc2) +set(OIDN_VERSION 2.2.1) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz) -set(OIDN_HASH 14b261af3a719c49ab10e71583f1a61a) +set(OIDN_HASH a1c5299b2b640a0e0569afcf405c82bf) set(OIDN_HASH_TYPE MD5) set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)