Merge pull request #267 from murraystevenson/9updates

Prep for dependencies `9.0.0 alpha 1`
GafferHQ · Aug 27, 2024 · 98e51e4 · 98e51e4
2 parents 057bfbb + a86a7ef
commit 98e51e4
Show file tree

Hide file tree

Showing 20 changed files with 125 additions and 65 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -87,6 +87,9 @@ jobs:
         # Remove CommandLineTools so there is no potential for conflict with
         # our selected Xcode version.
         sudo rm -rf /Library/Developer/CommandLineTools
+        sudo rm -rf /Applications/Python\ 3.10
+        # Remove little-cms2 to prevent our LibRaw builds from finding it.
+        brew uninstall --ignore-dependencies little-cms2
       shell: bash
       if: runner.os == 'macOS'
 

diff --git a/BitstreamVera/config.py b/BitstreamVera/config.py
@@ -2,7 +2,8 @@
 
 	"downloads" : [
 
-		"https://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz"
+		"https://mirrors.dotsrc.org/gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz"
+
 	],
 
 	"url" : "https://www.gnome.org/fonts",

diff --git a/Changes.md b/Changes.md
@@ -3,7 +3,20 @@
 
 - CI : Added CI for linux-gcc11 and macos-arm64 (Xcode 14.3.1).
 - LLVM : Updated to version 15.0.7.
-- Cycles : Disabled CUDA binary generation for Kepler and Maxwell architecture GPUs.
+- Cortex : Updated to version 10.5.9.1.
+- Cycles :
+  - Updated to version 4.2.0.
+  - Disabled CUDA binary generation for Kepler and Maxwell architecture GPUs.
+- Embree : Updated to version 4.3.2.
+- Imath : Updated to version 3.1.11.
+- LibJPEG-Turbo : Updated to version 3.0.3.
+- MaterialX : Updated to version 1.38.10.
+- OpenImageIO : Updated to version 2.5.10.1.
+- OpenPGL : Updated to version 0.6.0.
+- PySide : Updated to version 5.15.14.
+- Qt : Updated to version 5.15.14.
+- USD : Updated to version 24.08.
+- Zstandard : Added version 1.5.0.
 
 8.x.x (relative to 8.0.1)
 -----

diff --git a/Cortex/config.py b/Cortex/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/ImageEngine/cortex/archive/refs/tags/10.5.7.1.tar.gz"
+		"https://github.com/ImageEngine/cortex/archive/refs/tags/10.5.9.1.tar.gz"
 
 	],
 

diff --git a/Cycles/config.py b/Cycles/config.py
@@ -2,18 +2,25 @@
 
 	"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", "Zstandard" ],
 
 	"commands" : [
 
+		# The Cycles archive includes empty folders under `./lib`
+		# named `{platform}_{architecture}`. The existence of a folder
+		# in lib matching the current platform and architecture causes
+		# the build to only look for dependencies within it, so we
+		# remove them to allow dependencies to be found in `{buildDir}`.
+		"rmdir ./lib/*",
+
 		"mkdir build",
 		"cd build &&"
 			" cmake"

diff --git a/Cycles/patches/cudaBinaries.patch b/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)
+@@ -122,7 +122,7 @@
 
-   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)
+   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 "\
diff --git a/Cycles/patches/iorDefaults.patch b/Cycles/patches/iorDefaults.patch
diff --git a/Embree/config.py b/Embree/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/embree/embree/archive/v4.3.0.tar.gz"
+		"https://github.com/embree/embree/archive/v4.3.2.tar.gz"
 
 	],
 

diff --git a/Imath/config.py b/Imath/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.9.tar.gz"
+		"https://github.com/AcademySoftwareFoundation/Imath/archive/refs/tags/v3.1.11.tar.gz"
 
 	],
 

diff --git a/Jinja2/config.py b/Jinja2/config.py
@@ -23,8 +23,24 @@
 
 	"commands" : [
 
-		"{buildDir}/bin/python setup.py install --root / --prefix {buildDir}",
+		"{buildDir}/bin/python setup.py install --root / --prefix {buildDir} {extraArgs}",
 
 	],
 
+	"variables" : {
+
+		"extraArgs" : "",
+
+	},
+
+	"platform:macos" : {
+
+		"variables" : {
+
+			"extraArgs" : "--install-lib {pythonLibDir}/python{pythonVersion}/site-packages",
+
+		}
+
+	},
+
 }
diff --git a/LibJPEG-Turbo/config.py b/LibJPEG-Turbo/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://download.sourceforge.net/project/libjpeg-turbo/1.5.2/libjpeg-turbo-1.5.2.tar.gz",
+		"https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz",
 
 	],
 
@@ -11,9 +11,13 @@
 
 	"commands" : [
 
-		"./configure --prefix={buildDir}",
-		"make -j {jobs}",
-		"make install",
+		"mkdir build",
+		"cd build &&"
+			" cmake"
+			" -D CMAKE_INSTALL_PREFIX={buildDir}"
+			" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
+			" ..",
+		"cd build && make -j {jobs} && make install",
 
 	],
 

diff --git a/MarkupSafe/config.py b/MarkupSafe/config.py
@@ -23,8 +23,24 @@
 
 	"commands" : [
 
-		"{buildDir}/bin/python setup.py install --root / --prefix {buildDir}",
+		"{buildDir}/bin/python setup.py install --root / --prefix {buildDir} {extraArgs}",
 
 	],
 
+	"variables" : {
+
+		"extraArgs" : "",
+
+	},
+
+	"platform:macos" : {
+
+		"variables" : {
+
+			"extraArgs" : "--install-lib {pythonLibDir}/python{pythonVersion}/site-packages",
+
+		}
+
+	},
+
 }
diff --git a/MaterialX/config.py b/MaterialX/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/AcademySoftwareFoundation/MaterialX/archive/refs/tags/v1.38.8.tar.gz",
+		"https://github.com/AcademySoftwareFoundation/MaterialX/archive/refs/tags/v1.38.10.tar.gz",
 
 	],
 

diff --git a/MaterialX/patches/cxxStandard.patch b/MaterialX/patches/cxxStandard.patch
diff --git a/OpenImageIO/config.py b/OpenImageIO/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.5.8.0.tar.gz"
+		"https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.5.10.1.tar.gz"
 
 	],
 
@@ -30,6 +30,7 @@
 			" -D CMAKE_PREFIX_PATH={buildDir}"
 			" -D USE_FFMPEG=NO"
 			" -D USE_GIF=0"
+			" -D USE_OPENVDB=NO"
 			" -D USE_PYTHON=YES"
 			" -D USE_EXTERNAL_PUGIXML=YES"
 			" -D BUILD_MISSING_FMT=NO"

diff --git a/OpenPGL/config.py b/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"
 
 	],
 

diff --git a/PySide/config.py b/PySide/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.12-src/pyside-setup-opensource-src-5.15.12.tar.xz"
+		"https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.14-src/pyside-setup-opensource-src-5.15.14.tar.xz"
 
 	],
 

diff --git a/Qt/config.py b/Qt/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://download.qt.io/official_releases/qt/5.15/5.15.12/single/qt-everywhere-opensource-src-5.15.12.tar.xz"
+		"https://download.qt.io/official_releases/qt/5.15/5.15.14/single/qt-everywhere-opensource-src-5.15.14.tar.xz"
 
 	],
 

diff --git a/USD/config.py b/USD/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/PixarAnimationStudios/USD/archive/refs/tags/v23.11.tar.gz"
+		"https://github.com/PixarAnimationStudios/USD/archive/refs/tags/v24.08.tar.gz"
 
 	],
 

diff --git a/Zstandard/config.py b/Zstandard/config.py
@@ -0,0 +1,37 @@
+{
+
+	"downloads" : [
+
+		"https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz"
+
+	],
+
+	"url" : "http://zstd.net",
+
+	"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_BUILD_TYPE=Release"
+			" -D ZSTD_BUILD_PROGRAMS=OFF"
+			" -D ZSTD_BUILD_TESTS=OFF"
+			" ../build/cmake",
+
+		"cd gafferBuild && make -j {jobs} && make install",
+
+	],
+
+	"manifest" : [
+
+		"include/zstd.h",
+		"lib/libzstd{sharedLibraryExtension}*"
+
+	],
+
+}