Update Cycles to 4.2.0

Cycles/config.py

@@ -2,15 +2,15 @@
 
 	"downloads" : [
 
-		"https://github.com/blender/cycles/archive/refs/tags/v4.0.2.tar.gz",
+		"https://github.com/blender/cycles/archive/refs/tags/v4.2.0.tar.gz",
 
 	],
 
 	"url" : "https://www.cycles-renderer.org/",
 
 	"license" : "LICENSE",
 
-	"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL", "LibWebP" ],
+	"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL", "LibWebP", "ZStd" ],
 
 	"commands" : [
 
@@ -28,6 +28,7 @@
 			" -D WITH_CYCLES_DEVICE_OPTIX=ON"
 			" -D WITH_CYCLES_HYDRA_RENDER_DELEGATE=OFF"
 			" -D CMAKE_POSITION_INDEPENDENT_CODE=ON"
+			" -D WITH_CYCLES_DEPENDENCIES=OFF"
 			" -D WITH_CYCLES_USD=OFF"
 			" ..",
 		"cd build && make install -j {jobs} VERBOSE=1",

Cycles/patches/cudaBinaries.patch

@@ -1,10 +1,11 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -120,7 +120,7 @@
-   mark_as_advanced(WITH_CYCLES_DEVICE_CUDA)
-
-   option(WITH_CYCLES_CUDA_BINARIES     "Build Cycles NVIDIA CUDA binaries" OFF)
--  set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 sm_89 compute_75 CACHE STRING "CUDA architectures to build binaries for")
-+  set(CYCLES_CUDA_BINARIES_ARCH sm_60 sm_61 sm_70 sm_75 sm_86 sm_89 compute_75 CACHE STRING "CUDA architectures to build binaries for")
-   option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
-   option(WITH_CUDA_DYNLOAD             "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON)
+@@ -122,7 +122,7 @@ if(NOT APPLE AND NOT (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64"))
+
+   option(WITH_CYCLES_CUDA_BINARIES "Build Cycles NVIDIA CUDA binaries" OFF)
+   set(CYCLES_CUDA_BINARIES_ARCH
+-    sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 sm_89 compute_75
++    sm_60 sm_61 sm_70 sm_75 sm_86 sm_89 compute_75
+     CACHE STRING "CUDA architectures to build binaries for"
+   )
+   option(WITH_CYCLES_CUDA_BUILD_SERIAL "\

Cycles/patches/precompiledLibsToggle.patch

@@ -0,0 +1,36 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,6 +92,9 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
+ ###########################################################################
+ # Options.
+
++# Use precompiled dependencies
++option(WITH_CYCLES_DEPENDENCIES     "Use precompiled dependencies" ON)
++
+ # Library dependencies
+ option(WITH_CYCLES_ALEMBIC          "Build with Alembic procedural support" ON)
+ option(WITH_CYCLES_EMBREE           "Build with Embree support" ON)
+--- a/src/cmake/external_libs.cmake
++++ b/src/cmake/external_libs.cmake
+@@ -67,7 +67,7 @@ else()
+   endif()
+ endif()
+
+-if(EXISTS ${_cycles_lib_dir})
++if(EXISTS ${_cycles_lib_dir} AND WITH_CYCLES_DEPENDENCIES)
+   message(STATUS "Using precompiled libraries at ${_cycles_lib_dir}")
+
+   _set_default(ALEMBIC_ROOT_DIR "${_cycles_lib_dir}/alembic")
+@@ -118,7 +118,11 @@ if(EXISTS ${_cycles_lib_dir})
+   # Ignore system libraries
+   set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
+ else()
+-  message(STATUS "No precompiled libraries found at ${_cycles_lib_dir}")
++  if(NOT WITH_CYCLES_DEPENDENCIES)
++    message(STATUS "Not using precompiled libraries")
++  else()
++    message(STATUS "No precompiled libraries found at ${_cycles_lib_dir}")
++  endif()
+   message(STATUS "Attempting to use system libraries instead")
+   unset(_cycles_lib_dir)
+ endif()

Embree/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/embree/embree/archive/v4.3.0.tar.gz"
+		"https://github.com/RenderKit/embree/archive/refs/tags/v4.3.2.tar.gz"
 
 	],
 

OpenPGL/config.py

@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/v0.5.0.tar.gz"
+		"https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/v0.6.0.tar.gz"
 
 	],
 

ZStd/config.py

@@ -0,0 +1,46 @@
+{
+
+	"downloads" : [
+
+		"https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz"
+
+	],
+
+	"url" : "https://github.com/facebook/zstd",
+
+	"license" : "LICENSE",
+
+	"commands" : [
+
+		"mkdir gafferBuild",
+		"cd gafferBuild &&"
+			" cmake"
+			" -D CMAKE_CXX_STANDARD={c++Standard}"
+			" -D CMAKE_INSTALL_PREFIX={buildDir}"
+			" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
+			" -D CMAKE_PREFIX_PATH={buildDir}"
+			" -D ZSTD_BUILD_PROGRAMS=OFF"
+			" -D ZSTD_BUILD_SHARED=OFF"
+			" -D ZSTD_BUILD_STATIC=ON"
+			" -D ZSTD_BUILD_TESTS=OFF"
+			" -D ZSTD_LEGACY_SUPPORT=OFF"
+			" -D ZSTD_LZ4_SUPPORT=OFF"
+			" -D ZSTD_LZMA_SUPPORT=OFF"
+			" -D ZSTD_MULTITHREAD_SUPPORT=ON"
+			" -D ZSTD_PROGRAMS_LINK_SHARED=OFF"
+			" -D ZSTD_USE_STATIC_RUNTIME=OFF"
+			" -D ZSTD_ZLIB_SUPPORT=OFF"
+			" ../build/cmake",
+		"cd gafferBuild && make install -j {jobs}",
+
+	],
+
+	"manifest" : [
+
+		"include/zdict*",
+		"include/zstd*",
+		"lib/*zstd*",
+
+	],
+
+}