[Bf-blender-cvs] [f4ecc02e482] tmp-vfx-platform-2023: deps_builder: remove 3.4 OSL patches

Ray Molenkamp noreply at git.blender.org
Thu Oct 27 18:07:34 CEST 2022


Commit: f4ecc02e48236089308635002c18646f72cfce1c
Author: Ray Molenkamp
Date:   Thu Oct 27 09:07:25 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBf4ecc02e48236089308635002c18646f72cfce1c

deps_builder: remove 3.4 OSL patches

Got added during the last master merge. The boost one is no longer
needed and the PNG one is already there.

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

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 6c7f528f035..e053f9629e6 100644
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@ -62,31 +62,3 @@ diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslcomp/oslcomp.cpp external_osl/
  #include <clang/Basic/TargetInfo.h>
  #include <clang/Frontend/CompilerInstance.h>
  #include <clang/Frontend/TextDiagnosticPrinter.h>
-diff -Naur orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
---- orig/src/cmake/externalpackages.cmake	2022-01-07 18:36:45 -0700
-+++ external_osl/src/cmake/externalpackages.cmake	2022-08-02 08:10:27 -0600
-@@ -36,12 +36,10 @@
- 
- ###########################################################################
- # Boost setup
--if (LINKSTATIC)
--    set (Boost_USE_STATIC_LIBS ON)
--else ()
--    if (MSVC)
--        add_definitions (-DBOOST_ALL_DYN_LINK=1)
--    endif ()
-+# Blender links most things static, but not boost 
-+set (Boost_USE_STATIC_LIBS OFF)
-+if (MSVC)
-+    add_definitions (-DBOOST_ALL_DYN_LINK=1)
- endif ()
- if (BOOST_CUSTOM)
-     set (Boost_FOUND true)
-@@ -80,6 +78,7 @@
- 
- 
- checked_find_package (ZLIB REQUIRED)  # Needed by several packages
-+checked_find_package (PNG REQUIRED)  # Needed since OIIO needs it
- 
- # IlmBase & OpenEXR
- checked_find_package (OpenEXR REQUIRED
\ No newline at end of file



More information about the Bf-blender-cvs mailing list