[Bf-blender-cvs] [30c14dd783d] tmp-vfx-platform-2023: deps: Remove unneeded OSL patch

Ray Molenkamp noreply at git.blender.org
Fri Nov 4 18:51:45 CET 2022


Commit: 30c14dd783db30b2da866936b345281aedd4a030
Author: Ray Molenkamp
Date:   Fri Nov 4 11:51:37 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB30c14dd783db30b2da866936b345281aedd4a030

deps: Remove unneeded OSL patch

OSL has proper lifetime management these
days.

===================================================================

M	build_files/build_environment/patches/osl.diff

===================================================================

diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff
index e053f9629e6..75f7b13a165 100644
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@ -24,27 +24,6 @@ diff -Naur OpenShadingLanguage-1.12.6.2/src/cmake/externalpackages.cmake externa
  
  # IlmBase & OpenEXR
  checked_find_package (OpenEXR REQUIRED
-diff -Naur OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
---- OpenShadingLanguage-1.12.6.2/src/include/OSL/llvm_util.h	2022-09-30 17:43:53 -0600
-+++ external_osl/src/include/OSL/llvm_util.h	2022-10-15 15:37:24 -0600
-@@ -9,6 +9,8 @@
- #include <unordered_set>
- #include <vector>
- 
-+#define OSL_HAS_BLENDER_CLEANUP_FIX
-+
- #ifdef LLVM_NAMESPACE
- namespace llvm = LLVM_NAMESPACE;
- #endif
-@@ -455,7 +457,7 @@
-     llvm::BasicBlock* masked_return_block() const;
- 
-     bool is_masking_required() const { return m_is_masking_required; }
--
-+    static void Cleanup ();
-     struct ScopedMasking {
-         ScopedMasking() {}
- 
 diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
 --- OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp	2022-09-30 17:43:53 -0600
 +++ external_osl/src/liboslcomp/oslcomp.cpp	2022-10-15 14:49:26 -0600



More information about the Bf-blender-cvs mailing list