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/patches | |
| 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/patches')
| -rw-r--r-- | build_files/build_environment/patches/openimageio_idiff.diff | 13 | ||||
| -rw-r--r-- | build_files/build_environment/patches/osl.diff | 24 |
2 files changed, 0 insertions, 37 deletions
diff --git a/build_files/build_environment/patches/openimageio_idiff.diff b/build_files/build_environment/patches/openimageio_idiff.diff deleted file mode 100644 index ae1884f76b5..00000000000 --- a/build_files/build_environment/patches/openimageio_idiff.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- idiff.cpp 2016-11-18 11:42:01 -0700 -+++ idiff.cpp 2016-11-18 11:41:25 -0700 -@@ -308,8 +308,10 @@ - // printed with three digit exponent. We change this behaviour to fit - // Linux way - #ifdef _MSC_VER -+#if _MSC_VER < 1900 - _set_output_format(_TWO_DIGIT_EXPONENT); - #endif -+#endif - std::streamsize precis = std::cout.precision(); - std::cout << " " << cr.nwarn << " pixels (" - << std::setprecision(3) << (100.0*cr.nwarn / npels) diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index 36cda06f394..b9b5937ae2b 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -1,15 +1,3 @@ -diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake external_osl/src/cmake/flexbison.cmake ---- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake 2018-05-01 16:39:02 -0600 -+++ external_osl/src/cmake/flexbison.cmake 2018-08-23 15:42:27 -0600 -@@ -77,7 +77,7 @@ - DEPENDS ${${compiler_headers}} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} -- COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}" -+ COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}" - MAIN_DEPENDENCY ${flexsrc} - DEPENDS ${${compiler_headers}} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej --- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej 1969-12-31 17:00:00 -0700 +++ external_osl/src/cmake/flexbison.cmake.rej 2018-08-24 17:42:11 -0600 @@ -45,18 +33,6 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h externa private: class MemoryManager; -diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/oslnoise.h external_osl/src/include/OSL/oslnoise.h ---- OpenShadingLanguage-Release-1.9.9/src/include/OSL/oslnoise.h 2018-05-01 16:39:02 -0600 -+++ external_osl/src/include/OSL/oslnoise.h 2018-08-24 17:42:11 -0600 -@@ -762,7 +762,7 @@ - // packed into a float4. We assume T is float and VECTYPE is float4, - // but it also works if T is Dual2<float> and VECTYPE is Dual2<float4>. - template<typename T, typename VECTYPE> --OIIO_FORCEINLINE T bilerp (VECTYPE abcd, T u, T v) { -+OIIO_FORCEINLINE T bilerp (VECTYPE& abcd, T u, T v) { - VECTYPE xx = OIIO::lerp (abcd, OIIO::simd::shuffle<1,1,3,3>(abcd), u); - return OIIO::simd::extract<0>(OIIO::lerp (xx,OIIO::simd::shuffle<2>(xx), v)); - } diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp external_osl/src/liboslexec/llvm_util.cpp --- OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp 2018-05-01 16:39:02 -0600 +++ external_osl/src/liboslexec/llvm_util.cpp 2018-08-25 14:04:27 -0600 |