Merge pull request #201 from johnhaddon/updatesFor61

Updates for Gaffer 61
GafferHQ · Nov 2, 2021 · 77d8519 · 77d8519
2 parents cd6e9c4 + b83829a
commit 77d8519
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,11 @@
+4.x.x
+-----
+
+- OpenVDB : Updated to version 8.1.0.
+- TBB : Updated to version 2020.2.
+- Qt : Updated to version 5.15.2.
+- PySide : Updated to version 5.15.2.
+
 3.1.0
 -----
 

diff --git a/OpenVDB/config.py b/OpenVDB/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/AcademySoftwareFoundation/openvdb/archive/v7.2.2.tar.gz"
+		"https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v8.1.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.12.6-src/pyside-setup-everywhere-src-5.12.6.tar.xz"
+		"https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.15.2-src/pyside-setup-opensource-src-5.15.2.tar.xz"
 
 	],
 
@@ -21,7 +21,7 @@
 
 	"commands" : [
 
-		"python setup.py --verbose-build --ignore-git --no-examples --parallel {jobs} install",
+		"python setup.py --parallel {jobs} install",
 
 	],
 

diff --git a/PySide/patches/clang10Compatibility.patch b/PySide/patches/clang10Compatibility.patch
diff --git a/Qt/config.py b/Qt/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"http://download.qt.io/official_releases/qt/5.12/5.12.10/single/qt-everywhere-src-5.12.10.tar.xz"
+		"http://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz"
 
 	],
 
@@ -21,7 +21,7 @@
 	"commands" : [
 
 		"./configure"
-			" -prefix {buildDir}"
+			" -prefix {buildDir} "
 			" -plugindir {buildDir}/qt/plugins"
 			" -release"
 			" -opensource -confirm-license"
@@ -74,7 +74,7 @@
 
 		"variables" : {
 
-			"extraArgs" : "-qt-xcb",
+			"extraArgs" : "-xcb -bundled-xcb-xinput",
 
 		},
 

diff --git a/TBB/config.py b/TBB/config.py
@@ -2,7 +2,7 @@
 
 	"downloads" : [
 
-		"https://github.com/01org/tbb/archive/2018_U5.tar.gz"
+		"https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2020.2.tar.gz"
 
 	],
 

diff --git a/build.py b/build.py
@@ -14,7 +14,7 @@
 import tarfile
 import zipfile
 
-__version = "3.1.0"
+__version = "4.0.0"
 
 """
 Config file format
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     	"downloads" : [
-    		"https://github.com/AcademySoftwareFoundation/openvdb/archive/v7.2.2.tar.gz"
+    		"https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v8.1.0.tar.gz"
     	],
@@ Expand Down @@