[Bf-blender-cvs] [269a903c154] tmp-vfx-platform-2023: Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

Ray Molenkamp noreply at git.blender.org
Tue Oct 25 18:10:24 CEST 2022 

Commit: 269a903c15463a891c9e2b0eb0a81ae2eb88ec8f
Author: Ray Molenkamp
Date:   Tue Oct 25 10:10:14 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB269a903c15463a891c9e2b0eb0a81ae2eb88ec8f

Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

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



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

diff --cc build_files/build_environment/CMakeLists.txt
index 5059b5a98e9,023d113b551..ef3c0388c29
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@@ -99,8 -97,8 +99,10 @@@ include(cmake/embree.cmake
  include(cmake/openpgl.cmake)
  include(cmake/fmt.cmake)
  include(cmake/robinmap.cmake)
+ include(cmake/xml2.cmake)
+ 
 +include(cmake/fribidi.cmake)
 +include(cmake/harfbuzz.cmake)
  if(NOT APPLE)
    include(cmake/xr_openxr.cmake)
    if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
diff --cc build_files/build_environment/cmake/options.cmake
index 0a45d843547,9058e945f6d..50867fadff4
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@@ -3,6 -3,8 +3,8 @@@
  if(WIN32)
    option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/fftw3 by installing mingw64" ON)
  endif()
+ option(FORCE_CHECK_HASH "Force a check of all hashses during CMake the configure phase" OFF)
 -option(WITH_BOOST_PYTHON "Enable building of boost with python support" OFF)
++
  cmake_host_system_information(RESULT NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
  set(MAKE_THREADS ${NUM_CORES} CACHE STRING "Number of threads to run make with")
  
@@@ -113,39 -98,20 +115,21 @@@ if(WIN32
  else()
    set(PATCH_CMD patch)
    set(LIBEXT ".a")
 -  set(SHAREDLIBEXT ".so")
    set(LIBPREFIX "lib")
 +  set(MESON ${LIBDIR}/python/bin/meson)
 +if(APPLE)
 +    set(SHAREDLIBEXT ".dylib")
  
-     # Let's get the current Xcode dir, to support xcode-select
-     execute_process(
-       COMMAND xcode-select --print-path
-       OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
-     execute_process(
-       COMMAND xcodebuild -version -sdk macosx SDKVersion
-       OUTPUT_VARIABLE MACOSX_SDK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
-     if(NOT CMAKE_OSX_ARCHITECTURES)
-       execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
-       message(STATUS "Detected native architecture ${ARCHITECTURE}.")
-       set(CMAKE_OSX_ARCHITECTURES "${ARCHITECTURE}")
-     endif()
-     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
-       set(OSX_DEPLOYMENT_TARGET 10.13)
-     else()
-       set(OSX_DEPLOYMENT_TARGET 11.00)
-     endif()
-     set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
 -  if(APPLE)
+     # Use same Xcode detection as Blender itself.
+     include(../cmake/platform/platform_apple_xcode.cmake)
  
      if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
        set(BLENDER_PLATFORM_ARM ON)
      endif()
  
-     set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
-     set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++17 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
-     set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
+     set(PLATFORM_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
 -    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
++    set(PLATFORM_CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -std=c++17 -stdlib=libc++ -arch ${CMAKE_OSX_ARCHITECTURES}")
+     set(PLATFORM_LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} -arch ${CMAKE_OSX_ARCHITECTURES}")
      if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
        set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin17.0.0) # OS X 10.13
      else()
@@@ -153,12 -119,10 +137,12 @@@
      endif()
      set(PLATFORM_CMAKE_FLAGS
        -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-       -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-       -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+       -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
+       -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT}
      )
    else()
 +    set(SHAREDLIBEXT ".so")
 +
      if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
        set(BLENDER_PLATFORM_ARM ON)
      endif()
diff --cc build_files/build_environment/cmake/osl.cmake
index 0c82bbbba4b,a5d000e4f44..05b079be2f6
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@@ -32,9 -32,11 +32,11 @@@ set(OSL_EXTRA_ARG
    -DUSE_Qt5=OFF
    -DINSTALL_DOCS=OFF
    -Dpugixml_ROOT=${LIBDIR}/pugixml
+   -DTIFF_ROOT=${LIBDIR}/tiff
+   -DJPEG_ROOT=${LIBDIR}/jpeg
    -DUSE_PYTHON=OFF
 -  -DCMAKE_CXX_STANDARD=14
    -DImath_ROOT=${LIBDIR}/imath
 +  -DUSE_OIIO_STATIC=OFF
  )
  
  ExternalProject_Add(external_osl
diff --cc build_files/build_environment/patches/opencollada.diff
index 5ae2d06e120,02eab251a13..edb831dc20f
--- a/build_files/build_environment/patches/opencollada.diff
+++ b/build_files/build_environment/patches/opencollada.diff
@@@ -3,19 -3,19 +3,19 @@@ index 95abbe2..4f14f30 10064
  --- a/CMakeLists.txt
  +++ b/CMakeLists.txt
  @@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
-- endif()
-- 
-- #adding PCRE
---find_package(PCRE)
--+#find_package(PCRE)
-- if (PCRE_FOUND)
-- 	message(STATUS "SUCCESSFUL: PCRE found")
-- else ()  # if pcre not found building its local copy from ./Externals
---	if (WIN32 OR APPLE)
--+	if (1)
-- 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
-- 		add_definitions(-DPCRE_STATIC)
-- 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
++ endif()
++ 
++ #adding PCRE
++-find_package(PCRE)
+++#find_package(PCRE)
++ if (PCRE_FOUND)
++ 	message(STATUS "SUCCESSFUL: PCRE found")
++ else ()  # if pcre not found building its local copy from ./Externals
++-	if (WIN32 OR APPLE)
+++	if (1)
++ 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
++ 		add_definitions(-DPCRE_STATIC)
++ 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
  diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
  index 03ad540..f7d05cf 100644
  --- a/DAEValidator/CMakeLists.txt
@@@ -66,13 -66,13 +66,13 @@@ index 40081e7..e1d1bfa 10064
  --- a/Externals/LibXML/CMakeLists.txt
  +++ b/Externals/LibXML/CMakeLists.txt
  @@ -9,6 +9,7 @@ add_definitions(
-- 		-DLIBXML_SCHEMAS_ENABLED
-- 		-DLIBXML_XPATH_ENABLED
-- 		-DLIBXML_TREE_ENABLED
--+		-DLIBXML_STATIC
-- 	)
-- 	
-- if(USE_STATIC_MSVC_RUNTIME)
++ 		-DLIBXML_SCHEMAS_ENABLED
++ 		-DLIBXML_XPATH_ENABLED
++ 		-DLIBXML_TREE_ENABLED
+++		-DLIBXML_STATIC
++ 	)
++ 	
++ if(USE_STATIC_MSVC_RUNTIME)
  diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
  index 1f9a3ee..d151e9a 100644
  --- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
@@@ -130,15 -130,28 +130,40 @@@ index 715d903..24423ce 10064
   		{
   			string id = node.attribute("id").value();
   			size_t line = node.line();
+ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+ --- a/CMakeLists.txt
+ +++ b/CMakeLists.txt
+ @@ -274,7 +274,7 @@
+  add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+  add_subdirectory(common/libBuffer)
+  add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
+ -add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+ +#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+  
+  # building OpenCOLLADA libs
+  add_subdirectory(COLLADABaseUtils)
+ @@ -284,10 +284,10 @@
+  add_subdirectory(COLLADAStreamWriter)
+  
+  # building COLLADAValidator app
+ -add_subdirectory(COLLADAValidator)
+ +#add_subdirectory(COLLADAValidator)
+  
+  # DAE validator app
+ -add_subdirectory(DAEValidator)
+ +#add_subdirectory(DAEValidator)
+  
+  # Library export
+  install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake)
 +diff -Naur OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h
 +--- OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h	2018-11-26 14:43:10 -0700
 ++++ external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h	2022-08-19 11:36:04 -0600
 +@@ -23,7 +23,7 @@
 + #	include <tr1/unordered_map>
 + #endif
 + 
 +-#ifdef _LIBCPP_VERSION
 ++#if defined(_LIBCPP_VERSION) || defined(WIN32)
 + // If we're compiling with libc++, create a namespace alias for tr1 that points to std.
 + // Not particularly elegant, and largely should be filed under "hack", but it works for OS X with clang for now.
-  namespace std {
++ namespace std {
diff --cc build_files/build_environment/patches/osl.diff
index 0fa23293205,3f4a485b037..6c7f528f035
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@@ -65,31 -62,50 +62,31 @@@ diff -Naur OpenShadingLanguage-1.12.6.2
   #include <clang/Basic/TargetInfo.h>
   #include <clang/Frontend/CompilerInstance.h>
   #include <clang/Frontend/TextDiagnosticPrinter.h>
 -diff -Naur OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp external_osl/src/liboslexec/llvm_util.cpp
 ---- OpenShadingLanguage-1.12.6.2/src/liboslexec/llvm_util.cpp	2022-09-30 17:43:53 -0600
 -+++ external_osl/src/liboslexec/llvm_util.cpp	2022-10-15 15:53:11 -0600
 -@@ -116,8 +116,6 @@
 -     return { A.data(), size_t(A.size()) };
 - }
 +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 @@
   
 --
 --
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list