From befd9488dcc66e87af35581ab885025fca8025ac Mon Sep 17 00:00:00 2001 From: John Haddon Date: Wed, 13 Oct 2021 10:11:01 +0100 Subject: [PATCH 1/4] Bump version to 4.0.0 --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index dcf52018e9..6b751180c3 100755 --- 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 From 95e9333a7fd1bd3f87845fbd9f82ee0f18be457e Mon Sep 17 00:00:00 2001 From: John Haddon Date: Wed, 13 Oct 2021 10:09:31 +0100 Subject: [PATCH 2/4] OpenVDB : Update to version 8.1.0 --- Changes.md | 5 +++++ OpenVDB/config.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 9a7af60b15..5a313b9a8b 100644 --- a/Changes.md +++ b/Changes.md @@ -1,3 +1,8 @@ +4.x.x +----- + +- OpenVDB : Updated to version 8.1.0. + 3.1.0 ----- diff --git a/OpenVDB/config.py b/OpenVDB/config.py index faa37a1e8d..ac04190045 100644 --- 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" ], From b98e12cac3f08a11d19dee5aaf7782b829d519eb Mon Sep 17 00:00:00 2001 From: John Haddon Date: Wed, 13 Oct 2021 10:10:39 +0100 Subject: [PATCH 3/4] TBB : Update to version 2020.2. --- Changes.md | 1 + TBB/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 5a313b9a8b..67ca4930f4 100644 --- a/Changes.md +++ b/Changes.md @@ -2,6 +2,7 @@ ----- - OpenVDB : Updated to version 8.1.0. +- TBB : Updated to version 2020.2. 3.1.0 ----- diff --git a/TBB/config.py b/TBB/config.py index df3e6eb138..3f3a3ed0cb 100644 --- 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" ], From b83829acdcdfee1b487a06f2021ccb18c9944a28 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Wed, 13 Oct 2021 10:12:00 +0100 Subject: [PATCH 4/4] Qt/PySide : Update to version 5.15.2 Building this required the addition of a few additional system packages on my local machine - these might also be required in the Docker container managed by GafferHQ/build : - xcb-util-renderutil-devel - xcb-util-wm-devel - xcb-util-devel - xcb-util-image-devel - xcb-util-keysyms-devel --- Changes.md | 2 ++ PySide/config.py | 4 ++-- PySide/patches/clang10Compatibility.patch | 11 ----------- Qt/config.py | 6 +++--- 4 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 PySide/patches/clang10Compatibility.patch diff --git a/Changes.md b/Changes.md index 67ca4930f4..980d047746 100644 --- a/Changes.md +++ b/Changes.md @@ -3,6 +3,8 @@ - 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/PySide/config.py b/PySide/config.py index 739949139e..9b0134f8b4 100644 --- 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 deleted file mode 100644 index 25b6a11299..0000000000 --- a/PySide/patches/clang10Compatibility.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -+++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -@@ -274,7 +274,7 @@ static QString findClangBuiltInIncludesDir() - for (const QFileInfo &fi : versionDirs) { - const QString fileName = fi.fileName(); - if (fileName.at(0).isDigit()) { -- const QVersionNumber versionNumber = QVersionNumber::fromString(fileName.at(0)); -+ const QVersionNumber versionNumber = QVersionNumber::fromString(fileName); - if (!versionNumber.isNull() && versionNumber > lastVersionNumber) { - candidate = fi.absoluteFilePath(); - lastVersionNumber = versionNumber; diff --git a/Qt/config.py b/Qt/config.py index 33089cde99..ba7ecc251e 100644 --- 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", },