From bed1d2ea76cf92990602b03abc092b3881c34a2c Mon Sep 17 00:00:00 2001 From: John Haddon Date: Tue, 8 Jun 2021 15:21:49 +0100 Subject: [PATCH 1/6] OSL : Update to 1.11.14.1 --- OpenShadingLanguage/config.py | 2 +- .../patches/visibilityMap.patch | 60 ------------------- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 OpenShadingLanguage/patches/visibilityMap.patch diff --git a/OpenShadingLanguage/config.py b/OpenShadingLanguage/config.py index 090b9dc4b3..f133f5c60c 100644 --- a/OpenShadingLanguage/config.py +++ b/OpenShadingLanguage/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.11.11.0.tar.gz" + "https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.11.14.1.tar.gz" ], diff --git a/OpenShadingLanguage/patches/visibilityMap.patch b/OpenShadingLanguage/patches/visibilityMap.patch deleted file mode 100644 index 8358c435ed..0000000000 --- a/OpenShadingLanguage/patches/visibilityMap.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit de8c484d88d533c0fe8568908b92da05c29c8cb9 -Author: Larry Gritz -Date: Wed Feb 17 23:40:38 2021 -0800 - - Typo prevented visibility hiding from happening properly - - Signed-off-by: Larry Gritz - -diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt -index 2d646d96..7cb34287 100644 ---- a/src/liboslcomp/CMakeLists.txt -+++ b/src/liboslcomp/CMakeLists.txt -@@ -54,7 +54,7 @@ set_target_properties (${local_lib} - ) - - --if (VISIBILITY_COMMAND) -+if (VISIBILITY_MAP_COMMAND) - set_property (TARGET ${local_lib} - APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND}) - endif () -diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt -index 52c444fd..5349da6c 100644 ---- a/src/liboslexec/CMakeLists.txt -+++ b/src/liboslexec/CMakeLists.txt -@@ -248,7 +248,7 @@ set_target_properties (${local_lib} - OUTPUT_NAME ${local_lib}${OSL_LIBNAME_SUFFIX} - ) - --if (VISIBILITY_COMMAND) -+if (VISIBILITY_MAP_COMMAND) - set_property (TARGET ${local_lib} - APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND}) - endif () -diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt -index 1143e59b..0419d1ae 100644 ---- a/src/liboslquery/CMakeLists.txt -+++ b/src/liboslquery/CMakeLists.txt -@@ -31,7 +31,7 @@ set_target_properties (${local_lib} - POSITION_INDEPENDENT_CODE ON - ) - --if (VISIBILITY_COMMAND) -+if (VISIBILITY_MAP_COMMAND) - set_property (TARGET ${local_lib} - APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND}) - endif () -diff --git a/src/osl.imageio/CMakeLists.txt b/src/osl.imageio/CMakeLists.txt -index 48d21345..70214bc3 100644 ---- a/src/osl.imageio/CMakeLists.txt -+++ b/src/osl.imageio/CMakeLists.txt -@@ -44,7 +44,7 @@ macro (add_oiio_plugin) - PROPERTIES - PREFIX "" - FOLDER "Plugins") -- if (VISIBILITY_COMMAND) -+ if (VISIBILITY_MAP_COMMAND) - set_property (TARGET ${_plugin_name} - APPEND PROPERTY LINK_FLAGS ${VISIBILITY_MAP_COMMAND}) - endif () From c1cc67955ef4127800d76e5173ec2a66315c21f0 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Tue, 8 Jun 2021 15:22:46 +0100 Subject: [PATCH 2/6] OpenImageIO : Update to 2.2.15.1 --- Changes.md | 6 ++++++ OpenImageIO/config.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index d6d1638cda..72eefde4ba 100644 --- a/Changes.md +++ b/Changes.md @@ -1,3 +1,9 @@ +3.0.0 alpha x +------------- + +- OpenShadingLanguage : Updated to version 1.11.14.1. +- OpenImageIO : Updated to version 2.2.15.1. + 3.0.0 alpha 2 ------------- diff --git a/OpenImageIO/config.py b/OpenImageIO/config.py index fe5a1ee053..8ac1c2c6d3 100644 --- a/OpenImageIO/config.py +++ b/OpenImageIO/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://github.com/OpenImageIO/oiio/archive/Release-2.2.11.1.tar.gz" + "https://github.com/OpenImageIO/oiio/archive/Release-2.2.15.1.tar.gz" ], From 96a3a04075524f90d9c79a08129f23bd405bb851 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Tue, 8 Jun 2021 15:24:36 +0100 Subject: [PATCH 3/6] Cortex : Updated to 10.2.0.0 --- Changes.md | 1 + Cortex/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 72eefde4ba..6316d58d18 100644 --- a/Changes.md +++ b/Changes.md @@ -3,6 +3,7 @@ - OpenShadingLanguage : Updated to version 1.11.14.1. - OpenImageIO : Updated to version 2.2.15.1. +- Cortex : Updated to version 10.2.0.0. 3.0.0 alpha 2 ------------- diff --git a/Cortex/config.py b/Cortex/config.py index 895de8046d..3889bca7e5 100644 --- a/Cortex/config.py +++ b/Cortex/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://github.com/ImageEngine/cortex/archive/10.1.4.0.tar.gz" + "https://github.com/ImageEngine/cortex/archive/refs/tags/10.2.0.0.tar.gz" ], From e0389b8c75ee1213f90fd74986383e1ef1b15b2a Mon Sep 17 00:00:00 2001 From: John Haddon Date: Mon, 14 Jun 2021 12:21:06 +0100 Subject: [PATCH 4/6] USD : Update to version 21.05 Fixes #181 --- Changes.md | 1 + USD/config.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 6316d58d18..7fc89fcb2f 100644 --- a/Changes.md +++ b/Changes.md @@ -4,6 +4,7 @@ - OpenShadingLanguage : Updated to version 1.11.14.1. - OpenImageIO : Updated to version 2.2.15.1. - Cortex : Updated to version 10.2.0.0. +- USD : Updated to version 21.05. 3.0.0 alpha 2 ------------- diff --git a/USD/config.py b/USD/config.py index ee99a4dd37..a268a420c9 100644 --- a/USD/config.py +++ b/USD/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://github.com/PixarAnimationStudios/USD/archive/v20.11.tar.gz" + "https://github.com/PixarAnimationStudios/USD/archive/refs/tags/v21.05.tar.gz" ], From 46bf29e0b04b1e75586c47be75d10dd7f3e3d22e Mon Sep 17 00:00:00 2001 From: John Haddon Date: Mon, 14 Jun 2021 12:36:54 +0100 Subject: [PATCH 5/6] Changes.md : Prep for 3.0.0 release --- Changes.md | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Changes.md b/Changes.md index 7fc89fcb2f..0d7d02e3a4 100644 --- a/Changes.md +++ b/Changes.md @@ -1,24 +1,14 @@ -3.0.0 alpha x -------------- +3.0.0 +----- - OpenShadingLanguage : Updated to version 1.11.14.1. - OpenImageIO : Updated to version 2.2.15.1. - Cortex : Updated to version 10.2.0.0. - USD : Updated to version 21.05. - -3.0.0 alpha 2 -------------- - - OpenVDB : Updated to version 7.2.2. - -3.0.0 alpha 1 -------------- - - PyBind11 : Added version 2.6.2. - PugiXML : Added version 1.11. -- OpenImageIO : Updated to version 2.2.11.1. - LibTIFF : Updated to version 4.1.0. -- OpenShadingLanguage : Updated to version 1.11.11.0. - LLVM : Updated to version 10.0.1. 2.2.0 From 8427b660dc43661d0a36571314309b1531bce54c Mon Sep 17 00:00:00 2001 From: John Haddon Date: Mon, 14 Jun 2021 13:03:50 +0100 Subject: [PATCH 6/6] Boost : Fix download URL See https://www.boost.org/users/news/boost_has_moved_downloads_to_jfr.html --- Boost/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Boost/config.py b/Boost/config.py index 5d69593c8c..a8ff743098 100644 --- a/Boost/config.py +++ b/Boost/config.py @@ -2,7 +2,7 @@ "downloads" : [ - "https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz" + "https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.gz" ],