diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-05-20 20:14:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-06-08 20:22:59 +0300 |
| commit | 8bd09b1d77a3b83f7725c6794132bcec5018506f (patch) | |
| tree | e2f3216899c33825f7932441ddb6dcde5d13ce15 /build_files | |
| parent | f29a738e23ce487fc9ae759326fc3409b82f8b26 (diff) | |
Build: upgrade OpenImageDenoise to 1.4.0
CMake builder and install deps changes, precompiled libraries are still to be
committed.
Ref T88438, T88434
Differential Revision: https://developer.blender.org/D11486
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 4 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 8 | ||||
| -rw-r--r-- | build_files/build_environment/patches/oidn.diff | 30 |
3 files changed, 6 insertions, 36 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 4500245d42a..d93b8463b4b 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -432,9 +432,9 @@ set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a) set(USD_HASH_TYPE MD5) set(USD_FILE usd-v${USD_VERSION}.tar.gz) -set(OIDN_VERSION 1.3.0) +set(OIDN_VERSION 1.4.0) set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz) -set(OIDN_HASH 301a5a0958d375a942014df0679b9270) +set(OIDN_HASH 421824019becc5b664a22a2b98332bc5) set(OIDN_HASH_TYPE MD5) set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index fd68129a0ff..808e154955d 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -553,10 +553,10 @@ EMBREE_FORCE_BUILD=false EMBREE_FORCE_REBUILD=false EMBREE_SKIP=false -OIDN_VERSION="1.3.0" -OIDN_VERSION_SHORT="1.3" -OIDN_VERSION_MIN="1.3.0" -OIDN_VERSION_MAX="1.4" +OIDN_VERSION="1.4.0" +OIDN_VERSION_SHORT="1.4" +OIDN_VERSION_MIN="1.4.0" +OIDN_VERSION_MAX="1.5" OIDN_FORCE_BUILD=false OIDN_FORCE_REBUILD=false OIDN_SKIP=false diff --git a/build_files/build_environment/patches/oidn.diff b/build_files/build_environment/patches/oidn.diff index 10d21d7764b..db1015b8958 100644 --- a/build_files/build_environment/patches/oidn.diff +++ b/build_files/build_environment/patches/oidn.diff @@ -1,33 +1,3 @@ -diff -Naur oidn-1.3.0/cmake/FindTBB.cmake external_openimagedenoise/cmake/FindTBB.cmake ---- oidn-1.3.0/cmake/FindTBB.cmake 2021-02-04 16:20:26 -0700 -+++ external_openimagedenoise/cmake/FindTBB.cmake 2021-02-12 09:35:53 -0700 -@@ -332,20 +332,22 @@ - ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER} - ${TBB_ROOT}/lib - ) -- - # On Windows, also search the DLL so that the client may install it. - file(GLOB DLL_NAMES - ${TBB_ROOT}/bin/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME}.dll - ${TBB_ROOT}/bin/${LIB_NAME}.dll -+ ${TBB_ROOT}/lib/${LIB_NAME}.dll - ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME}.dll - ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME_GLOB1}.dll - ${TBB_ROOT}/redist/${TBB_ARCH}/${TBB_VCVER}/${LIB_NAME_GLOB2}.dll - ${TBB_ROOT}/../redist/${TBB_ARCH}/tbb/${TBB_VCVER}/${LIB_NAME}.dll - ${TBB_ROOT}/../redist/${TBB_ARCH}_win/tbb/${TBB_VCVER}/${LIB_NAME}.dll - ) -- list(GET DLL_NAMES 0 DLL_NAME) -- get_filename_component(${BIN_DIR_VAR} "${DLL_NAME}" DIRECTORY) -- set(${DLL_VAR} "${DLL_NAME}" CACHE PATH "${COMPONENT_NAME} ${BUILD_CONFIG} dll path") -+ if (DLL_NAMES) -+ list(GET DLL_NAMES 0 DLL_NAME) -+ get_filename_component(${BIN_DIR_VAR} "${DLL_NAME}" DIRECTORY) -+ set(${DLL_VAR} "${DLL_NAME}" CACHE PATH "${COMPONENT_NAME} ${BUILD_CONFIG} dll path") -+ endif() - elseif(APPLE) - set(LIB_PATHS ${TBB_ROOT}/lib) - else() --- external_openimagedenoise/cmake/oidn_ispc.cmake 2021-02-15 17:29:34.000000000 +0100 +++ external_openimagedenoise/cmake/oidn_ispc.cmake2 2021-02-15 17:29:28.000000000 +0100 @@ -98,7 +98,7 @@ |