diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-08 23:01:31 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-08 23:01:31 +0300 |
| commit | b9c9b001710ab60b448e92550e04aaae48f39452 (patch) | |
| tree | 5365af31146b71eea40ba56686f636910905074c /build_files/build_environment/cmake/versions.cmake | |
| parent | a7106883e8dff40ed4bf5cef6f69ce612abf3880 (diff) | |
Build_environment: OSL 1.10.9 / llvm 9.0.1
OSL 1.10.9 fixes osl-bug 866 [1] which is long standing issue
on windows where paths get un-escaped and osl breaks when you
install it to for instance c:\blender-tests\new-boolean
This patch bumps osl to 1.10.9, and since osl is llvm's
only consumer, llvm/clang were bumped 9.0.1
Removed some of the patches that were no longer needed
Builds and passes all tests on windows and linux
[1] https://github.com/imageworks/OpenShadingLanguage/issues/866
Differential Revision: https://developer.blender.org/D6744
Reviewers: brecht
Diffstat (limited to 'build_files/build_environment/cmake/versions.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index fda65922a7f..085c7b065ae 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -117,15 +117,15 @@ set(OPENCOLORIO_VERSION 1.1.0) set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz) set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8) -set(LLVM_VERSION 6.0.1) -set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) -set(LLVM_HASH c88c98709300ce2c285391f387fecce0) +set(LLVM_VERSION 9.0.1) +set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz) +set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc) -set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz) -set(CLANG_HASH 4e419bd4e3b55aa06d872320f754bd85) +set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz) +set(CLANG_HASH 13468e4a44940efef1b75e8641752f90) -set(OPENMP_URI http://releases.llvm.org/${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz) -set(OPENMP_HASH 4826402ae3633c36c51ba4d0e5527d30) +set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz) +set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf) set(OPENIMAGEIO_VERSION 1.8.13) set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz) @@ -135,9 +135,9 @@ set(TIFF_VERSION 4.0.9) set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz) set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79) -set(OSL_VERSION 1.9.9) +set(OSL_VERSION 1.10.9) set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz) -set(OSL_HASH 44ad511e424965a10fce051a053b0605) +set(OSL_HASH a94f1e8506f7e8f5e993653de5c5fa00) set(PYTHON_VERSION 3.7.4) set(PYTHON_SHORT_VERSION 3.7) |