Merge branch 'master' into tmp-overlay-engine

# Conflicts:
#	source/blender/draw/modes/paint_texture_mode.c

.arcconfig

@@ -1,7 +1,6 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"phabricator.uri" : "https://developer.blender.org/",
 	"git.default-relative-commit" : "origin/master",
 	"arc.land.update.default" : "rebase",
 	"arc.land.onto.default" : "master"

.gitignore

@@ -42,7 +42,4 @@ Desktop.ini
 /build_files/build_environment/downloads
 
 # in-source buildbot signing configuration
-/build_files/buildbot/codesign/config_server.py
-
-# smoke simulation noise tile (generated)
-waveletNoiseTile.bin
+/build_files/buildbot/codesign/config_server.py

CMakeLists.txt

@@ -97,11 +97,6 @@ cmake_policy(SET CMP0010 NEW)
 # Input directories must have CMakeLists.txt
 cmake_policy(SET CMP0014 NEW)
 
-# Silence draco warning on macOS, new policy works fine.
-if(POLICY CMP0068)
-  cmake_policy(SET CMP0068 NEW)
-endif()
-
 #-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
@@ -180,15 +175,6 @@ option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ON)
-if(APPLE)
-  # There's no OpenXR runtime in sight for macOS, neither is code well
-  # tested there -> disable it by default.
-  option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" OFF)
-  mark_as_advanced(WITH_XR_OPENXR)
-else()
-  # Disabled until there's more than just the build system stuff. Should be enabled soon.
-  option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" OFF)
-endif()
 
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
@@ -256,7 +242,8 @@ endif()
 
 
 # Modifiers
-option(WITH_MOD_FLUID           "Enable Mantaflow Fluid Simulation Framework" ON)
+option(WITH_MOD_FLUID           "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE           "Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" ON)
 
@@ -278,9 +265,6 @@ option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd
 option(WITH_ALEMBIC             "Enable Alembic Support" ON)
 option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support (not officially supported)" OFF)
 
-# Universal Scene Description support
-option(WITH_USD                 "Enable Universal Scene Description (USD) Support" OFF)
-
 # 3D format support
 # Disable opencollada when we don't have precompiled libs
 option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.org)" ON)
@@ -501,8 +485,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     if(NOT MSVC)
       find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
     else()
-      find_library(
-        COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
+      find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
         PATHS
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
@@ -525,10 +508,6 @@ if(WIN32)
 
   option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
   mark_as_advanced(WINDOWS_PYTHON_DEBUG)
-
-  option(WITH_WINDOWS_BUNDLE_CRT "Bundle the C runtime for install free distribution." ON)
-  mark_as_advanced(WITH_WINDOWS_BUNDLE_CRT)
-
 endif()
 
 # The following only works with the Ninja generator in CMake >= 3.0.
@@ -623,28 +602,29 @@ endif()
 
 # enable boost for cycles, audaspace or i18n
 # otherwise if the user disabled
+if(NOT WITH_BOOST)
+  # Explicitly disabled. so disable all deps.
+  macro(set_and_warn
+    _setting _val)
+    if(${${_setting}})
+      message(STATUS "'WITH_BOOST' is disabled: forcing 'set(${_setting} ${_val})'")
+    endif()
+    set(${_setting} ${_val})
+  endmacro()
 
-set_and_warn_dependency(WITH_BOOST WITH_CYCLES         OFF)
-set_and_warn_dependency(WITH_BOOST WITH_INTERNATIONAL  OFF)
-set_and_warn_dependency(WITH_BOOST WITH_OPENVDB        OFF)
-set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO    OFF)
-set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW     OFF)
-set_and_warn_dependency(WITH_BOOST WITH_USD            OFF)
-
-if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
-   WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD))
-  message(STATUS "No dependencies need 'WITH_BOOST' forcing WITH_BOOST=OFF")
+  set_and_warn(WITH_CYCLES         OFF)
+  set_and_warn(WITH_INTERNATIONAL  OFF)
+  set_and_warn(WITH_OPENVDB        OFF)
+  set_and_warn(WITH_OPENCOLORIO    OFF)
+  set_and_warn(WITH_QUADRIFLOW     OFF)
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
+       WITH_OPENVDB OR WITH_OPENCOLORIO)
+  # Keep enabled
+else()
+  # Disable boost if not needed.
   set(WITH_BOOST OFF)
 endif()
 
-set_and_warn_dependency(WITH_TBB WITH_USD               OFF)
-set_and_warn_dependency(WITH_TBB WITH_OPENIMAGEDENOISE  OFF)
-set_and_warn_dependency(WITH_TBB WITH_OPENVDB           OFF)
-set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
-
-# OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
-set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF)
-
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
   set(WITH_OPENIMAGEIO ON)
@@ -794,14 +774,67 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
     if(MSVC)
       set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6")
     endif()
-    if(COMPILER_ASAN_LIBRARY)
-      set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
-      set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
-      set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
-    endif()
+    set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
+    set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
+    set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
   endif()
 endif()
 
+#-----------------------------------------------------------------------------
+# Platform specifics
+
+if(WITH_X11)
+  find_package(X11 REQUIRED)
+
+  find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+  mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+  list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
+
+  if(WITH_X11_XINPUT)
+    if(X11_Xinput_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+    else()
+      message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you
+      want to build without tablet support")
+    endif()
+  endif()
+
+  if(WITH_X11_XF86VMODE)
+    # XXX, why doesn't cmake make this available?
+    find_library(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
+    mark_as_advanced(X11_Xxf86vmode_LIB)
+    if(X11_Xxf86vmode_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
+    else()
+      message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you
+      want to build without")
+    endif()
+  endif()
+
+  if(WITH_X11_XFIXES)
+    if(X11_Xfixes_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
+    else()
+      message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you
+      want to build without")
+    endif()
+  endif()
+
+  if(WITH_X11_ALPHA)
+    find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
+    mark_as_advanced(X11_Xrender_LIB)
+    if(X11_Xrender_LIB)
+      list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
+    else()
+      message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you
+      want to build without")
+    endif()
+  endif()
+
+endif()
+
+
 # ----------------------------------------------------------------------------
 # Main Platform Checks
 #
@@ -911,28 +944,6 @@ if(NOT WITH_SYSTEM_EIGEN3)
   set(EIGEN3_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/Eigen3)
 endif()
 
-if(WITH_OPENVDB)
-  list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB)
-
-  if(WITH_OPENVDB_3_ABI_COMPATIBLE)
-    list(APPEND OPENVDB_DEFINITIONS -DOPENVDB_3_ABI_COMPATIBLE)
-  endif()
-
-  list(APPEND OPENVDB_INCLUDE_DIRS
-    ${BOOST_INCLUDE_DIR}
-    ${TBB_INCLUDE_DIRS}
-    ${OPENEXR_INCLUDE_DIRS})
-
-  list(APPEND OPENVDB_LIBRARIES ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
-
-  if(WITH_OPENVDB_BLOSC)
-    list(APPEND OPENVDB_DEFINITIONS -DWITH_OPENVDB_BLOSC)
-    list(APPEND OPENVDB_LIBRARIES ${BLOSC_LIBRARIES} ${ZLIB_LIBRARIES})
-  endif()
-
-  list(APPEND OPENVDB_LIBRARIES ${BOOST_LIBRARIES} ${TBB_LIBRARIES})
-endif()
-
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 
@@ -956,7 +967,7 @@ if(WITH_GL_PROFILE_ES20)
       )
     endif()
 
-    list(APPEND BLENDER_GL_LIBRARIES "${OPENGLES_LIBRARY}")
+    list(APPEND BLENDER_GL_LIBRARIES OPENGLES_LIBRARY)
 
   else()
     set(OPENGLES_LIBRARY "" CACHE FILEPATH "OpenGL ES 2.0 library file")
@@ -1016,10 +1027,7 @@ else()
 endif()
 
 if(WITH_GL_EGL)
-  find_package(OpenGL REQUIRED EGL)
-  list(APPEND BLENDER_GL_LIBRARIES OpenGL::EGL)
-
-  list(APPEND GL_DEFINITIONS -DWITH_GL_EGL -DGLEW_EGL -DGLEW_INC_EGL)
+  list(APPEND GL_DEFINITIONS -DWITH_GL_EGL)
 
   if(WITH_SYSTEM_GLES)
     if(NOT OPENGLES_EGL_LIBRARY)
@@ -1029,7 +1037,7 @@ if(WITH_GL_EGL)
       )
     endif()
 
-    list(APPEND BLENDER_GL_LIBRARIES ${OPENGLES_EGL_LIBRARY})
+    list(APPEND BLENDER_GL_LIBRARIES OPENGLES_EGL_LIBRARY)
 
   else()
     set(OPENGLES_EGL_LIBRARY "" CACHE FILEPATH "EGL library file")
@@ -1069,6 +1077,10 @@ else()
   list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
+if(WITH_GL_EGL)
+  list(APPEND GL_DEFINITIONS -DWITH_EGL)
+endif()
+
 #-----------------------------------------------------------------------------
 # Configure OpenMP.
 if(WITH_OPENMP)
@@ -1140,6 +1152,10 @@ else()
       list(APPEND GL_DEFINITIONS -DGL_ES_VERSION_1_0=0 -DGL_ES_VERSION_CL_1_1=0 -DGL_ES_VERSION_CM_1_1=0)
     endif()
 
+    if(WITH_GL_EGL)
+      list(APPEND GL_DEFINITIONS -DGLEW_INC_EGL)
+    endif()
+
     set(BLENDER_GLEW_LIBRARIES extern_glew_es bf_intern_glew_mx)
 
   else()
@@ -1436,7 +1452,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 
   # flags to undo strict flags
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
-  ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_VARIABLE  -Wno-unused-variable)
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
 
   ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
@@ -1455,8 +1470,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNDEFINED_VAR_TEMPLATE -Wno-undefined-var-template)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_INSTANTIATION_AFTER_SPECIALIZATION -Wno-instantiation-after-specialization)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
@@ -1707,12 +1720,10 @@ if(FIRST_RUN)
   info_cfg_option(WITH_CYCLES)
   info_cfg_option(WITH_FREESTYLE)
   info_cfg_option(WITH_OPENCOLORIO)
-  info_cfg_option(WITH_XR_OPENXR)
   info_cfg_option(WITH_OPENIMAGEDENOISE)
   info_cfg_option(WITH_OPENVDB)
   info_cfg_option(WITH_ALEMBIC)
   info_cfg_option(WITH_QUADRIFLOW)
-  info_cfg_option(WITH_USD)
 
   info_cfg_text("Compiler Options:")
   info_cfg_option(WITH_BUILDINFO)

GNUmakefile

@@ -545,7 +545,7 @@ update: .FORCE
 	$(PYTHON) ./build_files/utils/make_update.py
 
 format: .FORCE
-	PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
+	PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
 		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 
 

build_files/build_environment/CMakeLists.txt

@@ -64,6 +64,7 @@ include(cmake/jpeg.cmake)
 include(cmake/boost.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
+include(cmake/ilmbase.cmake)
 include(cmake/openexr.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
@@ -91,20 +92,21 @@ include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/package_python.cmake)
 include(cmake/numpy.cmake)
-include(cmake/usd.cmake)
-if(UNIX)
+if(UNIX AND NOT APPLE)
   # Rely on PugiXML compiled with OpenImageIO
 else()
   include(cmake/pugixml.cmake)
 endif()
 include(cmake/openimagedenoise.cmake)
-include(cmake/embree.cmake)
-include(cmake/xr_openxr.cmake)
 
 if(WITH_WEBP)
   include(cmake/webp.cmake)
 endif()
 
+if(WITH_EMBREE)
+  include(cmake/embree.cmake)
+endif()
+
 if(WIN32)
   # HMD branch deps
   include(cmake/hidapi.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -26,6 +26,12 @@ if(ALEMBIC_HDF5)
   endif()
 endif()
 
+if(WIN32)
+  set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
+else()
+  set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
+endif()
+
 set(ALEMBIC_EXTRA_ARGS
   -DBUILDSTATIC=ON
   -DLINKSTATIC=ON
@@ -38,13 +44,13 @@ set(ALEMBIC_EXTRA_ARGS
   -DBoost_DEBUG=ON
   -DBOOST_ROOT=${LIBDIR}/boost
   -DBoost_NO_SYSTEM_PATHS=ON
-  -DILMBASE_ROOT=${LIBDIR}/openexr
-  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
-  -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DILMBASE_ROOT=${ALEMBIC_ILMBASE}
+  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
+  -DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
   -DUSE_PYILMBASE=0
   -DUSE_PYALEMBIC=0
   -DUSE_ARNOLD=0
@@ -94,5 +100,6 @@ add_dependencies(
   external_alembic
   external_boost
   external_zlib
+  external_ilmbase
   external_openexr
 )

build_files/build_environment/cmake/blosc.cmake

@@ -29,11 +29,13 @@ set(BLOSC_EXTRA_ARGS
   -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
-# Prevent blosc from including it's own local copy of zlib in the object file
-# and cause linker errors with everybody else.
-set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-  -DPREFER_EXTERNAL_ZLIB=ON
-)
+if(WIN32)
+  # Prevent blosc from including it's own local copy of zlib in the object file
+  # and cause linker errors with everybody else.
+  set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
+    -DPREFER_EXTERNAL_ZLIB=ON
+  )
+endif()
 
 ExternalProject_Add(external_blosc
   URL ${BLOSC_URI}

build_files/build_environment/cmake/boost.cmake

@@ -38,13 +38,13 @@ if(WIN32)
   set(BOOST_BUILD_OPTIONS runtime-link=shared )
   set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
   if(BUILD_MODE STREQUAL Release)
-    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
+    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
   endif()
 
 elseif(APPLE)
   set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
   set(BOOST_BUILD_COMMAND ./b2)
-  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
+  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
   set(BOOST_HARVEST_CMD echo .)
   set(BOOST_PATCH_COMMAND echo .)
 else()
@@ -72,9 +72,6 @@ set(BOOST_OPTIONS
   --with-serialization
   --with-program_options
   --with-iostreams
-  -sNO_BZIP2=1
-  -sNO_LZMA=1
-  -sNO_ZSTD=1
   ${BOOST_TOOLSET}
 )
 

build_files/build_environment/cmake/clang.cmake

@@ -46,7 +46,9 @@ if(MSVC)
     set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
   else()
     set(CLANG_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
     )
   endif()
   ExternalProject_Add_Step(external_clang after_install

build_files/build_environment/cmake/freetype.cmake

@@ -32,6 +32,7 @@ ExternalProject_Add(external_freetype
   URL_HASH MD5=${FREETYPE_HASH}
   PREFIX ${BUILD_DIR}/freetype
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff
   INSTALL_DIR ${LIBDIR}/freetype
 )
 

build_files/build_environment/cmake/harvest.cmake

@@ -62,8 +62,14 @@ if(BUILD_MODE STREQUAL Debug)
         # OpenImageIO
     COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
         ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
+        # python
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
         # hdf5
         ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+        # numpy
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
+        # python
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
     DEPENDS Package_Python
   )
 endif()
@@ -110,6 +116,8 @@ harvest(freetype/include freetype/include "*.h")
 harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
 harvest(glew/include glew/include "*.h")
 harvest(glew/lib glew/lib "*.a")
+harvest(ilmbase openexr "*")
+harvest(ilmbase/include openexr/include "*.h")
 harvest(jemalloc/include jemalloc/include "*.h")
 harvest(jemalloc/lib jemalloc/lib "*.a")
 harvest(jpg/include jpeg/include "*.h")
@@ -161,8 +169,6 @@ harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
 harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
-harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
-harvest(xr_openxr_sdk/lib xr_openxr_sdk/src/loader "*.a")
 harvest(osl/bin osl/bin "oslc")
 harvest(osl/include osl/include "*.h")
 harvest(osl/lib osl/lib "*.a")
@@ -191,9 +197,6 @@ harvest(x264/lib ffmpeg/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
 harvest(embree/include embree/include "*.h")
 harvest(embree/lib embree/lib "*.a")
-harvest(usd/include usd/include "*.h")
-harvest(usd/lib/usd usd/lib/usd "*")
-harvest(usd/plugin usd/plugin "*")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")

build_files/build_environment/cmake/ilmbase.cmake

@@ -0,0 +1,58 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(WIN32)
+  set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+  set(ILMBASE_EXTRA_ARGS
+    -DBUILD_SHARED_LIBS=OFF
+    -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+  )
+
+  ExternalProject_Add(external_ilmbase
+    URL ${ILMBASE_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${ILMBASE_HASH}
+    PREFIX ${BUILD_DIR}/ilmbase
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
+
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_ilmbase after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
+      DEPENDEES install
+    )
+  endif()
+
+else()
+  set(ILMBASE_EXTRA_ARGS
+    --enable-static
+    --disable-shared
+    --enable-cxxstd=11
+  )
+  ExternalProject_Add(external_ilmbase
+    URL ${ILMBASE_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${ILMBASE_HASH}
+    PREFIX ${BUILD_DIR}/ilmbase
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
+endif()

build_files/build_environment/cmake/llvm.cmake

@@ -23,8 +23,6 @@ set(LLVM_EXTRA_ARGS
   -DLLVM_TARGETS_TO_BUILD=X86
   -DLLVM_INCLUDE_EXAMPLES=OFF
   -DLLVM_ENABLE_TERMINFO=OFF
-  -DLLVM_BUILD_LLVM_C_DYLIB=OFF
-  -DLLVM_ENABLE_UNWIND_TABLES=OFF
 )
 
 if(WIN32)
@@ -40,7 +38,6 @@ ExternalProject_Add(ll
   URL_HASH MD5=${LLVM_HASH}
   CMAKE_GENERATOR ${LLVM_GENERATOR}
   PREFIX ${BUILD_DIR}/ll
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/llvm
 )

build_files/build_environment/cmake/openexr.cmake

@@ -20,45 +20,59 @@ if(WIN32)
   set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
   set(OPENEXR_EXTRA_ARGS
     -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
+    -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+    -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+    -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
+    -DOPENEXR_BUILD_ILMBASE=On
+    -DOPENEXR_BUILD_OPENEXR=On
+    -DOPENEXR_BUILD_PYTHON_LIBS=Off
+    -DOPENEXR_BUILD_STATIC=On
+    -DOPENEXR_BUILD_SHARED=Off
+    -DOPENEXR_BUILD_TESTS=Off
+    -DOPENEXR_BUILD_VIEWERS=Off
+    -DOPENEXR_BUILD_UTILS=Off
+    -DOPENEXR_NAMESPACE_VERSIONING=Off
   )
-else()
-  set(OPENEXR_EXTRA_ARGS
+  ExternalProject_Add(external_openexr
+    URL ${OPENEXR_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${OPENEXR_HASH}
+    PREFIX ${BUILD_DIR}/openexr
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/openexr
   )
-endif()
 
-set(OPENEXR_EXTRA_ARGS
-  ${OPENEXR_EXTRA_ARGS}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DBUILD_TESTING=OFF
-  -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
-  -DILMBASE_BUILD_BOTH_STATIC_SHARED=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DOPENEXR_BUILD_UTILS=OFF
-  -DPYILMBASE_ENABLE=OFF
-  -DOPENEXR_VIEWERS_ENABLE=OFF
-  -DILMBASE_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
-  -DOPENEXR_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
-)
-
-ExternalProject_Add(external_openexr
-  URL ${OPENEXR_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENEXR_HASH}
-  PREFIX ${BUILD_DIR}/openexr
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/openexr
-)
-
-if(WIN32)
   ExternalProject_Add_Step(external_openexr after_install
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
+    # Libs have moved between versions, just duplicate it for now.
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
     DEPENDEES install
   )
+
+else()
+  set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
+  set(OPENEXR_EXTRA_ARGS
+    --enable-static
+    --disable-shared
+    --enable-cxxstd=11
+    --with-ilmbase-prefix=${LIBDIR}/ilmbase
+    )
+
+  ExternalProject_Add(external_openexr
+    URL ${OPENEXR_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${OPENEXR_HASH}
+    PREFIX ${BUILD_DIR}/openexr
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
 endif()
 
 add_dependencies(
   external_openexr
   external_zlib
+  external_ilmbase
 )

build_files/build_environment/cmake/openimageio.cmake

@@ -106,13 +106,13 @@ set(OPENIMAGEIO_EXTRA_ARGS
   -DOCIO_PATH=${LIBDIR}/opencolorio/
   -DOpenEXR_USE_STATIC_LIBS=On
   -DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DILMBASE_INCLUDE_PATH=${LIBDIR}/openexr/
-  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/openexr/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
+  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
   -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DSTOP_ON_WARNING=OFF
@@ -135,6 +135,7 @@ ExternalProject_Add(external_openimageio
 add_dependencies(
   external_openimageio
   external_png external_zlib
+  external_ilmbase
   external_openexr
   external_jpeg
   external_boost

build_files/build_environment/cmake/openvdb.cmake

@@ -29,20 +29,24 @@ set(OPENVDB_EXTRA_ARGS
   -DBoost_NO_SYSTEM_PATHS=ON
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
-  -DBlosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
+  -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
+  -DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
   -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
   -DOPENVDB_BUILD_UNITTESTS=Off
   -DOPENVDB_BUILD_PYTHON_MODULE=Off
-  -DBlosc_ROOT=${LIBDIR}/blosc/
+  -DGLEW_LOCATION=${LIBDIR}/glew/
+  -DBLOSC_LOCATION=${LIBDIR}/blosc/
+  -DTBB_LOCATION=${LIBDIR}/tbb/
   -DTBB_ROOT=${LIBDIR}/tbb/
-  -DOpenEXR_ROOT=${LIBDIR}/openexr
-  -DIlmBase_ROOT=${LIBDIR}/openexr
-  -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
-   # All libs live in openexr, even the ilmbase ones
-  -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
-  -DOPENVDB_CORE_SHARED=Off
-  -DOPENVDB_BUILD_BINARIES=Off
+  -DOPENEXR_LOCATION=${LIBDIR}/openexr
+  -DILMBASE_LOCATION=${LIBDIR}/ilmbase
+  -DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
+  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+  -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
 )
 
 if(WIN32)
@@ -50,17 +54,15 @@ if(WIN32)
   # being in the correct namespace
   # needs to link pthreads due to it being a blosc dependency
   set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-    -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
-    -DUSE_EXR=On
-  )
-else()
-  # OpenVDB can't find the _static libraries automatically.
-  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-    -DTbb_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-    -DTbb_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-    -DTbb_tbbmalloc_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_static${LIBEXT}
-    -DTbb_tbbmalloc_proxy_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_proxy_static${LIBEXT}
+    -DOPENEXR_NAMESPACE_VERSIONING=OFF
+    -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.lib
   )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+      -DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
+      -DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
+    )
+  endif()
 endif()
 
 ExternalProject_Add(openvdb
@@ -77,6 +79,7 @@ add_dependencies(
   openvdb
   external_tbb
   external_boost
+  external_ilmbase
   external_openexr
   external_zlib
   external_blosc

build_files/build_environment/cmake/options.cmake

@@ -20,6 +20,7 @@ if(WIN32)
   option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
+option(WITH_EMBREE "Enable building of Embree" OFF)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 
 if(NOT BUILD_MODE)

build_files/build_environment/cmake/osl.cmake

@@ -18,7 +18,7 @@
 
 if(WIN32)
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-  set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
+  set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
   set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
@@ -33,7 +33,7 @@ else()
   SET(OSL_PLATFORM_FLAGS)
 endif()
 
-set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Half{ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/IlmThread${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Iex${ILMBASE_VERSION_POSTFIX}.lib")
 set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
 
 set(OSL_EXTRA_ARGS
@@ -50,21 +50,20 @@ set(OSL_EXTRA_ARGS
   -DLLVM_VERSION=3.4
   -DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
   -DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DILMBASE_HOME=${LIBDIR}/openexr/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DILMBASE_HOME=${LIBDIR}/ilmbase/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
   -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
   -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
   -DOSL_BUILD_TESTS=OFF
-  -DOSL_BUILD_MATERIALX=OFF
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
-  -DOPENIMAGEIO_INCLUDE_DIR=${LIBDIR}/openimageio/include
   -DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
+  -DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILDSTATIC=ON
@@ -73,7 +72,6 @@ set(OSL_EXTRA_ARGS
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
   -DUSE_PARTIO=OFF
-  -DUSE_QT=OFF
   ${OSL_SIMD_FLAGS}
   -DPARTIO_LIBRARIES=
 )
@@ -89,6 +87,7 @@ elseif(APPLE)
   set(OSL_EXTRA_ARGS
     ${OSL_EXTRA_ARGS}
     -DHIDE_SYMBOLS=OFF
+    -DPUGIXML_HOME=${LIBDIR}/pugixml
   )
 endif()
 
@@ -108,13 +107,14 @@ add_dependencies(
   external_boost
   ll
   external_clang
+  external_ilmbase
   external_openexr
   external_zlib
   external_flexbison
   external_openimageio
 )
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
   # Rely on PugiXML compiled with OpenImageIO
 else()
   add_dependencies(

build_files/build_environment/cmake/package_python.cmake

@@ -29,7 +29,6 @@ if(MSVC)
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
@@ -48,7 +47,6 @@ if(MSVC)
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/

build_files/build_environment/cmake/python.cmake

@@ -43,7 +43,7 @@ if(WIN32)
     PREFIX ${BUILD_DIR}/python
     CONFIGURE_COMMAND ""
     BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
-    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/  --include-underpth --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
+    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/  --include-underpth --include-stable --include-pip --include-dev --include-launchers  --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
   )
 
 else()

build_files/build_environment/cmake/sqlite.cmake

@@ -19,10 +19,8 @@
 set(SQLITE_CONFIGURE_ENV echo .)
 set(SQLITE_CONFIGURATION_ARGS)
 
-if(UNIX)
-  if(NOT APPLE)
-    set(SQLITE_LDFLAGS -Wl,--as-needed)
-  endif()
+if(UNIX AND NOT APPLE)
+  set(SQLITE_LDFLAGS -Wl,--as-needed)
   set(SQLITE_CFLAGS
     "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
     -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \

build_files/build_environment/cmake/usd.cmake

@@ -1,101 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(USD_EXTRA_ARGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
-  -DBOOST_ROOT=${LIBDIR}/boost
-  -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-
-  # This is a preventative measure that avoids possible conflicts when add-ons
-  # try to load another USD library into the same process space.
-  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
-
-  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
-  -DPXR_BUILD_IMAGING=OFF
-  -DPXR_BUILD_TESTS=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DPXR_BUILD_MONOLITHIC=ON
-
-  # The PXR_BUILD_USD_TOOLS argument is patched-in by usd.diff. An upstream pull request
-  # can be found at https://github.com/PixarAnimationStudios/USD/pull/1048.
-  -DPXR_BUILD_USD_TOOLS=OFF
-
-  -DCMAKE_DEBUG_POSTFIX=_d
-  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
-  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
-  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
-)
-
-ExternalProject_Add(external_usd
-  URL ${USD_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${USD_HASH}
-  PREFIX ${BUILD_DIR}/usd
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/usd
-)
-
-add_dependencies(
-  external_usd
-  external_tbb
-  external_boost
-)
-
-if(WIN32)
-  # USD currently demands python be available at build time
-  # and then proceeds not to use it, but still checks that the
-  # version of the interpreter it is not going to use is atleast 2.7
-  # so we need this dep currently since there is no system python
-  # on windows.
-  add_dependencies(
-    external_usd
-    external_python
-  )
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/libusd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/libusd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
-      DEPENDEES install
-    )
-  endif()
-else()
-  # USD has two build options. The default build creates lots of small libraries,
-  # whereas the 'monolithic' build produces only a single library. The latter
-  # makes linking simpler, so that's what we use in Blender. However, running
-  # 'make install' in the USD sources doesn't install the static library in that
-  # case (only the shared library). As a result, we need to grab the `libusd_m.a`
-  # file from the build directory instead of from the install directory.
-  ExternalProject_Add_Step(external_usd after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/libusd_m.a ${HARVEST_TARGET}/usd/lib/libusd_m.a
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/versions.cmake

@@ -32,43 +32,47 @@ set(JPEG_VERSION 1.5.3)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
 set(JPEG_HASH 5b7549d440b86c98a517355c102d155e)
 
-set(BOOST_VERSION 1.70.0)
-set(BOOST_VERSION_NODOTS 1_70_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_70)
+set(BOOST_VERSION 1.68.0)
+set(BOOST_VERSION_NODOTS 1_68_0)
 set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH fea771fe8176828fabf9c09242ee8c26)
+set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239)
 
-# Using old version as recommended by OpenVDB build documentation.
-set(BLOSC_VERSION 1.5.0)
+set(BLOSC_VERSION 1.14.4)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
-set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
+set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe)
 
 set(PTHREADS_VERSION 3.0.0)
 set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
 set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 
-set(OPENEXR_VERSION 2.4.0)
-set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
-set(OPENEXR_HASH 9e4d69cf2a12c6fb19b98af7c5e0eaee)
+set(ILMBASE_VERSION 2.3.0)
 if(WIN32)
-  # Openexr started appending _d on its own so now
-  # we need to tell the build the postfix is _s while
-  # telling all other deps the postfix is _s_d
   if(BUILD_MODE STREQUAL Release)
+    set(ILMBASE_VERSION_POSTFIX _s)
     set(OPENEXR_VERSION_POSTFIX _s)
-    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   else()
+    set(ILMBASE_VERSION_POSTFIX _s_d)
     set(OPENEXR_VERSION_POSTFIX _s_d)
-    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
   endif()
 else()
-  set(OPENEXR_VERSION_BUILD_POSTFIX)
+  set(ILMBASE_VERSION_POSTFIX)
+endif()
+set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_VERSION}/ilmbase-${ILMBASE_VERSION}.tar.gz)
+set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
+
+set(OPENEXR_VERSION 2.3.0)
+if(WIN32) # release 2.3.0 tarball has broken cmake support
+  set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
+  set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
+else()
   set(OPENEXR_VERSION_POSTFIX)
+  set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
+  set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
 endif()
 
-set(FREETYPE_VERSION 2.10.1)
+set(FREETYPE_VERSION 2.9.1)
 set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947)
+set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
 
 set(GLEW_VERSION 1.13.0)
 set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
@@ -117,15 +121,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 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(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(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz)
-set(CLANG_HASH 13468e4a44940efef1b75e8641752f90)
+set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz)
+set(CLANG_HASH 4e419bd4e3b55aa06d872320f754bd85)
 
-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(OPENMP_URI http://releases.llvm.org/${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+set(OPENMP_HASH 4826402ae3633c36c51ba4d0e5527d30)
 
 set(OPENIMAGEIO_VERSION 1.8.13)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
@@ -135,9 +139,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.10.9)
+set(OSL_VERSION 1.9.9)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH a94f1e8506f7e8f5e993653de5c5fa00)
+set(OSL_HASH 44ad511e424965a10fce051a053b0605)
 
 set(PYTHON_VERSION 3.7.4)
 set(PYTHON_SHORT_VERSION 3.7)
@@ -149,9 +153,9 @@ set(TBB_VERSION 2019_U9)
 set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
 set(TBB_HASH 584edbec127c508f2cd5b6e79ad200fc)
 
-set(OPENVDB_VERSION 7.0.0)
+set(OPENVDB_VERSION 5.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8)
+set(OPENVDB_HASH 5310101f874dcfd2165f9cee68c22624)
 
 set(IDNA_VERSION 2.8)
 set(CHARDET_VERSION 3.0.4)
@@ -299,13 +303,9 @@ set(SQLITE_VERSION 3.24.0)
 set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
 set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 
-set(EMBREE_VERSION 3.8.0)
+set(EMBREE_VERSION 3.2.4)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52)
-
-set(USD_VERSION 19.11)
-set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 79ff176167b3fe85f4953abd6cc5e0cc)
+set(EMBREE_HASH 3d4a1147002ff43939d45140aa9d6fb8)
 
 set(OIDN_VERSION 1.0.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
@@ -318,7 +318,3 @@ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
 set(MESA_VERSION 18.3.1)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
 set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
-
-set(XR_OPENXR_SDK_VERSION 1.0.6)
-set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH 21daea7c3bfec365298d779a0e19caa1)

build_files/build_environment/cmake/xr_openxr.cmake

@@ -1,58 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-# Keep flags in sync with install_deps.sh ones in compile_XR_OpenXR_SDK()
-set(XR_OPENXR_SDK_EXTRA_ARGS
-  -DBUILD_FORCE_GENERATION=OFF
-  -DBUILD_LOADER=ON
-  -DDYNAMIC_LOADER=OFF
-)
-
-if(UNIX AND NOT APPLE)
-  list(APPEND XR_OPENXR_SDK_EXTRA_ARGS
-    -DBUILD_WITH_WAYLAND_HEADERS=OFF
-    -DBUILD_WITH_XCB_HEADERS=OFF
-    -DBUILD_WITH_XLIB_HEADERS=ON
-  )
-endif()
-
-ExternalProject_Add(external_xr_openxr_sdk
-  URL ${XR_OPENXR_SDK_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${XR_OPENXR_SDK_HASH}
-  PREFIX ${BUILD_DIR}/xr_openxr_sdk
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/xr_openxr_sdk
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/include/openxr ${HARVEST_TARGET}/xr_openxr_sdk/include/openxr
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/lib ${HARVEST_TARGET}/xr_openxr_sdk/lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loader_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/dependencies.dot

@@ -1,100 +0,0 @@
-strict graph {
-graph[autosize = false, size = "25.7,8.3!", resolution = 300, overlap = false, splines = false, outputorder=edgesfirst ];
-	node [style=filled fillcolor=white];
-	external_alembic -- external_boost;
-	external_alembic -- external_zlib;
-	external_alembic -- external_openexr;
-	external_blosc -- external_zlib;
-	external_blosc -- external_pthreads;
-	external_boost -- Make_Python_Environment;
-	external_clang -- ll;
-	external_ffmpeg -- external_zlib;
-	external_ffmpeg -- external_faad;
-	external_ffmpeg -- external_openjpeg;
-	external_ffmpeg -- external_xvidcore;
-	external_ffmpeg -- external_x264;
-	external_ffmpeg -- external_vpx;
-	external_ffmpeg -- external_theora;
-	external_ffmpeg -- external_vorbis;
-	external_ffmpeg -- external_ogg;
-	external_ffmpeg -- external_lame;
-	external_ffmpeg -- external_zlib_mingw;
-	external_numpy -- Make_Python_Environment;
-	external_opencollada -- external_xml2;
-	external_opencolorio -- external_boost;
-	external_opencolorio -- external_tinyxml;
-	external_opencolorio -- external_yamlcpp;
-	external_openexr -- external_zlib;
-	external_openimageio -- external_png;
-	external_openimageio -- external_zlib;
-	external_openimageio -- external_openexr;
-	external_openimageio -- external_openexr;
-	external_openimageio -- external_jpeg;
-	external_openimageio -- external_boost;
-	external_openimageio -- external_tiff;
-	external_openimageio -- external_opencolorio;
-	external_openimageio -- external_openjpeg;
-	external_openimageio -- external_webp;
-	external_openimageio -- external_opencolorio_extra;
-	external_openmp -- external_clang;
-	external_opensubdiv -- external_glew;
-	external_opensubdiv -- external_glfw;
-	external_opensubdiv -- external_clew;
-	external_opensubdiv -- external_cuew;
-	external_opensubdiv -- external_tbb;
-	openvdb -- external_tbb;
-	openvdb -- external_boost;
-	openvdb -- external_openexr;
-	openvdb -- external_openexr;
-	openvdb -- external_zlib;
-	openvdb -- external_blosc;
-	external_osl -- external_boost;
-	external_osl -- ll;
-	external_osl -- external_clang;
-	external_osl -- external_openexr;
-	external_osl -- external_openexr;
-	external_osl -- external_zlib;
-	external_osl -- external_flexbison;
-	external_osl -- external_openimageio;
-	external_osl -- external_pugixml;
-	external_png -- external_zlib;
-	external_python_site_packages -- Make_Python_Environment;
-	external_sndfile -- external_ogg;
-	external_sndfile -- external_vorbis;
-	external_sndfile -- external_flac;
-	external_theora -- external_vorbis;
-	external_theora -- external_ogg;
-	external_tiff -- external_zlib;
-	external_vorbis -- external_ogg;
-	blender-- external_ffmpeg;
-	blender-- external_alembic;
-	blender-- external_openjpeg;
-	blender-- external_opencolorio;
-	blender-- external_openexr;
-	blender-- external_opensubdiv;
-	blender-- openvdb;
-	blender-- external_osl;
-	blender-- external_boost;
-	blender-- external_jpeg;
-	blender-- external_png;
-	blender-- external_python;
-	blender-- external_sndfile;
-	blender-- external_iconv;
-	blender-- external_fftw3;
-	external_python-- external_python_site_packages;
-	external_python_site_packages-- requests;
-	external_python_site_packages-- idna;
-	external_python_site_packages-- chardet;
-	external_python_site_packages-- urllib3;
-	external_python_site_packages-- certifi;
-	external_python-- external_numpy;
-	external_usd-- external_boost;
-	external_usd-- external_tbb;
-	blender-- external_opencollada;
-	blender-- external_sdl;
-	blender-- external_freetype;
-	blender-- external_pthreads;
-	blender-- external_zlib;
-	blender-- external_openal;
-    blender-- external_usd;
-}

build_files/build_environment/patches/.gitattributes

@@ -1,2 +0,0 @@
-# Files contains mixed line endings, patch needs to preserve them to apply.
-opencollada.diff binary

build_files/build_environment/patches/blosc.diff

@@ -10,84 +10,22 @@ diff -Naur src/blosc/CMakeLists.txt external_blosc/blosc/CMakeLists.txt
      endif(NOT Threads_FOUND)
  else(WIN32)
      find_package(Threads REQUIRED)
-diff -Naur src/CMakeLists.txt external_blosc/CMakeLists.txt
---- src/CMakeLists.txt	2016-02-03 10:26:28 -0700
-+++ external_blosc/CMakeLists.txt	2017-03-03 09:03:31 -0700
-@@ -17,8 +17,8 @@
- #       do not include support for the Snappy library
- #   DEACTIVATE_ZLIB: default OFF
- #       do not include support for the Zlib library
--#   PREFER_EXTERNAL_COMPLIBS: default ON
--#       when found, use the installed compression libs instead of included sources
-+#   PREFER_EXTERNAL_ZLIB: default ON
-+#       when found, use the installed zlib instead of included sources
- #   TEST_INCLUDE_BENCH_SINGLE_1: default ON
- #       add a test that runs the benchmark program passing "single" with 1 thread
- #       as first parameter
-@@ -80,29 +80,23 @@
-     "Do not include support for the SNAPPY library." OFF)
- option(DEACTIVATE_ZLIB
-     "Do not include support for the ZLIB library." OFF)
--option(PREFER_EXTERNAL_COMPLIBS
--    "When found, use the installed compression libs instead of included sources." ON)
-+option(PREFER_EXTERNAL_ZLIB
-+    "When found, use the installed zlib instead of included sources." ON)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- 
--if(NOT PREFER_EXTERNAL_COMPLIBS)
-+if(NOT PREFER_EXTERNAL_ZLIB)
-     message(STATUS "Finding external libraries disabled.  Using internal sources.")
--endif(NOT PREFER_EXTERNAL_COMPLIBS)
-+endif(NOT PREFER_EXTERNAL_ZLIB)
- 
- 
- if(NOT DEACTIVATE_LZ4)
--    if(PREFER_EXTERNAL_COMPLIBS)
--        find_package(LZ4)
--    endif(PREFER_EXTERNAL_COMPLIBS)
-     # HAVE_LZ4 will be set to true because even if the library is
-     # not found, we will use the included sources for it
-     set(HAVE_LZ4 TRUE)
- endif(NOT DEACTIVATE_LZ4)
- 
- if(NOT DEACTIVATE_SNAPPY)
--    if(PREFER_EXTERNAL_COMPLIBS)
--        find_package(Snappy)
--    endif(PREFER_EXTERNAL_COMPLIBS)
-     # HAVE_SNAPPY will be set to true because even if the library is not found,
-     # we will use the included sources for it
-     set(HAVE_SNAPPY TRUE)
-@@ -110,13 +104,13 @@
- 
- if(NOT DEACTIVATE_ZLIB)
-     # import the ZLIB_ROOT environment variable to help finding the zlib library
--    if(PREFER_EXTERNAL_COMPLIBS)
-+    if(PREFER_EXTERNAL_ZLIB)
-         set(ZLIB_ROOT $ENV{ZLIB_ROOT})
-         find_package( ZLIB )
-         if (NOT ZLIB_FOUND )
-             message(STATUS "No zlib found.  Using internal sources.")
-         endif (NOT ZLIB_FOUND )
--    endif(PREFER_EXTERNAL_COMPLIBS)
-+    endif(PREFER_EXTERNAL_ZLIB)
-     # HAVE_ZLIB will be set to true because even if the library is not found,
-     # we will use the included sources for it
-     set(HAVE_ZLIB TRUE)
 diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c
 --- external_blosc.orig/blosc/blosc.c   2018-07-30 04:56:38 -0600
 +++ external_blosc/blosc/blosc.c        2018-08-11 15:27:26 -0600
-@@ -41,12 +41,7 @@
+@@ -56,14 +56,7 @@
    #include <inttypes.h>
  #endif  /* _WIN32 */
 
+-/* Include the win32/pthread.h library for all the Windows builds. See #224. */
 -#if defined(_WIN32)
 -  #include "win32/pthread.h"
 -  #include "win32/pthread.c"
 -#else
 -  #include <pthread.h>
 -#endif
+-
 +#include <pthread.h>
 
-
  /* Some useful units */
+ #define KB 1024

build_files/build_environment/patches/cmake/modules/FindBlosc.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_blosc_SEARCH_DIRS
   ${BLOSC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/blosc
 )
 

build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_cppunit_SEARCH_DIRS
   ${CPPUNIT_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/cppunit
 )
 

build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake

@@ -26,8 +26,8 @@ include(FindPackageMessage)
 include(SelectLibraryConfigurations)
 
 
-if(ILMBASE_USE_STATIC_LIBS)
-  set(_ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+if( ILMBASE_USE_STATIC_LIBS )
+  set( _ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   if(WIN32)
     set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
   else()
@@ -124,6 +124,7 @@ set(IlmBase_generic_include_paths
   /usr/include
   /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/include
+  /sw/include
   /opt/local/include
 )
 set(IlmBase_generic_library_paths
@@ -132,6 +133,7 @@ set(IlmBase_generic_library_paths
   /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/lib
   /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  /sw/lib
   /opt/local/lib
 )
 
@@ -247,7 +249,7 @@ if(ILMBASE_FOUND)
 endif()
 
 # Restore the original find library ordering
-if(ILMBASE_USE_STATIC_LIBS )
+if( ILMBASE_USE_STATIC_LIBS )
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_ilmbase_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
 

build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_logc4plus_SEARCH_DIRS
   ${LOGC4PLUS_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/logc4plus
 )
 

build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake

@@ -119,6 +119,7 @@ set(OpenEXR_generic_include_paths
   /usr/include
   /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/include
+  /sw/include
   /opt/local/include
 )
 set(OpenEXR_generic_library_paths
@@ -127,6 +128,7 @@ set(OpenEXR_generic_library_paths
   /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   /usr/local/lib
   /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+  /sw/lib
   /opt/local/lib
 )
 
@@ -230,7 +232,7 @@ if(OPENEXR_FOUND)
 endif()
 
 # Restore the original find library ordering
-if(OPENEXR_USE_STATIC_LIBS )
+if( OPENEXR_USE_STATIC_LIBS )
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
 

build_files/build_environment/patches/cmake/modules/FindTBB.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_tbb_SEARCH_DIRS
   ${TBB_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/tbb
 )
 

build_files/build_environment/patches/freetype.diff

@@ -0,0 +1,18 @@
+diff -NaurBb b/CMakeLists.txt a/CMakeLists.txt
+--- b/CMakeLists.txt	2018-05-01 12:45:46 -0600
++++ a/CMakeLists.txt	2018-08-08 13:03:22 -0600
+@@ -229,9 +229,12 @@
+   endif ()
+   string(REPLACE "/undef " "#undef "
+     FTCONFIG_H "${FTCONFIG_H}")
+-  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
+-    "${FTCONFIG_H}")
++else()
++  file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h"
++    FTCONFIG_H)
+ endif ()
++file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
++  "${FTCONFIG_H}")
+ 
+ 
+ # Create the options file

build_files/build_environment/patches/llvm.diff

@@ -1,13 +0,0 @@
---- a/lib/Support/Unix/Path.inc	2020-02-17 09:24:26.000000000 +0100
-+++ b/lib/Support/Unix/Path.inc	2020-02-17 09:26:25.000000000 +0100
-@@ -1200,7 +1200,9 @@
- /// implementation.
- std::error_code copy_file(const Twine &From, const Twine &To) {
-   uint32_t Flag = COPYFILE_DATA;
--#if __has_builtin(__builtin_available) && defined(COPYFILE_CLONE)
-+  // BLENDER: This optimization makes LLVM not build on older Xcode versions,
-+  // just disable until everyone has new enough Xcode versions.
-+#if 0
-   if (__builtin_available(macos 10.12, *)) {
-     bool IsSymlink;
-     if (std::error_code Error = is_symlink_file(From, IsSymlink))

build_files/build_environment/patches/opencollada.diff

@@ -16,19 +16,6 @@ index 95abbe2..4f14f30 100644
  		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
-+++ b/DAEValidator/CMakeLists.txt
-@@ -98,7 +98,7 @@ if (WIN32)
- # C4710: 'function' : function not inlined
- # C4711: function 'function' selected for inline expansion
- # C4820: 'bytes' bytes padding added after construct 'member_name'
--	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
- else ()
- 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
- endif ()
 diff --git a/DAEValidator/library/include/no_warning_begin b/DAEValidator/library/include/no_warning_begin
 index 7a69c32..defb315 100644
 --- a/DAEValidator/library/include/no_warning_begin
@@ -43,8 +30,34 @@ index 7a69c32..defb315 100644
  #	if defined(_MSC_VER) && defined(_DEBUG)
  #		pragma warning(disable:4548)
  #	endif
+diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
+index 1f9a3ee..d151e9a 100644
+--- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
++++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
+@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser
+ #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__)
+         return _isnan( value ) ? true : false;
+ #else
+-#ifdef isnan
++#if defined(isnan) || defined(__APPLE__)
+         return isnan( value );
+ #else
+         return std::isnan(value);
+diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
+index 03ad540f..f7d05cfb 100644
+--- a/DAEValidator/CMakeLists.txt
++++ b/DAEValidator/CMakeLists.txt
+@@ -98,7 +98,7 @@ if (WIN32)
+ # C4710: 'function' : function not inlined
+ # C4711: function 'function' selected for inline expansion
+ # C4820: 'bytes' bytes padding added after construct 'member_name'
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
+ else ()
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
+ endif ()
 diff --git a/DAEValidator/library/src/ArgumentParser.cpp b/DAEValidator/library/src/ArgumentParser.cpp
-index 897e4dc..98a69ff 100644
+index 897e4dcf..98a69ff1 100644
 --- a/DAEValidator/library/src/ArgumentParser.cpp
 +++ b/DAEValidator/library/src/ArgumentParser.cpp
 @@ -6,10 +6,10 @@
@@ -61,28 +74,3 @@ index 897e4dc..98a69ff 100644
  #endif
  
  namespace opencollada
-diff --git a/Externals/LibXML/CMakeLists.txt b/Externals/LibXML/CMakeLists.txt
-index 40081e7..e1d1bfa 100644
---- 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)
-diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-index 1f9a3ee..d151e9a 100644
---- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-+++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser
- #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__)
-         return _isnan( value ) ? true : false;
- #else
--#ifdef isnan
-+#if defined(isnan) || defined(__APPLE__)
-         return isnan( value );
- #else
-         return std::isnan(value);

build_files/build_environment/patches/openimagedenoise.diff

@@ -117,15 +117,3 @@ diff '--ignore-matching-lines=:' -ur '--exclude=*.svn*' -u -r
  if(OIDN_STATIC_LIB)
    set(OIDN_LIB_TYPE STATIC)
  else()
-diff -Naur orig/core/api.cpp external_openimagedenoise/core/api.cpp
---- orig/core/api.cpp	2019-07-19 08:37:04 -0600
-+++ external_openimagedenoise/core/api.cpp	2020-01-21 15:10:56 -0700
-@@ -15,7 +15,7 @@
- // ======================================================================== //
- 
- #ifdef _WIN32
--#  define OIDN_API extern "C" __declspec(dllexport)
-+#  define OIDN_API extern "C" 
- #else
- #  define OIDN_API extern "C" __attribute__ ((visibility ("default")))
- #endif

build_files/build_environment/patches/openimageio_idiff.diff

@@ -0,0 +1,13 @@
+--- 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) 

build_files/build_environment/patches/openvdb.diff

@@ -1,73 +1,102 @@
-diff -Naur orig/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
---- orig/cmake/FindIlmBase.cmake	2019-12-06 13:11:33 -0700
-+++ openvdb/cmake/FindIlmBase.cmake	2020-01-16 09:06:32 -0700
-@@ -225,6 +225,12 @@
-   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-     "-${IlmBase_VERSION_MAJOR}_${IlmBase_VERSION_MINOR}.lib"
+diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
+--- openvdb.orig/openvdb/CMakeLists.txt	2018-04-10 12:22:17 -0600
++++ openvdb/openvdb/CMakeLists.txt	2018-08-15 19:04:52 -0600
+@@ -82,6 +82,9 @@
+ IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
+   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
+ ENDIF ()
++if(WIN32)
++ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE )
++endif()
+ 
+ FIND_PACKAGE ( Blosc REQUIRED )
+ FIND_PACKAGE ( TBB REQUIRED )
+@@ -195,6 +198,7 @@
+   ${Ilmbase_HALF_LIBRARY}
+   ${ZLIB_LIBRARY}
+   ${BLOSC_blosc_LIBRARY}
++  ${EXTRA_LIBS}
    )
-+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-+    "_s.lib"
-+  )
-+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-+    "_s_d.lib"
-+  )
- else()
-   if(ILMBASE_USE_STATIC_LIBS)
-     list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-diff -Naur orig/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
---- orig/cmake/FindOpenEXR.cmake	2019-12-06 13:11:33 -0700
-+++ openvdb/cmake/FindOpenEXR.cmake	2020-01-16 09:06:39 -0700
-@@ -218,6 +218,12 @@
-   list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-     "-${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}.lib"
+
+ IF (WIN32)
+@@ -225,13 +228,16 @@
+   ${VDB_PRINT_SOURCE_FILES}
    )
-+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-+    "_s.lib"
+ 
++if(NOT WIN32)
++	set(EXTRA_LIBS m stdc++ dl)
++endif()
++  
+ TARGET_LINK_LIBRARIES ( vdb_print
+   openvdb_shared
+   ${CMAKE_THREAD_LIBS_INIT}
+   ${BLOSC_blosc_LIBRARY}
+-  m
+-  stdc++
+-  )
++  ${EXTRA_LIBS}
++)
+ 
+ SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc )
+ SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
+@@ -249,8 +255,7 @@
+   ${Openexr_ILMIMF_LIBRARY}
+   ${Ilmbase_ILMTHREAD_LIBRARY}
+   ${Ilmbase_IEX_LIBRARY}
+-  m
+-  stdc++
++  ${EXTRA_LIBS}
+   )
+ 
+ SET ( VDB_VIEW_SOURCE_FILES
+@@ -270,7 +270,7 @@
+   PROPERTIES
+   COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
+   )
+-IF (NOT WIN32)
++IF (FALSE)
+   ADD_EXECUTABLE ( vdb_view
+     ${VDB_VIEW_SOURCE_FILES}
+     )
+@@ -283,9 +288,8 @@
+     ${GLFW_LINK_LIBRARY}
+     ${GLFW_DEPENDENT_LIBRARIES}
+     ${GLEW_GLEW_LIBRARY}
+-    m
+-    stdc++
+-    )
++	${EXTRA_LIBS}
 +  )
-+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-+    "_s_d.lib"
-+  )
- else()
-   if(OPENEXR_USE_STATIC_LIBS)
-     list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
-diff -Naur orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
---- orig/openvdb/CMakeLists.txt	2019-12-06 13:11:33 -0700
-+++ openvdb/openvdb/CMakeLists.txt	2020-01-16 08:56:25 -0700
-@@ -193,11 +193,12 @@
-   if(OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
-     add_definitions(-DBOOST_ALL_NO_LIB)
-   endif()
-+  add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -DOPENVDB_OPENEXR_STATICLIB)
- endif()
+ ENDIF ()
  
- # @todo Should be target definitions
- if(WIN32)
--  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
-+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
- endif()
+ SET ( UNITTEST_SOURCE_FILES
+@@ -392,8 +396,7 @@
+   TARGET_LINK_LIBRARIES ( vdb_test
+     ${CPPUnit_cppunit_LIBRARY}
+     openvdb_shared
+-    m
+-    stdc++
++    ${EXTRA_LIBS}
+     )
  
- ##### Core library configuration
-diff -Naur orig/openvdb/cmd/CMakeLists.txt openvdb/openvdb/cmd/CMakeLists.txt
---- orig/openvdb/cmd/CMakeLists.txt	2019-12-06 13:11:33 -0700
-+++ openvdb/openvdb/cmd/CMakeLists.txt	2020-01-16 08:56:25 -0700
-@@ -53,7 +53,7 @@
- endif()
+   ADD_TEST ( vdb_unit_test vdb_test )
+@@ -422,7 +422,7 @@
+ ENDIF ()
  
- if(WIN32)
--  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
-+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
- endif()
- 
- # rpath handling
-diff -Naur orig/openvdb/unittest/CMakeLists.txt openvdb/openvdb/unittest/CMakeLists.txt
---- orig/openvdb/unittest/CMakeLists.txt	2019-12-06 13:11:33 -0700
-+++ openvdb/openvdb/unittest/CMakeLists.txt	2020-01-16 08:56:25 -0700
-@@ -49,7 +49,7 @@
- endif()
- 
- if(WIN32)
--  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_DLL)
-+  add_definitions(-D_WIN32 -DNOMINMAX -DOPENVDB_STATICLIB)
- endif()
- 
- ##### VDB unit tests
+ # Installation
+-IF ( NOT WIN32 )
++IF ( FALSE )
+   INSTALL ( TARGETS
+     vdb_view
+     DESTINATION
+diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h
+--- openvdb.orig/openvdb/math/Coord.h	2018-04-10 12:22:17 -0600
++++ openvdb/openvdb/math/Coord.h	2018-08-15 20:32:43 -0600
+@@ -35,6 +35,7 @@
+ #include <array> // for std::array
+ #include <iostream>
+ #include <limits>
++#define NOMINMAX
+ #include <openvdb/Platform.h>
+ #include "Math.h"
+ #include "Vec3.h"

build_files/build_environment/patches/osl.diff

@@ -1,3 +1,15 @@
+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
@@ -33,6 +45,18 @@ 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

build_files/build_environment/patches/usd.diff

@@ -1,139 +0,0 @@
-diff -x .git -ur usd.orig/cmake/defaults/Options.cmake external_usd/cmake/defaults/Options.cmake
---- usd.orig/cmake/defaults/Options.cmake	2019-10-24 22:39:53.000000000 +0200
-+++ external_usd/cmake/defaults/Options.cmake	2019-11-28 13:00:33.197957712 +0100
-@@ -25,6 +25,7 @@
- option(PXR_VALIDATE_GENERATED_CODE "Validate script generated code" OFF)
- option(PXR_HEADLESS_TEST_MODE "Disallow GUI based tests, useful for running under headless CI systems." OFF)
- option(PXR_BUILD_TESTS "Build tests" ON)
-+option(PXR_BUILD_USD_TOOLS "Build commandline tools" ON)
- option(PXR_BUILD_IMAGING "Build imaging components" ON)
- option(PXR_BUILD_EMBREE_PLUGIN "Build embree imaging plugin" OFF)
- option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF)
-diff -x .git -ur usd.orig/cmake/defaults/Packages.cmake external_usd/cmake/defaults/Packages.cmake
---- usd.orig/cmake/defaults/Packages.cmake	2019-10-24 22:39:53.000000000 +0200
-+++ external_usd/cmake/defaults/Packages.cmake	2019-11-28 13:00:33.185957483 +0100
-@@ -64,7 +64,7 @@
- endif()
- 
- # --TBB
--find_package(TBB REQUIRED COMPONENTS tbb)
-+find_package(TBB)
- add_definitions(${TBB_DEFINITIONS})
- 
- # --math
-diff -x .git -ur usd.orig/pxr/base/lib/plug/initConfig.cpp external_usd/pxr/base/lib/plug/initConfig.cpp
---- usd.orig/pxr/base/lib/plug/initConfig.cpp	2019-10-24 22:39:53.000000000 +0200
-+++ external_usd/pxr/base/lib/plug/initConfig.cpp	2019-12-11 11:00:37.643323127 +0100
-@@ -69,8 +69,38 @@
- 
- ARCH_CONSTRUCTOR(Plug_InitConfig, 2, void)
- {
-+    /* The contents of this constructor have been moved to usd_initialise_plugin_path(...) */
-+}
-+
-+}; // end of anonymous namespace
-+
-+/**
-+ * The contents of this function used to be in the static constructor Plug_InitConfig.
-+ * This static constructor made it impossible for Blender to pass a path to the USD
-+ * library at runtime, as the constructor would run before Blender's main() function.
-+ *
-+ * This function is wrapped in a C function of the same name (defined below),
-+ * so that it can be called from Blender's main() function.
-+ *
-+ * The datafiles_usd_path path is used to point to the USD plugin path when Blender
-+ * has been installed. The fallback_usd_path path should point to the build-time
-+ * location of the USD plugin files so that Blender can be run on a development machine
-+ * without requiring an installation step.
-+ */
-+void
-+usd_initialise_plugin_path(const char *datafiles_usd_path)
-+{
-     std::vector<std::string> result;
- 
-+    // Add Blender-specific paths. They MUST end in a slash, or symlinks will not be treated as directory.
-+    if (datafiles_usd_path != NULL && datafiles_usd_path[0] != '\0') {
-+        std::string datafiles_usd_path_str(datafiles_usd_path);
-+        if (datafiles_usd_path_str.back() != '/') {
-+            datafiles_usd_path_str += "/";
-+        }
-+        result.push_back(datafiles_usd_path_str);
-+    }
-+
-     // Determine the absolute path to the Plug shared library.
-     // Any relative paths specified in the plugin search path will be
-     // anchored to this directory, to allow for relocatability.
-@@ -94,9 +124,24 @@
-     _AppendPathList(&result, installLocation, sharedLibPath);
- #endif // PXR_INSTALL_LOCATION
- 
--    Plug_SetPaths(result);
--}
-+    if (!TfGetenv("PXR_PATH_DEBUG").empty()) {
-+        printf("USD Plugin paths: (%zu in total):\n", result.size());
-+        for(const std::string &path : result) {
-+            printf("    %s\n", path.c_str());
-+        }
-+    }
- 
-+    Plug_SetPaths(result);
- }
- 
- PXR_NAMESPACE_CLOSE_SCOPE
-+
-+/* Workaround to make it possible to pass a path at runtime to USD. */
-+extern "C" {
-+void
-+usd_initialise_plugin_path(
-+    const char *datafiles_usd_path)
-+{
-+    PXR_NS::usd_initialise_plugin_path(datafiles_usd_path);
-+}
-+}
-diff -x .git -ur usd.orig/pxr/usd/CMakeLists.txt external_usd/pxr/usd/CMakeLists.txt
---- usd.orig/pxr/usd/CMakeLists.txt	2019-10-24 22:39:53.000000000 +0200
-+++ external_usd/pxr/usd/CMakeLists.txt	2019-11-28 13:00:33.197957712 +0100
-@@ -1,6 +1,5 @@
- set(DIRS
-     lib
--    bin
-     plugin
- )
- 
-@@ -8,3 +7,8 @@
-     add_subdirectory(${d})
- endforeach()
- 
-+if (PXR_BUILD_USD_TOOLS)
-+    add_subdirectory(bin)
-+else()
-+    message(STATUS "Skipping commandline tools because PXR_BUILD_USD_TOOLS=OFF")
-+endif()
-diff -Naur external_usd_orig/pxr/base/lib/tf/preprocessorUtils.h external_usd/pxr/base/lib/tf/preprocessorUtils.h
---- external_usd_orig/pxr/base/lib/tf/preprocessorUtils.h	2019-10-24 14:39:53 -0600
-+++ external_usd/pxr/base/lib/tf/preprocessorUtils.h	2020-01-14 09:30:18 -0700
-@@ -189,7 +189,7 @@
- /// Exapnds to 1 if the argument is a tuple, and 0 otherwise.
- /// \ingroup group_tf_Preprocessor
- /// \hideinitializer
--#if defined(ARCH_OS_WINDOWS)
-+#if defined(ARCH_COMPILER_MSVC)
-     #define TF_PP_IS_TUPLE(sequence) \
-         BOOST_VMD_IS_TUPLE(sequence)
- #else
-diff -Naur external_usd_base/cmake/macros/Public.cmake external_usd/cmake/macros/Public.cmake
---- external_usd_base/cmake/macros/Public.cmake	2019-10-24 14:39:53 -0600
-+++ external_usd/cmake/macros/Public.cmake	2020-01-11 13:33:29 -0700
-@@ -996,6 +996,12 @@
-     foreach(lib ${PXR_OBJECT_LIBS})
-         string(TOUPPER ${lib} uppercaseName)
-         list(APPEND exports "${uppercaseName}_EXPORTS=1")
-+        # When building for blender, we do NOT want to export all symbols on windows.
-+        # This is a dirty hack, but USD makes it impossible to do the right thing
-+        # with the default options exposed.
-+        if (WIN32)
-+            list(APPEND exports "PXR_STATIC=1")
-+        endif()
-     endforeach()
-     foreach(lib ${PXR_OBJECT_LIBS})
-         set(objects "${objects};\$<TARGET_OBJECTS:${lib}>")

build_files/build_environment/windows/build_deps.cmd

@@ -126,7 +126,6 @@ if "%dobuild%" == "1" (
 	cmake --build . --target Harvest_Release_Results  > Harvest_Release.txt
 )
 echo %DATE% %TIME% : Release Harvest done >> %StatusFile%
-if "%NODEBUG%" == "1" goto exit
 cd %BUILD_DIR%
 mkdir %STAGING%\%BuildDir%%ARCH%D
 cd %Staging%\%BuildDir%%ARCH%D

build_files/buildbot/buildbot_utils.py

@@ -24,14 +24,6 @@ import re
 import subprocess
 import sys
 
-def is_tool(name):
-    """Check whether `name` is on PATH and marked as executable."""
-
-    # from whichcraft import which
-    from shutil import which
-
-    return which(name) is not None
-
 class Builder:
     def __init__(self, name, branch):
         self.name = name
@@ -50,10 +42,7 @@ class Builder:
             self.command_prefix =  []
         elif name.startswith('linux'):
             self.platform = 'linux'
-            if is_tool('scl'):
-                self.command_prefix =  ['scl', 'enable', 'devtoolset-6', '--']
-            else:
-                self.command_prefix =  []
+            self.command_prefix =  ['scl', 'enable', 'devtoolset-6', '--']
         elif name.startswith('win'):
             self.platform = 'win'
             self.command_prefix =  []

build_files/buildbot/codesign/absolute_and_relative_filename.py

@@ -65,14 +65,10 @@ class AbsoluteAndRelativeFileName:
         """
         Create list of AbsoluteAndRelativeFileName for all the files in the
         given directory.
-
-        NOTE: Result will be pointing to a resolved paths.
         """
         assert base_dir.is_absolute()
         assert base_dir.is_dir()
 
-        base_dir = base_dir.resolve()
-
         result = []
         for filename in base_dir.glob('**/*'):
             if not filename.is_file():

build_files/buildbot/codesign/archive_with_indicator.py

@@ -18,10 +18,9 @@
 
 # <pep8 compliant>
 
-import os
 from pathlib import Path
 
-import codesign.util as util
+from codesign.util import ensure_file_does_not_exist_or_die
 
 
 class ArchiveWithIndicator:
@@ -70,64 +69,9 @@ class ArchiveWithIndicator:
         self.archive_filepath = self.base_dir / archive_name
         self.ready_indicator_filepath = self.base_dir / ready_indicator_name
 
-    def is_ready_unsafe(self) -> bool:
-        """
-        Check whether the archive is ready for access.
-
-        No guarding about possible network failres is done here.
-        """
-        if not self.ready_indicator_filepath.exists():
-            return False
-
-        # Sometimes on macOS indicator file appears prior to the actual archive
-        # despite the order of creation and os.sync() used in tag_ready().
-        # So consider archive not ready if there is an indicator without an
-        # actual archive.
-        if not self.archive_filepath.exists():
-            print('Found indicator without actual archive, waiting for archive '
-                  f'({self.archive_filepath}) to appear.')
-            return False
-
-        # Read archive size from indicator/
-        #
-        # Assume that file is either empty or is fully written. This is being checked
-        # by performing ValueError check since empty string will throw this exception
-        # when attempted to be converted to int.
-        expected_archive_size_str = self.ready_indicator_filepath.read_text()
-        try:
-            expected_archive_size = int(expected_archive_size_str)
-        except ValueError:
-            print(f'Invalid archive size "{expected_archive_size_str}"')
-            return False
-
-        # Wait for until archive is fully stored.
-        actual_archive_size = self.archive_filepath.stat().st_size
-        if  actual_archive_size != expected_archive_size:
-            print('Partial/invalid archive size (expected '
-                  f'{expected_archive_size} got {actual_archive_size})')
-            return False
-
-        return True
-
     def is_ready(self) -> bool:
-        """
-        Check whether the archive is ready for access.
-
-        Will tolerate possible network failures: if there is a network failure
-        or if there is still no proper permission on a file False is returned.
-        """
-
-        # There are some intermitten problem happening at a random which is
-        # translates to "OSError : [WinError 59] An unexpected network error occurred".
-        # Some reports suggests it might be due to lack of permissions to the file,
-        # which might be applicable in our case since it's possible that file is
-        # initially created with non-accessible permissions and gets chmod-ed
-        # after initial creation.
-        try:
-            return self.is_ready_unsafe()
-        except OSError as e:
-            print(f'Exception checking archive: {e}')
-            return False
+        """Check whether the archive is ready for access."""
+        return self.ready_indicator_filepath.exists()
 
     def tag_ready(self) -> None:
         """
@@ -138,20 +82,14 @@ class ArchiveWithIndicator:
               If it is violated, an assert will fail.
         """
         assert not self.is_ready()
-        # Try the best to make sure everything is synced to the file system,
-        # to avoid any possibility of stamp appearing on a network share prior to
-        # an actual file.
-        if util.get_current_platform() != util.Platform.WINDOWS:
-            os.sync()
-        archive_size = self.archive_filepath.stat().st_size
-        self.ready_indicator_filepath.write_text(str(archive_size))
+        self.ready_indicator_filepath.touch()
 
     def clean(self) -> None:
         """
         Remove both archive and the ready indication file.
         """
-        util.ensure_file_does_not_exist_or_die(self.ready_indicator_filepath)
-        util.ensure_file_does_not_exist_or_die(self.archive_filepath)
+        ensure_file_does_not_exist_or_die(self.ready_indicator_filepath)
+        ensure_file_does_not_exist_or_die(self.archive_filepath)
 
     def is_fully_absent(self) -> bool:
         """

build_files/buildbot/codesign/base_code_signer.py

@@ -45,16 +45,13 @@
 import abc
 import logging
 import shutil
-import subprocess
 import time
-import tarfile
+import zipfile
 
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from typing import Iterable, List
 
-import codesign.util as util
-
 from codesign.absolute_and_relative_filename import AbsoluteAndRelativeFileName
 from codesign.archive_with_indicator import ArchiveWithIndicator
 
@@ -67,14 +64,14 @@ logger_server = logger.getChild('server')
 def pack_files(files: Iterable[AbsoluteAndRelativeFileName],
                archive_filepath: Path) -> None:
     """
-    Create tar archive from given files for the signing pipeline.
+    Create zip archive from given files for the signing pipeline.
     Is used by buildbot worker to create an archive of files which are to be
     signed, and by signing server to send signed files back to the worker.
     """
-    with tarfile.TarFile.open(archive_filepath, 'w') as tar_file_handle:
+    with zipfile.ZipFile(archive_filepath, 'w') as zip_file_handle:
         for file_info in files:
-            tar_file_handle.add(file_info.absolute_filepath,
-                                arcname=file_info.relative_filepath)
+            zip_file_handle.write(file_info.absolute_filepath,
+                                  arcname=file_info.relative_filepath)
 
 
 def extract_files(archive_filepath: Path,
@@ -85,8 +82,8 @@ def extract_files(archive_filepath: Path,
 
     # TODO(sergey): Verify files in the archive have relative path.
 
-    with tarfile.TarFile.open(archive_filepath, mode='r') as tar_file_handle:
-        tar_file_handle.extractall(path=extraction_dir)
+    with zipfile.ZipFile(archive_filepath, mode='r') as zip_file_handle:
+        zip_file_handle.extractall(path=extraction_dir)
 
 
 class BaseCodeSigner(metaclass=abc.ABCMeta):
@@ -136,9 +133,6 @@ class BaseCodeSigner(metaclass=abc.ABCMeta):
     # This archive is created by the code signing server.
     signed_archive_info: ArchiveWithIndicator
 
-    # Platform the code is currently executing on.
-    platform: util.Platform
-
     def __init__(self, config):
         self.config = config
 
@@ -147,14 +141,12 @@ class BaseCodeSigner(metaclass=abc.ABCMeta):
         # Unsigned (signing server input) configuration.
         self.unsigned_storage_dir = absolute_shared_storage_dir / 'unsigned'
         self.unsigned_archive_info = ArchiveWithIndicator(
-            self.unsigned_storage_dir, 'unsigned_files.tar', 'ready.stamp')
+            self.unsigned_storage_dir, 'unsigned_files.zip', 'ready.stamp')
 
         # Signed (signing server output) configuration.
         self.signed_storage_dir = absolute_shared_storage_dir / 'signed'
         self.signed_archive_info = ArchiveWithIndicator(
-            self.signed_storage_dir, 'signed_files.tar', 'ready.stamp')
-
-        self.platform = util.get_current_platform()
+            self.signed_storage_dir, 'signed_files.zip', 'ready.stamp')
 
     """
     General note on cleanup environment functions.
@@ -326,9 +318,6 @@ class BaseCodeSigner(metaclass=abc.ABCMeta):
             self.copy_signed_files_to_directory(
                 unpacked_signed_files_dir, destination_dir)
 
-        logger_builder.info('Removing archive with signed files...')
-        self.signed_archive_info.clean()
-
     ############################################################################
     # Signing server side helpers.
 
@@ -394,61 +383,3 @@ class BaseCodeSigner(metaclass=abc.ABCMeta):
             logger_server.info(
                 'Got signing request, beging signign procedure.')
             self.run_signing_pipeline()
-
-    ############################################################################
-    # Command executing.
-    #
-    # Abstracted to a degree that allows to run commands from a foreign
-    # platform.
-    # The goal with this is to allow performing dry-run tests of code signer
-    # server from other platforms (for example, to test that macOS code signer
-    # does what it is supposed to after doing a refactor on Linux).
-
-    # TODO(sergey): What is the type annotation for the command?
-    def run_command_or_mock(self, command, platform: util.Platform) -> None:
-        """
-        Run given command if current platform matches given one
-
-        If the platform is different then it will only be printed allowing
-        to verify logic of the code signing process.
-        """
-
-        if platform != self.platform:
-            logger_server.info(
-                f'Will run command for {platform}: {command}')
-            return
-
-        logger_server.info(f'Running command: {command}')
-        subprocess.run(command)
-
-    # TODO(sergey): What is the type annotation for the command?
-    def check_output_or_mock(self, command,
-                             platform: util.Platform,
-                             allow_nonzero_exit_code=False) -> str:
-        """
-        Run given command if current platform matches given one
-
-        If the platform is different then it will only be printed allowing
-        to verify logic of the code signing process.
-
-        If allow_nonzero_exit_code is truth then the output will be returned
-        even if application quit with non-zero exit code.
-        Otherwise an subprocess.CalledProcessError exception will be raised
-        in such case.
-        """
-
-        if platform != self.platform:
-            logger_server.info(
-                f'Will run command for {platform}: {command}')
-            return
-
-        if allow_nonzero_exit_code:
-            process = subprocess.Popen(command,
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.STDOUT)
-            output = process.communicate()[0]
-            return output.decode()
-
-        logger_server.info(f'Running command: {command}')
-        return subprocess.check_output(
-            command, stderr=subprocess.STDOUT).decode()

build_files/buildbot/codesign/config_builder.py

@@ -25,17 +25,12 @@ import sys
 
 from pathlib import Path
 
-import codesign.util as util
-
 from codesign.config_common import *
 
-platform = util.get_current_platform()
-if platform == util.Platform.LINUX:
+if sys.platform == 'linux':
     SHARED_STORAGE_DIR = Path('/data/codesign')
-elif platform == util.Platform.WINDOWS:
+elif sys.platform == 'win32':
     SHARED_STORAGE_DIR = Path('Z:\\codesign')
-elif platform == util.Platform.MACOS:
-    SHARED_STORAGE_DIR = Path('/Volumes/codesign_macos/codesign')
 
 # https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
 LOGGING = {

build_files/buildbot/codesign/config_common.py

@@ -24,10 +24,7 @@ from pathlib import Path
 #
 # This is how long buildbot packing step will wait signing server to
 # perform signing.
-#
-# NOTE: Notarization could take a long time, hence the rather high value
-# here. Might consider using different timeout for different platforms.
-TIMEOUT_IN_SECONDS = 45 * 60 * 60
+TIMEOUT_IN_SECONDS = 240
 
 # Directory which is shared across buildbot worker and signing server.
 #

build_files/buildbot/codesign/config_server_template.py

@@ -27,43 +27,8 @@ from pathlib import Path
 
 from codesign.config_common import *
 
-CODESIGN_DIRECTORY = Path(__file__).absolute().parent
-BLENDER_GIT_ROOT_DIRECTORY = CODESIGN_DIRECTORY.parent.parent.parent
-
-################################################################################
-# Common configuration.
-
-# Directory where folders for codesign requests and signed result are stored.
-# For example, /data/codesign
-SHARED_STORAGE_DIR: Path
-
-################################################################################
-# macOS-specific configuration.
-
-MACOS_ENTITLEMENTS_FILE = \
-    BLENDER_GIT_ROOT_DIRECTORY / 'release' / 'darwin' / 'entitlements.plist'
-
-# Identity of the Developer ID Application certificate which is to be used for
-# codesign tool.
-# Use `security find-identity -v -p codesigning` to find the identity.
-#
-# NOTE: This identity is just an example from release/darwin/README.txt.
-MACOS_CODESIGN_IDENTITY = 'AE825E26F12D08B692F360133210AF46F4CF7B97'
-
-# User name (Apple ID) which will be used to request notarization.
-MACOS_XCRUN_USERNAME = 'me@example.com'
-
-# One-time application password which will be used to request notarization.
-MACOS_XCRUN_PASSWORD = '@keychain:altool-password'
-
-# Timeout in seconds within which the notarial office is supposed to reply.
-MACOS_NOTARIZE_TIMEOUT_IN_SECONDS = 60 * 60
-
-################################################################################
-# Windows-specific configuration.
-
 # URL to the timestamping authority.
-WIN_TIMESTAMP_AUTHORITY_URL = 'http://timestamp.digicert.com'
+TIMESTAMP_AUTHORITY_URL = 'http://timestamp.digicert.com'
 
 # Full path to the certificate used for signing.
 #
@@ -71,10 +36,7 @@ WIN_TIMESTAMP_AUTHORITY_URL = 'http://timestamp.digicert.com'
 #
 # On Windows it is usually is a PKCS #12 key (.pfx), so the path will look
 # like Path('C:\\Secret\\Blender.pfx').
-WIN_CERTIFICATE_FILEPATH: Path
-
-################################################################################
-# Logging configuration, common for all platforms.
+CERTIFICATE_FILEPATH: Path
 
 # https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
 LOGGING = {

build_files/buildbot/codesign/linux_code_signer.py

@@ -51,7 +51,7 @@ class LinuxCodeSigner(BaseCodeSigner):
             self, file: AbsoluteAndRelativeFileName) -> bool:
         if file.relative_filepath == Path('blender'):
             return True
-        if (file.relative_filepath.parts[-3:-1] == ('python', 'bin') and
+        if (file.relative_filepath.parts()[-3:-1] == ('python', 'bin') and
                 file.relative_filepath.name.startwith('python')):
             return True
         if file.relative_filepath.suffix == '.so':

build_files/buildbot/codesign/macos_code_signer.py

@@ -1,453 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import logging
-import re
-import stat
-import subprocess
-import time
-
-from pathlib import Path
-from typing import List
-
-import codesign.util as util
-
-from buildbot_utils import Builder
-
-from codesign.absolute_and_relative_filename import AbsoluteAndRelativeFileName
-from codesign.base_code_signer import BaseCodeSigner
-
-logger = logging.getLogger(__name__)
-logger_server = logger.getChild('server')
-
-# NOTE: Check is done as filename.endswith(), so keep the dot
-EXTENSIONS_TO_BE_SIGNED = {'.dylib', '.so', '.dmg'}
-
-# Prefixes of a file (not directory) name which are to be signed.
-# Used to sign extra executable files in Contents/Resources.
-NAME_PREFIXES_TO_BE_SIGNED = {'python'}
-
-
-def is_file_from_bundle(file: AbsoluteAndRelativeFileName) -> bool:
-    """
-    Check whether file is coming from an .app bundle
-    """
-    parts = file.relative_filepath.parts
-    if not parts:
-        return False
-    if not parts[0].endswith('.app'):
-        return False
-    return True
-
-
-def get_bundle_from_file(
-        file: AbsoluteAndRelativeFileName) -> AbsoluteAndRelativeFileName:
-    """
-    Get AbsoluteAndRelativeFileName descriptor of bundle
-    """
-    assert(is_file_from_bundle(file))
-
-    parts = file.relative_filepath.parts
-    bundle_name = parts[0]
-
-    base_dir = file.base_dir
-    bundle_filepath = file.base_dir / bundle_name
-    return AbsoluteAndRelativeFileName(base_dir, bundle_filepath)
-
-
-def is_bundle_executable_file(file: AbsoluteAndRelativeFileName) -> bool:
-    """
-    Check whether given file is an executable within an app bundle
-    """
-    if not is_file_from_bundle(file):
-        return False
-
-    parts = file.relative_filepath.parts
-    num_parts = len(parts)
-    if num_parts < 3:
-        return False
-
-    if parts[1:3] != ('Contents', 'MacOS'):
-        return False
-
-    return True
-
-
-def xcrun_field_value_from_output(field: str, output: str) -> str:
-    """
-    Get value of a given field from xcrun output.
-
-    If field is not found empty string is returned.
-    """
-
-    field_prefix = field + ': '
-    for line in output.splitlines():
-        line = line.strip()
-        if line.startswith(field_prefix):
-            return line[len(field_prefix):]
-    return ''
-
-
-class MacOSCodeSigner(BaseCodeSigner):
-    def check_file_is_to_be_signed(
-            self, file: AbsoluteAndRelativeFileName) -> bool:
-        if file.relative_filepath.name.startswith('.'):
-            return False
-
-        if is_bundle_executable_file(file):
-            return True
-
-        base_name = file.relative_filepath.name
-        if any(base_name.startswith(prefix)
-               for prefix in NAME_PREFIXES_TO_BE_SIGNED):
-            return True
-
-        mode = file.absolute_filepath.lstat().st_mode
-        if mode & stat.S_IXUSR != 0:
-            file_output = subprocess.check_output(
-                ("file", file.absolute_filepath)).decode()
-            if "64-bit executable" in file_output:
-                return True
-
-        return file.relative_filepath.suffix in EXTENSIONS_TO_BE_SIGNED
-
-    def collect_files_to_sign(self, path: Path) \
-            -> List[AbsoluteAndRelativeFileName]:
-        # Include all files when signing app or dmg bundle: all the files are
-        # needed to do valid signature of bundle.
-        if path.name.endswith('.app'):
-            return AbsoluteAndRelativeFileName.recursively_from_directory(path)
-        if path.is_dir():
-            files = []
-            for child in path.iterdir():
-                if child.name.endswith('.app'):
-                    current_files = AbsoluteAndRelativeFileName.recursively_from_directory(
-                        child)
-                else:
-                    current_files = super().collect_files_to_sign(child)
-                for current_file in current_files:
-                    files.append(AbsoluteAndRelativeFileName(
-                        path, current_file.absolute_filepath))
-            return files
-        return super().collect_files_to_sign(path)
-
-    ############################################################################
-    # Codesign.
-
-    def codesign_remove_signature(
-            self, file: AbsoluteAndRelativeFileName) -> None:
-        """
-        Make sure given file does not have codesign signature
-
-        This is needed because codesigning is not possible for file which has
-        signature already.
-        """
-
-        logger_server.info(
-            'Removing codesign signature from %s...', file.relative_filepath)
-
-        command = ['codesign', '--remove-signature', file.absolute_filepath]
-        self.run_command_or_mock(command, util.Platform.MACOS)
-
-    def codesign_file(
-            self, file: AbsoluteAndRelativeFileName) -> None:
-        """
-        Sign given file
-
-        NOTE: File must not have any signatures.
-        """
-
-        logger_server.info(
-            'Codesigning %s...', file.relative_filepath)
-
-        entitlements_file = self.config.MACOS_ENTITLEMENTS_FILE
-        command = ['codesign',
-                   '--timestamp',
-                   '--options', 'runtime',
-                   f'--entitlements={entitlements_file}',
-                   '--sign', self.config.MACOS_CODESIGN_IDENTITY,
-                   file.absolute_filepath]
-        self.run_command_or_mock(command, util.Platform.MACOS)
-
-    def codesign_all_files(self, files: List[AbsoluteAndRelativeFileName]) -> bool:
-        """
-        Run codesign tool on all eligible files in the given list.
-
-        Will ignore all files which are not to be signed. For the rest will
-        remove possible existing signature and add a new signature.
-        """
-
-        num_files = len(files)
-        have_ignored_files = False
-        signed_files = []
-        for file_index, file in enumerate(files):
-            # Ignore file if it is not to be signed.
-            # Allows to manually construct ZIP of a bundle and get it signed.
-            if not self.check_file_is_to_be_signed(file):
-                logger_server.info(
-                    'Ignoring file [%d/%d] %s',
-                    file_index + 1, num_files, file.relative_filepath)
-                have_ignored_files = True
-                continue
-
-            logger_server.info(
-                'Running codesigning routines for file [%d/%d] %s...',
-                file_index + 1, num_files, file.relative_filepath)
-
-            self.codesign_remove_signature(file)
-            self.codesign_file(file)
-
-            signed_files.append(file)
-
-        if have_ignored_files:
-            logger_server.info('Signed %d files:', len(signed_files))
-            num_signed_files = len(signed_files)
-            for file_index, signed_file in enumerate(signed_files):
-                logger_server.info(
-                    '- [%d/%d] %s',
-                    file_index + 1, num_signed_files,
-                    signed_file.relative_filepath)
-
-        return True
-
-    def codesign_bundles(
-            self, files: List[AbsoluteAndRelativeFileName]) -> None:
-        """
-        Codesign all .app bundles in the given list of files.
-
-        Bundle is deducted from paths of the files, and every bundle is only
-        signed once.
-        """
-
-        signed_bundles = set()
-        extra_files = []
-
-        for file in files:
-            if not is_file_from_bundle(file):
-                continue
-            bundle = get_bundle_from_file(file)
-            bundle_name = bundle.relative_filepath
-            if bundle_name in signed_bundles:
-                continue
-
-            logger_server.info('Running codesign routines on bundle %s',
-                               bundle_name)
-
-            # It is not possible to remove signature from DMG.
-            if bundle.relative_filepath.name.endswith('.app'):
-                self.codesign_remove_signature(bundle)
-            self.codesign_file(bundle)
-
-            signed_bundles.add(bundle_name)
-
-            # Codesign on a bundle adds an extra folder with information.
-            # It needs to be compied to the source.
-            code_signature_directory = \
-                bundle.absolute_filepath / 'Contents' / '_CodeSignature'
-            code_signature_files = \
-                AbsoluteAndRelativeFileName.recursively_from_directory(
-                    code_signature_directory)
-            for code_signature_file in code_signature_files:
-                bundle_relative_file = AbsoluteAndRelativeFileName(
-                    bundle.base_dir,
-                    code_signature_directory /
-                    code_signature_file.relative_filepath)
-                extra_files.append(bundle_relative_file)
-
-        files.extend(extra_files)
-
-        return True
-
-    ############################################################################
-    # Notarization.
-
-    def notarize_get_bundle_id(self, file: AbsoluteAndRelativeFileName) -> str:
-        """
-        Get bundle ID which will be used to notarize DMG
-        """
-        name = file.relative_filepath.name
-        app_name = name.split('-', 2)[0].lower()
-
-        app_name_words = app_name.split()
-        if len(app_name_words) > 1:
-            app_name_id = ''.join(word.capitalize() for word in app_name_words)
-        else:
-            app_name_id = app_name_words[0]
-
-        # TODO(sergey): Consider using "alpha" for buildbot builds.
-        return f'org.blenderfoundation.{app_name_id}.release'
-
-    def notarize_request(self, file) -> str:
-        """
-        Request notarization of the given file.
-
-        Returns UUID of the notarization request. If error occurred None is
-        returned instead of UUID.
-        """
-
-        bundle_id = self.notarize_get_bundle_id(file)
-        logger_server.info('Bundle ID: %s', bundle_id)
-
-        logger_server.info('Submitting file to the notarial office.')
-        command = [
-            'xcrun', 'altool', '--notarize-app', '--verbose',
-            '-f', file.absolute_filepath,
-            '--primary-bundle-id', bundle_id,
-            '--username', self.config.MACOS_XCRUN_USERNAME,
-            '--password', self.config.MACOS_XCRUN_PASSWORD]
-
-        output = self.check_output_or_mock(
-            command, util.Platform.MACOS, allow_nonzero_exit_code=True)
-
-        for line in output.splitlines():
-            line = line.strip()
-            if line.startswith('RequestUUID = '):
-                request_uuid = line[14:]
-                return request_uuid
-
-            # Check whether the package has been already submitted.
-            if 'The software asset has already been uploaded.' in line:
-                request_uuid = re.sub(
-                    '.*The upload ID is ([A-Fa-f0-9\-]+).*', '\\1', line)
-                logger_server.warning(
-                    f'The package has been already submitted under UUID {request_uuid}')
-                return request_uuid
-
-        logger_server.error(output)
-        logger_server.error('xcrun command did not report RequestUUID')
-        return None
-
-    def notarize_wait_result(self, request_uuid: str) -> bool:
-        """
-        Wait for until notarial office have a reply
-        """
-
-        logger_server.info(
-            'Waiting for a result from the notarization office.')
-
-        command = ['xcrun', 'altool',
-                   '--notarization-info', request_uuid,
-                   '--username', self.config.MACOS_XCRUN_USERNAME,
-                   '--password', self.config.MACOS_XCRUN_PASSWORD]
-
-        time_start = time.monotonic()
-        timeout_in_seconds = self.config.MACOS_NOTARIZE_TIMEOUT_IN_SECONDS
-
-        while True:
-            output = self.check_output_or_mock(
-                command, util.Platform.MACOS, allow_nonzero_exit_code=True)
-            # Parse status and message
-            status = xcrun_field_value_from_output('Status', output)
-            status_message = xcrun_field_value_from_output(
-                'Status Message', output)
-
-            # Review status.
-            if status:
-                if status == 'success':
-                    logger_server.info(
-                        'Package successfully notarized: %s', status_message)
-                    return True
-                elif status == 'invalid':
-                    logger_server.error(output)
-                    logger_server.error(
-                        'Package notarization has failed: %s', status_message)
-                    return False
-                elif status == 'in progress':
-                    pass
-                else:
-                    logger_server.info(
-                        'Unknown notarization status %s (%s)', status, status_message)
-
-            logger_server.info('Keep waiting for notarization office.')
-            time.sleep(30)
-
-            time_slept_in_seconds = time.monotonic() - time_start
-            if time_slept_in_seconds > timeout_in_seconds:
-                logger_server.error(
-                    "Notarial office didn't reply in %f seconds.",
-                    timeout_in_seconds)
-
-    def notarize_staple(self, file: AbsoluteAndRelativeFileName) -> bool:
-        """
-        Staple notarial label on the file
-        """
-
-        logger_server.info('Stapling notarial stamp.')
-
-        command = ['xcrun', 'stapler', 'staple', '-v', file.absolute_filepath]
-        self.check_output_or_mock(command, util.Platform.MACOS)
-
-        return True
-
-    def notarize_dmg(self, file: AbsoluteAndRelativeFileName) -> bool:
-        """
-        Run entire pipeline to get DMG notarized.
-        """
-        logger_server.info('Begin notarization routines on %s',
-                           file.relative_filepath)
-
-        # Submit file for notarization.
-        request_uuid = self.notarize_request(file)
-        if not request_uuid:
-            return False
-        logger_server.info('Received Request UUID: %s', request_uuid)
-
-        # Wait for the status from the notarization office.
-        if not self.notarize_wait_result(request_uuid):
-            return False
-
-        # Staple.
-        if not self.notarize_staple(file):
-            return False
-
-        return True
-
-    def notarize_all_dmg(
-            self, files: List[AbsoluteAndRelativeFileName]) -> bool:
-        """
-        Notarize all DMG images from the input.
-
-        Images are supposed to be codesigned already.
-        """
-        for file in files:
-            if not file.relative_filepath.name.endswith('.dmg'):
-                continue
-            if not self.check_file_is_to_be_signed(file):
-                continue
-
-            if not self.notarize_dmg(file):
-                return False
-
-        return True
-
-    ############################################################################
-    # Entry point.
-
-    def sign_all_files(self, files: List[AbsoluteAndRelativeFileName]) -> None:
-        # TODO(sergey): Handle errors somehow.
-
-        if not self.codesign_all_files(files):
-            return
-
-        if not self.codesign_bundles(files):
-            return
-
-        if not self.notarize_all_dmg(files):
-            return

build_files/buildbot/codesign/simple_code_signer.py

@@ -26,7 +26,6 @@ from pathlib import Path
 from typing import Optional
 
 import codesign.config_builder
-import codesign.util as util
 from codesign.base_code_signer import BaseCodeSigner
 
 
@@ -34,14 +33,10 @@ class SimpleCodeSigner:
     code_signer: Optional[BaseCodeSigner]
 
     def __init__(self):
-        platform = util.get_current_platform()
-        if platform == util.Platform.LINUX:
+        if sys.platform == 'linux':
             from codesign.linux_code_signer import LinuxCodeSigner
             self.code_signer = LinuxCodeSigner(codesign.config_builder)
-        elif platform == util.Platform.MACOS:
-            from codesign.macos_code_signer import MacOSCodeSigner
-            self.code_signer = MacOSCodeSigner(codesign.config_builder)
-        elif platform == util.Platform.WINDOWS:
+        elif sys.platform == 'win32':
             from codesign.windows_code_signer import WindowsCodeSigner
             self.code_signer = WindowsCodeSigner(codesign.config_builder)
         else:

build_files/buildbot/codesign/util.py

@@ -18,28 +18,9 @@
 
 # <pep8 compliant>
 
-import sys
-
-from enum import Enum
 from pathlib import Path
 
 
-class Platform(Enum):
-    LINUX = 1
-    MACOS = 2
-    WINDOWS = 3
-
-
-def get_current_platform() -> Platform:
-    if sys.platform == 'linux':
-        return Platform.LINUX
-    elif sys.platform == 'darwin':
-        return Platform.MACOS
-    elif sys.platform == 'win32':
-        return Platform.WINDOWS
-    raise Exception(f'Unknown platform {sys.platform}')
-
-
 def ensure_file_does_not_exist_or_die(filepath: Path) -> None:
     """
     If the file exists, unlink it.

build_files/buildbot/codesign/windows_code_signer.py

@@ -19,12 +19,11 @@
 # <pep8 compliant>
 
 import logging
+import subprocess
 
 from pathlib import Path
 from typing import List
 
-import codesign.util as util
-
 from buildbot_utils import Builder
 
 from codesign.absolute_and_relative_filename import AbsoluteAndRelativeFileName
@@ -53,8 +52,8 @@ class WindowsCodeSigner(BaseCodeSigner):
     def get_sign_command_prefix(self) -> List[str]:
         return [
             'signtool', 'sign', '/v',
-            '/f', self.config.WIN_CERTIFICATE_FILEPATH,
-            '/tr', self.config.WIN_TIMESTAMP_AUTHORITY_URL]
+            '/f', self.config.CERTIFICATE_FILEPATH,
+            '/t', self.config.TIMESTAMP_AUTHORITY_URL]
 
     def sign_all_files(self, files: List[AbsoluteAndRelativeFileName]) -> None:
         # NOTE: Sign files one by one to avoid possible command line length
@@ -65,14 +64,6 @@ class WindowsCodeSigner(BaseCodeSigner):
         # one go (but only if this actually known to be much faster).
         num_files = len(files)
         for file_index, file in enumerate(files):
-            # Ignore file if it is not to be signed.
-            # Allows to manually construct ZIP of package and get it signed.
-            if not self.check_file_is_to_be_signed(file):
-                logger_server.info(
-                    'Ignoring file [%d/%d] %s',
-                    file_index + 1, num_files, file.relative_filepath)
-                continue
-
             command = self.get_sign_command_prefix()
             command.append(file.absolute_filepath)
             logger_server.info(
@@ -80,5 +71,5 @@ class WindowsCodeSigner(BaseCodeSigner):
                 file_index + 1, num_files, file.relative_filepath)
             # TODO(sergey): Check the status somehow. With a missing certificate
             # the command still exists with a zero code.
-            self.run_command_or_mock(command, util.Platform.WINDOWS)
+            subprocess.run(command)
         # TODO(sergey): Report number of signed and ignored files.

build_files/buildbot/codesign_server_macos.py

@@ -1,41 +0,0 @@
-#!/usr/bin/env python3
-
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import logging.config
-from pathlib import Path
-from typing import List
-
-from codesign.macos_code_signer import MacOSCodeSigner
-import codesign.config_server
-
-if __name__ == "__main__":
-    entitlements_file = codesign.config_server.MACOS_ENTITLEMENTS_FILE
-    if not entitlements_file.exists():
-        raise SystemExit(
-            'Entitlements file {entitlements_file} does not exist.')
-    if not entitlements_file.is_file():
-        raise SystemExit(
-            'Entitlements file {entitlements_file} is not a file.')
-
-    logging.config.dictConfig(codesign.config_server.LOGGING)
-    code_signer = MacOSCodeSigner(codesign.config_server)
-    code_signer.run_signing_server()

build_files/buildbot/codesign_server_windows.py

@@ -30,25 +30,15 @@ import shutil
 from pathlib import Path
 from typing import List
 
-import codesign.util as util
-
 from codesign.windows_code_signer import WindowsCodeSigner
 import codesign.config_server
 
 if __name__ == "__main__":
-    logging.config.dictConfig(codesign.config_server.LOGGING)
-
-    logger = logging.getLogger(__name__)
-    logger_server = logger.getChild('server')
-
     # TODO(sergey): Consider moving such sanity checks into
     # CodeSigner.check_environment_or_die().
     if not shutil.which('signtool.exe'):
-        if util.get_current_platform() == util.Platform.WINDOWS:
-            raise SystemExit("signtool.exe is not found in %PATH%")
-        logger_server.info(
-            'signtool.exe not found, '
-            'but will not be used on this foreign platform')
+        raise SystemExit("signtool.exe is not found in %PATH%")
 
+    logging.config.dictConfig(codesign.config_server.LOGGING)
     code_signer = WindowsCodeSigner(codesign.config_server)
     code_signer.run_signing_server()

build_files/buildbot/slave_bundle_dmg.py

@@ -1,542 +0,0 @@
-#!/usr/bin/env python3
-
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  This program is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation; either version 2
-#  of the License, or (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-import argparse
-import re
-import shutil
-import subprocess
-import sys
-import time
-
-from pathlib import Path
-from tempfile import TemporaryDirectory, NamedTemporaryFile
-from typing import List
-
-BUILDBOT_DIRECTORY = Path(__file__).absolute().parent
-CODESIGN_SCRIPT = BUILDBOT_DIRECTORY / 'slave_codesign.py'
-BLENDER_GIT_ROOT_DIRECTORY = BUILDBOT_DIRECTORY.parent.parent
-DARWIN_DIRECTORY = BLENDER_GIT_ROOT_DIRECTORY / 'release' / 'darwin'
-
-
-# Extra size which is added on top of actual files size when estimating size
-# of destination DNG.
-EXTRA_DMG_SIZE_IN_BYTES = 800 * 1024 * 1024
-
-################################################################################
-# Common utilities
-
-
-def get_directory_size(root_directory: Path) -> int:
-    """
-    Get size of directory on disk
-    """
-
-    total_size = 0
-    for file in root_directory.glob('**/*'):
-        total_size += file.lstat().st_size
-    return total_size
-
-
-################################################################################
-# DMG bundling specific logic
-
-def create_argument_parser():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        'source_dir',
-        type=Path,
-        help='Source directory which points to either existing .app bundle'
-             'or to a directory with .app bundles.')
-    parser.add_argument(
-        '--background-image',
-        type=Path,
-        help="Optional background picture which will be set on the DMG."
-             "If not provided default Blender's one is used.")
-    parser.add_argument(
-        '--volume-name',
-        type=str,
-        help='Optional name of a volume which will be used for DMG.')
-    parser.add_argument(
-        '--dmg',
-        type=Path,
-        help='Optional argument which points to a final DMG file name.')
-    parser.add_argument(
-        '--applescript',
-        type=Path,
-        help="Optional path to applescript to set up folder looks of DMG."
-             "If not provided default Blender's one is used.")
-    return parser
-
-
-def collect_app_bundles(source_dir: Path) -> List[Path]:
-    """
-    Collect all app bundles which are to be put into DMG
-
-    If the source directory points to FOO.app it will be the only app bundle
-    packed.
-
-    Otherwise all .app bundles from given directory are placed to a single
-    DMG.
-    """
-
-    if source_dir.name.endswith('.app'):
-        return [source_dir]
-
-    app_bundles = []
-    for filename in source_dir.glob('*'):
-        if not filename.is_dir():
-            continue
-        if not filename.name.endswith('.app'):
-            continue
-
-        app_bundles.append(filename)
-
-    return app_bundles
-
-
-def collect_and_log_app_bundles(source_dir: Path) -> List[Path]:
-    app_bundles = collect_app_bundles(source_dir)
-
-    if not app_bundles:
-        print('No app bundles found for packing')
-        return
-
-    print(f'Found {len(app_bundles)} to pack:')
-    for app_bundle in app_bundles:
-        print(f'- {app_bundle}')
-
-    return app_bundles
-
-
-def estimate_dmg_size(app_bundles: List[Path]) -> int:
-    """
-    Estimate size of DMG to hold requested app bundles
-
-    The size is based on actual size of all files in all bundles plus some
-    space to compensate for different size-on-disk plus some space to hold
-    codesign signatures.
-
-    Is better to be on a high side since the empty space is compressed, but
-    lack of space might cause silent failures later on.
-    """
-
-    app_bundles_size = 0
-    for app_bundle in app_bundles:
-        app_bundles_size += get_directory_size(app_bundle)
-
-    return app_bundles_size + EXTRA_DMG_SIZE_IN_BYTES
-
-
-def copy_app_bundles_to_directory(app_bundles: List[Path],
-                                  directory: Path) -> None:
-    """
-    Copy all bundles to a given directory
-
-    This directory is what the DMG will be created from.
-    """
-    for app_bundle in app_bundles:
-        print(f'Copying {app_bundle.name}...')
-        shutil.copytree(app_bundle, directory / app_bundle.name)
-
-
-def get_main_app_bundle(app_bundles: List[Path]) -> Path:
-    """
-    Get application bundle main for the installation
-    """
-    return app_bundles[0]
-
-
-def create_dmg_image(app_bundles: List[Path],
-                     dmg_filepath: Path,
-                     volume_name: str) -> None:
-    """
-    Create DMG disk image and put app bundles in it
-
-    No DMG configuration or codesigning is happening here.
-    """
-
-    if dmg_filepath.exists():
-        print(f'Removing existing writable DMG {dmg_filepath}...')
-        dmg_filepath.unlink()
-
-    print('Preparing directory with app bundles for the DMG...')
-    with TemporaryDirectory(prefix='blender-dmg-content-') as content_dir_str:
-        # Copy all bundles to a clean directory.
-        content_dir = Path(content_dir_str)
-        copy_app_bundles_to_directory(app_bundles, content_dir)
-
-        # Estimate size of the DMG.
-        dmg_size = estimate_dmg_size(app_bundles)
-        print(f'Estimated DMG size: {dmg_size:,} bytes.')
-
-        # Create the DMG.
-        print(f'Creating writable DMG {dmg_filepath}')
-        command = ('hdiutil',
-                   'create',
-                   '-size', str(dmg_size),
-                   '-fs', 'HFS+',
-                   '-srcfolder', content_dir,
-                   '-volname', volume_name,
-                   '-format', 'UDRW',
-                   dmg_filepath)
-        subprocess.run(command)
-
-
-def get_writable_dmg_filepath(dmg_filepath: Path):
-    """
-    Get file path for writable DMG image
-    """
-    parent = dmg_filepath.parent
-    return parent / (dmg_filepath.stem + '-temp.dmg')
-
-
-def mount_readwrite_dmg(dmg_filepath: Path) -> None:
-    """
-    Mount writable DMG
-
-    Mounting point would be /Volumes/<volume name>
-    """
-
-    print(f'Mounting read-write DMG ${dmg_filepath}')
-    command = ('hdiutil',
-               'attach', '-readwrite',
-               '-noverify',
-               '-noautoopen',
-               dmg_filepath)
-    subprocess.run(command)
-
-
-def get_mount_directory_for_volume_name(volume_name: str) -> Path:
-    """
-    Get directory under which the volume will be mounted
-    """
-
-    return Path('/Volumes') / volume_name
-
-
-def eject_volume(volume_name: str) -> None:
-    """
-    Eject given volume, if mounted
-    """
-    mount_directory = get_mount_directory_for_volume_name(volume_name)
-    if not mount_directory.exists():
-        return
-    mount_directory_str = str(mount_directory)
-
-    print(f'Ejecting volume {volume_name}')
-
-    # Figure out which device to eject.
-    mount_output = subprocess.check_output(['mount']).decode()
-    device = ''
-    for line in mount_output.splitlines():
-        if f'on {mount_directory_str} (' not in line:
-            continue
-        tokens = line.split(' ', 3)
-        if len(tokens) < 3:
-            continue
-        if tokens[1] != 'on':
-            continue
-        if device:
-            raise Exception(
-                f'Multiple devices found for mounting point {mount_directory}')
-        device = tokens[0]
-
-    if not device:
-        raise Exception(
-            f'No device found for mounting point {mount_directory}')
-
-    print(f'{mount_directory} is mounted as device {device}, ejecting...')
-    subprocess.run(['diskutil', 'eject', device])
-
-
-def copy_background_if_needed(background_image_filepath: Path,
-                              mount_directory: Path) -> None:
-    """
-    Copy background to the DMG
-
-    If the background image is not specified it will not be copied.
-    """
-
-    if not background_image_filepath:
-        print('No background image provided.')
-        return
-
-    print(f'Copying background image {background_image_filepath}')
-
-    destination_dir = mount_directory / '.background'
-    destination_dir.mkdir(exist_ok=True)
-
-    destination_filepath = destination_dir / background_image_filepath.name
-    shutil.copy(background_image_filepath, destination_filepath)
-
-
-def create_applications_link(mount_directory: Path) -> None:
-    """
-    Create link to /Applications in the given location
-    """
-
-    print('Creating link to /Applications')
-
-    command = ('ln', '-s', '/Applications', mount_directory / ' ')
-    subprocess.run(command)
-
-
-def run_applescript(applescript: Path,
-                    volume_name: str,
-                    app_bundles: List[Path],
-                    background_image_filepath: Path) -> None:
-    """
-    Run given applescript to adjust look and feel of the DMG
-    """
-
-    main_app_bundle = get_main_app_bundle(app_bundles)
-
-    with NamedTemporaryFile(
-            mode='w', suffix='.applescript') as temp_applescript:
-        print('Adjusting applescript for volume name...')
-        # Adjust script to the specific volume name.
-        with open(applescript, mode='r') as input:
-            for line in input.readlines():
-                stripped_line = line.strip()
-                if stripped_line.startswith('tell disk'):
-                    line = re.sub('tell disk ".*"',
-                                  f'tell disk "{volume_name}"',
-                                  line)
-                elif stripped_line.startswith('set background picture'):
-                    if not background_image_filepath:
-                        continue
-                    else:
-                        background_image_short = \
-                            '.background:' + background_image_filepath.name
-                        line = re.sub('to file ".*"',
-                                      f'to file "{background_image_short}"',
-                                      line)
-                line = line.replace('blender.app', main_app_bundle.name)
-                temp_applescript.write(line)
-
-        temp_applescript.flush()
-
-        print('Running applescript...')
-        command = ('osascript',  temp_applescript.name)
-        subprocess.run(command)
-
-        print('Waiting for applescript...')
-
-        # NOTE: This is copied from bundle.sh. The exact reason for sleep is
-        # still remained a mystery.
-        time.sleep(5)
-
-
-def codesign(subject: Path):
-    """
-    Codesign file or directory
-
-    NOTE: For DMG it will also notarize.
-    """
-
-    command = (CODESIGN_SCRIPT, subject)
-    subprocess.run(command)
-
-
-def codesign_app_bundles_in_dmg(mount_directory: str) -> None:
-    """
-    Code sign all binaries and bundles in the mounted directory
-    """
-
-    print(f'Codesigning all app bundles in {mount_directory}')
-    codesign(mount_directory)
-
-
-def codesign_and_notarize_dmg(dmg_filepath: Path) -> None:
-    """
-    Run codesign and notarization pipeline on the DMG
-    """
-
-    print(f'Codesigning and notarizing DMG {dmg_filepath}')
-    codesign(dmg_filepath)
-
-
-def compress_dmg(writable_dmg_filepath: Path,
-                 final_dmg_filepath: Path) -> None:
-    """
-    Compress temporary read-write DMG
-    """
-    command = ('hdiutil', 'convert',
-               writable_dmg_filepath,
-               '-format', 'UDZO',
-               '-o', final_dmg_filepath)
-
-    if final_dmg_filepath.exists():
-        print(f'Removing old compressed DMG {final_dmg_filepath}')
-        final_dmg_filepath.unlink()
-
-    print('Compressing disk image...')
-    subprocess.run(command)
-
-
-def create_final_dmg(app_bundles: List[Path],
-                     dmg_filepath: Path,
-                     background_image_filepath: Path,
-                     volume_name: str,
-                     applescript: Path) -> None:
-    """
-    Create DMG with all app bundles
-
-    Will take care configuring background, signing all binaries and app bundles
-    and notarizing the DMG.
-    """
-
-    print('Running all routines to create final DMG')
-
-    writable_dmg_filepath = get_writable_dmg_filepath(dmg_filepath)
-    mount_directory = get_mount_directory_for_volume_name(volume_name)
-
-    # Make sure volume is not mounted.
-    # If it is mounted it will prevent removing old DMG files and could make
-    # it so app bundles are copied to the wrong place.
-    eject_volume(volume_name)
-
-    create_dmg_image(app_bundles, writable_dmg_filepath, volume_name)
-
-    mount_readwrite_dmg(writable_dmg_filepath)
-
-    # Run codesign first, prior to copying amything else.
-    #
-    # This allows to recurs into the content of bundles without worrying about
-    # possible interfereice of Application symlink.
-    codesign_app_bundles_in_dmg(mount_directory)
-
-    copy_background_if_needed(background_image_filepath, mount_directory)
-    create_applications_link(mount_directory)
-    run_applescript(applescript, volume_name, app_bundles,
-                    background_image_filepath)
-
-    print('Ejecting read-write DMG image...')
-    eject_volume(volume_name)
-
-    compress_dmg(writable_dmg_filepath, dmg_filepath)
-    writable_dmg_filepath.unlink()
-
-    codesign_and_notarize_dmg(dmg_filepath)
-
-
-def ensure_dmg_extension(filepath: Path) -> Path:
-    """
-    Make sure given file have .dmg extension
-    """
-
-    if filepath.suffix != '.dmg':
-        return filepath.with_suffix(f'{filepath.suffix}.dmg')
-    return filepath
-
-
-def get_dmg_filepath(requested_name: Path, app_bundles: List[Path]) -> Path:
-    """
-    Get full file path for the final DMG image
-
-    Will use the provided one when possible, otherwise will deduct it from
-    app bundles.
-
-    If the name is deducted, the DMG is stored in the current directory.
-    """
-
-    if requested_name:
-        return ensure_dmg_extension(requested_name.absolute())
-
-    # TODO(sergey): This is not necessarily the main one.
-    main_bundle = app_bundles[0]
-    # Strip .app from the name
-    return Path(main_bundle.name[:-4] + '.dmg').absolute()
-
-
-def get_background_image(requested_background_image: Path) -> Path:
-    """
-    Get effective filepath for the background image
-    """
-
-    if requested_background_image:
-        return requested_background_image.absolute()
-
-    return DARWIN_DIRECTORY / 'background.tif'
-
-
-def get_applescript(requested_applescript: Path) -> Path:
-    """
-    Get effective filepath for the applescript
-    """
-
-    if requested_applescript:
-        return requested_applescript.absolute()
-
-    return DARWIN_DIRECTORY / 'blender.applescript'
-
-
-def get_volume_name_from_dmg_filepath(dmg_filepath: Path) -> str:
-    """
-    Deduct volume name from the DMG path
-
-    Will use first part of the DMG file name prior to dash.
-    """
-
-    tokens = dmg_filepath.stem.split('-')
-    words = tokens[0].split()
-
-    return ' '.join(word.capitalize() for word in words)
-
-
-def get_volume_name(requested_volume_name: str,
-                    dmg_filepath: Path) -> str:
-    """
-    Get effective name for DMG volume
-    """
-
-    if requested_volume_name:
-        return requested_volume_name
-
-    return get_volume_name_from_dmg_filepath(dmg_filepath)
-
-
-def main():
-    parser = create_argument_parser()
-    args = parser.parse_args()
-
-    # Get normalized input parameters.
-    source_dir = args.source_dir.absolute()
-    background_image_filepath = get_background_image(args.background_image)
-    applescript = get_applescript(args.applescript)
-
-    app_bundles = collect_and_log_app_bundles(source_dir)
-    if not app_bundles:
-        return
-
-    dmg_filepath = get_dmg_filepath(args.dmg, app_bundles)
-    volume_name = get_volume_name(args.volume_name, dmg_filepath)
-
-    print(f'Will produce DMG "{dmg_filepath.name}" (without quotes)')
-
-    create_final_dmg(app_bundles,
-                     dmg_filepath,
-                     background_image_filepath,
-                     volume_name,
-                     applescript)
-
-
-if __name__ == "__main__":
-    main()

build_files/buildbot/slave_codesign.cmake

@@ -40,5 +40,5 @@ execute_process(
 )
 
 if(NOT exit_code EQUAL "0")
-    message(FATAL_ERROR "Non-zero exit code of codesign tool")
+    message( FATAL_ERROR "Non-zero exit code of codesign tool")
 endif()

build_files/buildbot/slave_codesign.py

@@ -45,7 +45,7 @@ def create_argument_parser():
 def main():
     parser = create_argument_parser()
     args = parser.parse_args()
-    path_to_sign = args.path_to_sign.absolute()
+    path_to_sign = args.path_to_sign
 
     if sys.platform == 'win32':
         # When WIX packed is used to generate .msi on Windows the CPack will

build_files/buildbot/slave_compile.py

@@ -103,7 +103,7 @@ def cmake_build(builder):
     if builder.platform == 'win':
         command = ['cmake', '--build', '.', '--target', 'install', '--config', 'Release']
     else:
-        command = ['make', '-s', '-j16', 'install']
+        command = ['make', '-s', '-j2', 'install']
 
     print("CMake build:")
     buildbot_utils.call(builder.command_prefix + command)

build_files/buildbot/slave_pack.py

@@ -109,15 +109,14 @@ def pack_mac(builder):
     package_filepath = os.path.join(builder.build_dir, package_filename)
 
     release_dir = os.path.join(builder.blender_dir, 'release', 'darwin')
-    buildbot_dir = os.path.join(builder.blender_dir, 'build_files', 'buildbot')
-    bundle_script = os.path.join(buildbot_dir, 'slave_bundle_dmg.py')
+    bundle_sh = os.path.join(release_dir, 'bundle.sh')
 
-    command = [bundle_script]
+    command = [bundle_sh]
+    command += ['--source', builder.install_dir]
     command += ['--dmg', package_filepath]
     if info.is_development_build:
         background_image = os.path.join(release_dir, 'buildbot', 'background.tif')
         command += ['--background-image', background_image]
-    command += [builder.install_dir]
     buildbot_utils.call(command)
 
     create_buildbot_upload_zip(builder, [(package_filepath, package_filename)])
@@ -161,6 +160,8 @@ def pack_linux(builder):
     blender_executable = os.path.join(builder.install_dir, 'blender')
 
     info = buildbot_utils.VersionInfo(builder)
+    blender_glibc = builder.name.split('_')[1]
+    blender_arch = 'x86_64'
 
     # Strip all unused symbols from the binaries
     print("Stripping binaries...")
@@ -171,7 +172,7 @@ def pack_linux(builder):
     buildbot_utils.call(builder.command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
 
     # Construct package name
-    platform_name = 'linux64'
+    platform_name = 'linux-' + blender_glibc + '-' + blender_arch
     package_name = get_package_name(builder, platform_name)
     package_filename = package_name + ".tar.xz"
 

build_files/cmake/Modules/FindAlembic.cmake

@@ -27,6 +27,9 @@ ENDIF()
 
 SET(_alembic_SEARCH_DIRS
   ${ALEMBIC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/alembic
 )
 

build_files/cmake/Modules/FindAudaspace.cmake

@@ -17,6 +17,9 @@ ENDIF()
 
 SET(_audaspace_SEARCH_DIRS
   ${AUDASPACE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 # Use pkg-config to get hints about paths

build_files/cmake/Modules/FindBlosc.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_blosc_SEARCH_DIRS
   ${BLOSC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/blosc
 )
 

build_files/cmake/Modules/FindEigen3.cmake

@@ -25,6 +25,9 @@ ENDIF()
 
 SET(_eigen3_SEARCH_DIRS
   ${EIGEN3_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(EIGEN3_INCLUDE_DIR

build_files/cmake/Modules/FindEmbree.cmake

@@ -29,6 +29,10 @@ ENDIF()
 
 SET(_embree_SEARCH_DIRS
   ${EMBREE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/embree
   /opt/lib/embree
 )
 

build_files/cmake/Modules/FindFftw3.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_fftw3_SEARCH_DIRS
   ${FFTW3_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(FFTW3_INCLUDE_DIR

build_files/cmake/Modules/FindGLEW.cmake

@@ -28,6 +28,7 @@ ENDIF()
 
 SET(_glew_SEARCH_DIRS
   ${GLEW_ROOT_DIR}
+  /usr/local
 )
 
 FIND_PATH(GLEW_INCLUDE_DIR

build_files/cmake/Modules/FindGflags.cmake

@@ -444,6 +444,7 @@ if(NOT GFLAGS_FOUND)
     /opt/local/var/macports/software # Mac OS X.
     /opt/local/include
     /usr/include
+    /sw/include # Fink
     /opt/lib/gflags/include)
 
   list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
@@ -456,6 +457,7 @@ if(NOT GFLAGS_FOUND)
     /usr/local/homebrew/lib # Mac OS X.
     /opt/local/lib
     /usr/lib
+    /sw/lib # Fink
     /opt/lib/gflags/lib)
   list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
     gflags/lib # Windows (for C:/Program Files prefix).

build_files/cmake/Modules/FindGlog.cmake

@@ -128,6 +128,7 @@ list(APPEND GLOG_CHECK_INCLUDE_DIRS
   /opt/local/var/macports/software # Mac OS X.
   /opt/local/include
   /usr/include
+  /sw/include # Fink
   /opt/lib/glog/include)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_PATH_SUFFIXES
@@ -142,6 +143,7 @@ list(APPEND GLOG_CHECK_LIBRARY_DIRS
   /usr/local/homebrew/lib # Mac OS X.
   /opt/local/lib
   /usr/lib
+  /sw/lib # Fink
   /opt/lib/gflags/lib)
 # Windows (for C:/Program Files prefix).
 list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES

build_files/cmake/Modules/FindHDF5.cmake

@@ -26,6 +26,9 @@ ENDIF()
 
 SET(_hdf5_SEARCH_DIRS
   ${HDF5_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/hdf5
 )
 

build_files/cmake/Modules/FindIcuLinux.cmake

@@ -32,6 +32,9 @@ endif()
 
 SET(_icu_SEARCH_DIRS
   ${ICU_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 # We don't need includes, only libs to link against...

build_files/cmake/Modules/FindJack.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_jack_SEARCH_DIRS
   ${JACK_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(JACK_INCLUDE_DIR

build_files/cmake/Modules/FindJeMalloc.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_jemalloc_SEARCH_DIRS
   ${JEMALLOC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/jemalloc
 )
 

build_files/cmake/Modules/FindLZO.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_lzo_SEARCH_DIRS
   ${LZO_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(LZO_INCLUDE_DIR lzo/lzo1x.h

build_files/cmake/Modules/FindOpenCOLLADA.cmake

@@ -62,6 +62,9 @@ SET(_opencollada_FIND_STATIC_COMPONENTS
 
 SET(_opencollada_SEARCH_DIRS
   ${OPENCOLLADA_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/opencollada
 )
 

build_files/cmake/Modules/FindOpenColorIO.cmake

@@ -35,6 +35,9 @@ SET(_opencolorio_FIND_COMPONENTS
 
 SET(_opencolorio_SEARCH_DIRS
   ${OPENCOLORIO_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/ocio
 )
 

build_files/cmake/Modules/FindOpenEXR.cmake

@@ -47,6 +47,9 @@ SET(_openexr_FIND_COMPONENTS
 
 SET(_openexr_SEARCH_DIRS
   ${OPENEXR_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/openexr
 )
 

build_files/cmake/Modules/FindOpenGLES.cmake

@@ -17,6 +17,7 @@ ENDIF()
 
 SET(_opengles_SEARCH_DIRS
   ${OPENGLES_ROOT_DIR}
+  /usr/local
 )
 
 FIND_PATH(OPENGLES_INCLUDE_DIR

build_files/cmake/Modules/FindOpenImageDenoise.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_openimagedenoise_SEARCH_DIRS
   ${OPENIMAGEDENOISE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/openimagedenoise
 )
 

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -31,6 +31,9 @@ ENDIF()
 
 SET(_openimageio_SEARCH_DIRS
   ${OPENIMAGEIO_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/oiio
 )
 

build_files/cmake/Modules/FindOpenJPEG.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_openjpeg_SEARCH_DIRS
   ${OPENJPEG_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(OPENJPEG_INCLUDE_DIR

build_files/cmake/Modules/FindOpenShadingLanguage.cmake

@@ -35,6 +35,9 @@ SET(_osl_FIND_COMPONENTS
 
 SET(_osl_SEARCH_DIRS
   ${OSL_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/osl
 )
 
@@ -66,22 +69,6 @@ FIND_PROGRAM(OSL_COMPILER oslc
              HINTS ${_osl_SEARCH_DIRS}
              PATH_SUFFIXES bin)
 
-get_filename_component(OSL_SHADER_HINT ${OSL_COMPILER} DIRECTORY)
-get_filename_component(OSL_SHADER_HINT ${OSL_SHADER_DIR}/../ ABSOLUTE)
-
-FIND_PATH(OSL_SHADER_DIR
-  NAMES
-    stdosl.h
-  HINTS
-    ${OSL_ROOT_DIR}
-    ${OSL_SHADER_HINT}
-    $ENV{OSLHOME}
-    /usr/share/OSL/
-    /usr/include/OSL/
-  PATH_SUFFIXES
-    shaders
-)
-
 # handle the QUIETLY and REQUIRED arguments and set OSL_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)

build_files/cmake/Modules/FindOpenSubdiv.cmake

@@ -34,6 +34,9 @@ SET(_opensubdiv_FIND_COMPONENTS
 
 SET(_opensubdiv_SEARCH_DIRS
   ${OPENSUBDIV_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/opensubdiv
   /opt/lib/osd # install_deps.sh
 )

build_files/cmake/Modules/FindOpenVDB.cmake

@@ -29,6 +29,10 @@ ENDIF()
 
 SET(_openvdb_SEARCH_DIRS
   ${OPENVDB_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/openvdb
   /opt/lib/openvdb
 )
 

build_files/cmake/Modules/FindOptiX.cmake

@@ -26,6 +26,9 @@ ENDIF()
 SET(_optix_SEARCH_DIRS
   ${OPTIX_ROOT_DIR}
   "$ENV{PROGRAMDATA}/NVIDIA Corporation/OptiX SDK 7.0.0"
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(OPTIX_INCLUDE_DIR

build_files/cmake/Modules/FindPCRE.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_pcre_SEARCH_DIRS
   ${PCRE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(PCRE_INCLUDE_DIR pcre.h

build_files/cmake/Modules/FindPugiXML.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_pugixml_SEARCH_DIRS
   ${PUGIXML_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/oiio
 )
 

build_files/cmake/Modules/FindPythonLibsUnix.cmake

@@ -71,6 +71,7 @@ STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 SET(_python_SEARCH_DIRS
   ${PYTHON_ROOT_DIR}
   "$ENV{HOME}/py${_PYTHON_VERSION_NO_DOTS}"
+  "/opt/py${_PYTHON_VERSION_NO_DOTS}"
   "/opt/lib/python-${PYTHON_VERSION}"
 )
 

build_files/cmake/Modules/FindSDL2.cmake

@@ -28,6 +28,12 @@ ENDIF()
 
 SET(_sdl2_SEARCH_DIRS
   ${SDL2_ROOT_DIR}
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(SDL2_INCLUDE_DIR

build_files/cmake/Modules/FindSndFile.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_sndfile_SEARCH_DIRS
   ${LIBSNDFILE_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h

build_files/cmake/Modules/FindSpacenav.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_spacenav_SEARCH_DIRS
   ${SPACENAV_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(SPACENAV_INCLUDE_DIR

build_files/cmake/Modules/FindTBB.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_tbb_SEARCH_DIRS
   ${TBB_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/tbb
 )
 

build_files/cmake/Modules/FindUSD.cmake

@@ -1,73 +0,0 @@
-# - Find Universal Scene Description (USD) library
-# Find the native USD includes and libraries
-# This module defines
-#  USD_INCLUDE_DIRS, where to find USD headers, Set when
-#                        USD_INCLUDE_DIR is found.
-#  USD_LIBRARIES, libraries to link against to use USD.
-#  USD_ROOT_DIR, The base directory to search for USD.
-#                    This can also be an environment variable.
-#  USD_FOUND, If false, do not try to use USD.
-#
-
-#=============================================================================
-# Copyright 2019 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If USD_ROOT_DIR was defined in the environment, use it.
-IF(NOT USD_ROOT_DIR AND NOT $ENV{USD_ROOT_DIR} STREQUAL "")
-  SET(USD_ROOT_DIR $ENV{USD_ROOT_DIR})
-ENDIF()
-
-SET(_usd_SEARCH_DIRS
-  ${USD_ROOT_DIR}
-  /opt/lib/usd
-)
-
-FIND_PATH(USD_INCLUDE_DIR
-  NAMES
-    pxr/usd/usd/api.h
-  HINTS
-    ${_usd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-  DOC "Universal Scene Description (USD) header files"
-)
-
-FIND_LIBRARY(USD_LIBRARY
-  NAMES
-    usd_m usd_ms
-  HINTS
-    ${_usd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib lib/static
-  DOC "Universal Scene Description (USD) monolithic library"
-)
-
-IF(${USD_LIBRARY_NOTFOUND})
-  set(USD_FOUND FALSE)
-ELSE()
-  # handle the QUIETLY and REQUIRED arguments and set USD_FOUND to TRUE if
-  # all listed variables are TRUE
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(USD DEFAULT_MSG USD_LIBRARY USD_INCLUDE_DIR)
-
-  IF(USD_FOUND)
-    get_filename_component(USD_LIBRARY_DIR ${USD_LIBRARY} DIRECTORY)
-    SET(USD_INCLUDE_DIRS ${USD_INCLUDE_DIR})
-    set(USD_LIBRARIES ${USD_LIBRARY})
-  ENDIF(USD_FOUND)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  USD_INCLUDE_DIR
-  USD_LIBRARY_DIR
-)
-
-UNSET(_usd_SEARCH_DIRS)

build_files/cmake/Modules/FindXML2.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_xml2_SEARCH_DIRS
   ${XML2_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
 )
 
 FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h

build_files/cmake/Modules/FindXR-OpenXR-SDK.cmake

@@ -1,73 +0,0 @@
-# - Find OpenXR-SDK libraries
-# Find the native OpenXR-SDK includes and libraries
-#
-# Note that there is a distinction between the OpenXR standard and the SDK. The
-# latter provides utilities to use the standard but is not part of it. Most
-# importantly, it contains C headers and a loader library, which manages
-# dynamic linking to OpenXR runtimes like Monado, Windows Mixed Reality or
-# Oculus. See the repository for more details:
-# https://github.com/KhronosGroup/OpenXR-SDK
-#
-# This module defines
-#  XR_OPENXR_SDK_INCLUDE_DIRS, where to find OpenXR-SDK headers, Set when
-#                           XR_OPENXR_SDK_INCLUDE_DIR is found.
-#  XR_OPENXR_SDK_LIBRARIES, libraries to link against to use OpenXR.
-#  XR_OPENXR_SDK_ROOT_DIR, the base directory to search for OpenXR-SDK.
-#                        This can also be an environment variable.
-#  XR_OPENXR_SDK_FOUND, if false, do not try to use OpenXR-SDK.
-#
-# also defined, but not for general use are
-#  XR_OPENXR_SDK_LOADER_LIBRARY, where to find the OpenXR-SDK loader library.
-
-#=============================================================================
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If XR_OPENXR_SDK_ROOT_DIR was defined in the environment, use it.
-IF(NOT XR_OPENXR_SDK_ROOT_DIR AND NOT $ENV{XR_OPENXR_SDK_ROOT_DIR} STREQUAL "")
-  SET(XR_OPENXR_SDK_ROOT_DIR $ENV{XR_OPENXR_SDK_ROOT_DIR})
-ENDIF()
-
-SET(_xr_openxr_sdk_SEARCH_DIRS
-  ${XR_OPENXR_SDK_ROOT_DIR}
-  /opt/lib/xr-openxr-sdk
-)
-
-FIND_PATH(XR_OPENXR_SDK_INCLUDE_DIR
-  NAMES
-    openxr/openxr.h
-  HINTS
-    ${_xr_openxr_sdk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(XR_OPENXR_SDK_LOADER_LIBRARY
-  NAMES
-    openxr_loader
-  HINTS
-    ${_xr_openxr_sdk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set XR_OPENXR_SDK_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(XR_OPENXR_SDK DEFAULT_MSG
-    XR_OPENXR_SDK_LOADER_LIBRARY XR_OPENXR_SDK_INCLUDE_DIR)
-
-IF(XR_OPENXR_SDK_FOUND)
-  SET(XR_OPENXR_SDK_LIBRARIES ${XR_OPENXR_SDK_LOADER_LIBRARY})
-  SET(XR_OPENXR_SDK_INCLUDE_DIRS ${XR_OPENXR_SDK_INCLUDE_DIR})
-ENDIF(XR_OPENXR_SDK_FOUND)
-
-MARK_AS_ADVANCED(
-  XR_OPENXR_SDK_INCLUDE_DIR
-  XR_OPENXR_SDK_LOADER_LIBRARY
-)

build_files/cmake/Modules/GTestTesting.cmake

@@ -34,23 +34,13 @@ macro(BLENDER_SRC_GTEST_EX)
       ${CMAKE_SOURCE_DIR}/extern/gmock/include
     )
     unset(_current_include_directories)
-    if(WIN32)
-      set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest")
-    endif()
-    add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST})
+
+    add_executable(${TARGET_NAME} ${ARG_SRC})
     target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}")
     target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}")
-    target_link_libraries(${TARGET_NAME} ${ARG_EXTRA_LIBS} ${PLATFORM_LINKLIBS})
-    if(WITH_TBB)
-      # Force TBB libraries to be in front of MKL (part of OpenImageDenoise), so
-      # that it is initialized before MKL and static library initialization order
-      # issues are avoided.
-      target_link_libraries(${TARGET_NAME} ${TBB_LIBRARIES})
-      if(WITH_OPENIMAGEDENOISE)
-        target_link_libraries(${TARGET_NAME} ${OPENIMAGEDENOISE_LIBRARIES})
-      endif()
-    endif()
     target_link_libraries(${TARGET_NAME}
+                          ${ARG_EXTRA_LIBS}
+                          ${PLATFORM_LINKLIBS}
                           bf_testing_main
                           bf_intern_eigen
                           bf_intern_guardedalloc
@@ -63,9 +53,6 @@ macro(BLENDER_SRC_GTEST_EX)
     if(WITH_OPENMP_STATIC)
       target_link_libraries(${TARGET_NAME} ${OpenMP_LIBRARIES})
     endif()
-    if(UNIX AND NOT APPLE)
-      target_link_libraries(${TARGET_NAME} bf_intern_libc_compat)
-    endif()
 
     get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
     if(GENERATOR_IS_MULTI_CONFIG)
@@ -88,9 +75,6 @@ macro(BLENDER_SRC_GTEST_EX)
       # that we can't fix.
       set_tests_properties(${TARGET_NAME} PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0)
     endif()
-    if(WIN32)
-      unset(MANIFEST)
-    endif()
     unset(TEST_INC)
     unset(TEST_INC_SYS)
     unset(TARGET_NAME)

build_files/cmake/clang_array_check.py

@@ -33,7 +33,7 @@ defs_precalc = {
     "glColor3ubv": {0: 3},
     "glColor4ubv": {0: 4},
 
-    "glColor3usv": {0: 3},
+    "glColor4usv": {0: 3},
     "glColor4usv": {0: 4},
 
     "glColor3fv": {0: 3},

build_files/cmake/config/blender_developer.cmake

@@ -13,9 +13,6 @@ set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS  OFF CACHE BOOL "" FORCE)
 set(WITH_PYTHON_SAFETY                ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
-if(WIN32)
-  set(WITH_WINDOWS_BUNDLE_CRT         OFF CACHE BOOL "" FORCE)
-endif()
 
 # This may have issues with C++ initialization order, needs to be tested
 # on all platforms to be sure this is safe to enable.