Merge branch '3_maintenance'

GafferHQ · Oct 12, 2021 · cd6e9c4 · cd6e9c4
2 parents 3c12b9f + 5ec7c02
commit cd6e9c4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,10 @@
+3.1.0
+-----
+
+- Python : Fixed `ssl` module for Python 3.
+- USD : Enabled OpenVDB support.
+- Cortex : updated to version 10.2.2.0.
+
 3.0.0
 -----
 

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

diff --git a/OpenSSL/config.py b/OpenSSL/config.py
@@ -14,7 +14,7 @@
 
 		"./config --prefix={buildDir} -fPIC",
 		"make -j {jobs}",
-		"make install",
+		"make install_sw",
 
 	],
 

diff --git a/Python/config.py b/Python/config.py
@@ -25,7 +25,7 @@
 
 	"commands" : [
 
-		"./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi",
+		"./configure --prefix={buildDir} {libraryType} --enable-unicode=ucs4 --with-ensurepip=install --with-system-ffi --with-openssl={buildDir}",
 		"make -j {jobs}",
 		"make install",
 

diff --git a/USD/config.py b/USD/config.py
@@ -10,7 +10,7 @@
 
 	"license" : "LICENSE.txt",
 
-	"dependencies" : [ "Boost", "Python", "OpenImageIO", "TBB", "Alembic", "OpenSubdiv", "PyOpenGL", "GLEW", "PySide" ],
+	"dependencies" : [ "Boost", "Python", "OpenImageIO", "TBB", "Alembic", "OpenSubdiv", "OpenVDB", "PyOpenGL", "GLEW", "PySide" ],
 
 	"environment" : {
 
@@ -32,6 +32,7 @@
 			" -D CMAKE_PREFIX_PATH={buildDir}"
 			" -D Boost_NO_SYSTEM_PATHS=TRUE"
 			" -D Boost_NO_BOOST_CMAKE=TRUE"
+			" -D PXR_ENABLE_OPENVDB_SUPPORT=TRUE"
 			" -D PXR_ENABLE_PTEX_SUPPORT=FALSE"
 			" -D PXR_BUILD_TESTS=FALSE"
 			" -D PXR_BUILD_ALEMBIC_PLUGIN=TRUE"

diff --git a/build.py b/build.py
@@ -14,7 +14,7 @@
 import tarfile
 import zipfile
 
-__version = "3.0.0"
+__version = "3.1.0"
 
 """
 Config file format
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     	"downloads" : [
-    		"https://github.com/ImageEngine/cortex/archive/refs/tags/10.2.0.0.tar.gz"
+    		"https://github.com/ImageEngine/cortex/archive/refs/tags/10.2.2.0.tar.gz"
     	],
@@ Expand Down @@