From fc18bf2674ca70479c14f97390d8798f9f1e96a4 Mon Sep 17 00:00:00 2001 From: Jean-Francois Panisset Date: Tue, 2 Sep 2025 02:50:10 +0000 Subject: [PATCH] 2024.4 - 2025.3 - 2026.1 releases 2024.4 / 2025.3 / 2026.1 releases to address issues in the previous set of releases encountered by consumer ASWF projects. This highlights the need for more thorough testing of non-Conan project builds in the resulting ci-XXXX images. - All releases - Update rawtoaces 1.1-rc3 to 1.1.0 (no code changes) - Re-enable building LLVM's compiler-rt, OSL uses it for address space sanitization for instance - Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it - Fix libiconv download URLs (ftpmirror.gnu.org is prefered to ftp.gnu.org) - OCIO Conan package correctly declares its link time dependencies, consumer packages no longer need to know about its dependencies - Correctly handle OIIO Conan package name being different than its CMake target name - Remove LibRaw-devel from base image, it would confuse CMake for some ASWF project versions which would end up mixing up the newer LibRaw in /usr/local and the older system installed one. - Fix some discrepancies in the Conan 2 environment files (we really need a single source of truth for all version information). - Build command line utilities and Ax when building OpenVDB package, and install missing dependencies for these additional components (glfw3). Ax cannot be built with OpenVDB older than 12.1.0 since this is where support for clang/llvm 16 or newer shows up. - 2024.4 - revert to MaterialX 1.39.1 which is complatible with USD 24.08 - install MaterialX CMake files in expected location - Fix up OCIO CMake dependencies - Allow OIIO to find OCIO, libraw and openj2k dependencies - Backport OSL fix for serialized CUDA build - 2025.3 - install MaterialX CMake files in expected location - Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer - 2026.1 - Update IMath from 3.2.0 to 3.2.1 - Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer Signed-off-by: Jean-Francois Panisset --- CHANGELOG.md | 33 +- ci-base/README.md | 12 +- ci-baseqt/README.md | 12 +- ci-common/README.md | 12 +- ci-materialx/README.md | 6 +- ci-ocio/README.md | 6 +- ci-oiio/README.md | 6 +- ci-opencue/README.md | 6 +- ci-openexr/README.md | 6 +- ci-openfx/README.md | 6 +- ci-openrv/README.md | 6 +- ci-openvdb/Dockerfile | 5 + ci-openvdb/README.md | 39 +- ci-openvdb/image.yaml | 1 + ci-osl/README.md | 16 +- ci-otio/README.md | 14 +- ci-rawtoaces/README.md | 6 +- ci-usd/README.md | 14 +- ci-vfxall/README.md | 24 +- packages/common/Dockerfile | 2 +- packages/conan/recipes/eigen/conanfile.py | 19 +- packages/conan/recipes/imath/conandata.yml | 6 + packages/conan/recipes/imath/conanfile.py | 18 +- packages/conan/recipes/ocio/conandata.yml | 3 + packages/conan/recipes/ocio/conanfile.py | 14 + ....3.2-0002-cmake-deps-for-shared-libs.patch | 13 + ...001-fix-cmake-source-dir-and-targets.patch | 1 - packages/conan/recipes/oiio/conanfile.py | 3 + .../recipes/oiio/test_package/CMakeLists.txt | 4 +- .../conan/recipes/onetbb/2020.x/conandata.yml | 8 +- packages/conan/recipes/onetbb/config.yml | 4 +- packages/conan/recipes/openvdb/conandata.yml | 3 + packages/conan/recipes/openvdb/conanfile.py | 21 +- packages/conan/settings/profiles_aswf/vfx2024 | 2 +- packages/conan/settings/profiles_aswf/vfx2026 | 2 +- .../settings/profiles_aswftesting/vfx2024 | 2 +- .../settings/profiles_aswftesting/vfx2026 | 2 +- python/aswfdocker/data/versions.yaml | 810 +++++++++--------- scripts/common/install_yumpackages.sh | 58 +- scripts/vfx/build_materialx.sh | 3 +- scripts/vfx/build_rawtoaces.sh | 2 +- 41 files changed, 674 insertions(+), 556 deletions(-) create mode 100644 packages/conan/recipes/ocio/patches/2.3.2-0002-cmake-deps-for-shared-libs.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0cec58..b58bacf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,38 @@ All notable changes to this project will be documented in this file. -# 2025-07-XX +# 2025-09-01 + +2024.4 / 2025.3 / 2026.1 releases to address issues in the previous set of releases encountered by consumer +ASWF projects. This highlights the need for more thorough testing of non-Conan project builds in the +resulting ci-XXXX images. + +- All releases + - Update rawtoaces 1.1-rc3 to 1.1.0 (no code changes) + - Re-enable building LLVM's compiler-rt, OSL uses it for address space sanitization for instance + - Force Eigen3 CMake files to be generated and installed to allow rawtoaces to find it + - Fix libiconv download URLs (ftpmirror.gnu.org is prefered to ftp.gnu.org) + - OCIO Conan package correctly declares its link time dependencies, consumer packages no longer need to know + about its dependencies + - Correctly handle OIIO Conan package name being different than its CMake target name + - Remove LibRaw-devel from base image, it would confuse CMake for some ASWF project versions which would end up mixing up the newer LibRaw in /usr/local and the older system installed one. + - Fix some discrepancies in the Conan 2 environment files (we really need a single + source of truth for all version information). + - Build command line utilities and Ax when building OpenVDB package, and install missing dependencies for these additional components (glfw3). Ax cannot be built with OpenVDB older than 12.1.0 since this is where support for clang/llvm 16 or newer shows up. +- 2024.4 + - revert to MaterialX 1.39.1 which is complatible with USD 24.08 + - install MaterialX CMake files in expected location + - Fix up OCIO CMake dependencies + - Allow OIIO to find OCIO, libraw and openj2k dependencies + - Backport OSL fix for serialized CUDA build +- 2025.3 + - install MaterialX CMake files in expected location + - Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer +- 2026.1 + - Update IMath from 3.2.0 to 3.2.1 + - Update OpenVDB from 12.0.1 to 12.1.0 to allow Ax to build with llvm 16 or newer + +# 2025-08-14 These releases no longer build / install libraries in `/usr/local/lib64`, they revert back to the default `/usr/local/lib` supported by most packages and Conan recipes. This should hopefully be transparent to diff --git a/ci-base/README.md b/ci-base/README.md index 36d19d72..09e7a33e 100644 --- a/ci-base/README.md +++ b/ci-base/README.md @@ -67,7 +67,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.9.15 * glew-2.1.0 * glfw-3.1.2 @@ -82,7 +82,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.10.11 * glew-2.1.0 * glfw-3.1.2 @@ -92,7 +92,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-base:2024.3](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2024.3) +## [aswf/ci-base:2024.4](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2024.4) Contains: * b2-5.2.1 @@ -109,7 +109,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* onetbb-2020_u3 +* onetbb-2020.3 * zlib-1.3.1 * zstd-1.5.6 * cpython-3.11.13 @@ -123,7 +123,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-base:2025.2](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.2) +## [aswf/ci-base:2025.3](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.3) Contains: * b2-5.2.1 @@ -154,7 +154,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-base:2026.0](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2026.0) +## [aswf/ci-base:2026.1](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2026.1) Contains: * b2-5.3.2 diff --git a/ci-baseqt/README.md b/ci-baseqt/README.md index a727e956..3e7b07e6 100644 --- a/ci-baseqt/README.md +++ b/ci-baseqt/README.md @@ -73,7 +73,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.9.15 * glew-2.1.0 * glfw-3.1.2 @@ -90,7 +90,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.10.11 * glew-2.1.0 * glfw-3.1.2 @@ -102,7 +102,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-baseqt:2024.3](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2024.3) +## [aswf/ci-baseqt:2024.4](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2024.4) Contains: * b2-5.2.1 @@ -119,7 +119,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* onetbb-2020_u3 +* onetbb-2020.3 * zlib-1.3.1 * zstd-1.5.6 * cpython-3.11.13 @@ -137,7 +137,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-baseqt:2025.2](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.2) +## [aswf/ci-baseqt:2025.3](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.3) Contains: * b2-5.2.1 @@ -172,7 +172,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-baseqt:2026.0](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2026.0) +## [aswf/ci-baseqt:2026.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2026.1) Contains: * b2-5.3.2 diff --git a/ci-common/README.md b/ci-common/README.md index a3d1c4f3..50559246 100644 --- a/ci-common/README.md +++ b/ci-common/README.md @@ -173,7 +173,7 @@ Contains: * sonar-4.8.0.2856 * conan-1.58.0 -## [aswf/ci-common:4-clang16.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang16.3) +## [aswf/ci-common:4-clang16.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang16.4) Contains: * clang-16.0.6 @@ -188,7 +188,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:4-clang17.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang17.3) +## [aswf/ci-common:4-clang17.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang17.4) Contains: * clang-17.0.6 @@ -203,7 +203,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:5-clang18.2](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.2) +## [aswf/ci-common:5-clang18.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.3) Contains: * clang-18.1.8 @@ -218,7 +218,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:5-clang19.2](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.2) +## [aswf/ci-common:5-clang19.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.3) Contains: * clang-19.1.7 @@ -233,7 +233,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:6-clang19.0](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang19.0) +## [aswf/ci-common:6-clang19.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang19.1) Contains: * clang-19.1.7 @@ -248,7 +248,7 @@ Contains: * conan-2.18.1 * yq-4.45.4 -## [aswf/ci-common:6-clang20.0](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang20.0) +## [aswf/ci-common:6-clang20.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang20.1) Contains: * clang-20.1.7 diff --git a/ci-materialx/README.md b/ci-materialx/README.md index 45f383cd..98bfca12 100644 --- a/ci-materialx/README.md +++ b/ci-materialx/README.md @@ -32,21 +32,21 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-materialx:2024.3](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2024.3) +## [aswf/ci-materialx:2024.4](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2024.4) Contains: * materialx-1.39.1 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-materialx:2025.2](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.2) +## [aswf/ci-materialx:2025.3](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.3) Contains: * materialx-1.39.3 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-materialx:2026.0](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2026.0) +## [aswf/ci-materialx:2026.1](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2026.1) Contains: * materialx-1.39.3 diff --git a/ci-ocio/README.md b/ci-ocio/README.md index a80c1af4..12a867f5 100644 --- a/ci-ocio/README.md +++ b/ci-ocio/README.md @@ -53,21 +53,21 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-ocio:2024.3](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2024.3) +## [aswf/ci-ocio:2024.4](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2024.4) Contains: * ocio-2.3.2 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-ocio:2025.2](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.2) +## [aswf/ci-ocio:2025.3](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.3) Contains: * ocio-2.4.2 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-ocio:2026.0](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2026.0) +## [aswf/ci-ocio:2026.1](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2026.1) Contains: * ocio-2.4.2 diff --git a/ci-oiio/README.md b/ci-oiio/README.md index 5741a52a..9044b640 100644 --- a/ci-oiio/README.md +++ b/ci-oiio/README.md @@ -18,21 +18,21 @@ Warning: this image does *not* contain OpenImageIO itself as it is used to *buil [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-oiio/Dockerfile) -## [aswf/ci-oiio:2024.3](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2024.3) +## [aswf/ci-oiio:2024.4](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2024.4) Contains: * oiio-2.5.19.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-oiio:2025.2](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.2) +## [aswf/ci-oiio:2025.3](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.3) Contains: * oiio-3.0.9.1 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-oiio:2026.0](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2026.0) +## [aswf/ci-oiio:2026.1](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2026.1) Contains: * oiio-3.0.9.1 diff --git a/ci-opencue/README.md b/ci-opencue/README.md index 41411eb0..557d1ebd 100644 --- a/ci-opencue/README.md +++ b/ci-opencue/README.md @@ -53,21 +53,21 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-opencue:2024.3](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2024.3) +## [aswf/ci-opencue:2024.4](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2024.4) Contains: * cpython-3.11.13 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-opencue:2025.2](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.2) +## [aswf/ci-opencue:2025.3](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.3) Contains: * cpython-3.11.13 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-opencue:2026.0](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2026.0) +## [aswf/ci-opencue:2026.1](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2026.1) Contains: * cpython-3.13.3 diff --git a/ci-openexr/README.md b/ci-openexr/README.md index 780220fd..2c055e46 100644 --- a/ci-openexr/README.md +++ b/ci-openexr/README.md @@ -53,21 +53,21 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-openexr:2024.3](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2024.3) +## [aswf/ci-openexr:2024.4](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2024.4) Contains: * openexr-3.2.4 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openexr:2025.2](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.2) +## [aswf/ci-openexr:2025.3](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.3) Contains: * openexr-3.3.5 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openexr:2026.0](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2026.0) +## [aswf/ci-openexr:2026.1](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2026.1) Contains: * openexr-3.4-alpha diff --git a/ci-openfx/README.md b/ci-openfx/README.md index 7aa04b20..c40cc6d8 100644 --- a/ci-openfx/README.md +++ b/ci-openfx/README.md @@ -18,21 +18,21 @@ Warning: this image does *not* contain OpenFX itself as it is used to *build* Op [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openfx/Dockerfile) -## [aswf/ci-openfx:2024.3](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2024.3) +## [aswf/ci-openfx:2024.4](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2024.4) Contains: * openfx-1.5s * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openfx:2025.2](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2025.2) +## [aswf/ci-openfx:2025.3](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2025.3) Contains: * openfx-1.5s * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openfx:2026.0](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2026.0) +## [aswf/ci-openfx:2026.1](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2026.1) Contains: * openfx-1.5s diff --git a/ci-openrv/README.md b/ci-openrv/README.md index 37237e4f..56581b05 100644 --- a/ci-openrv/README.md +++ b/ci-openrv/README.md @@ -18,7 +18,7 @@ Warning: this image does *not* contain OpenRV itself as it is used to *build* Op [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-openrv/Dockerfile) -## [aswf/ci-openrv:2024.3](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2024.3) +## [aswf/ci-openrv:2024.4](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2024.4) Contains: * cpython-3.11.13 @@ -27,7 +27,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openrv:2025.2](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.2) +## [aswf/ci-openrv:2025.3](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.3) Contains: * cpython-3.11.13 @@ -36,7 +36,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openrv:2026.0](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2026.0) +## [aswf/ci-openrv:2026.1](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2026.1) Contains: * cpython-3.13.3 diff --git a/ci-openvdb/Dockerfile b/ci-openvdb/Dockerfile index 07f01e42..26caf749 100644 --- a/ci-openvdb/Dockerfile +++ b/ci-openvdb/Dockerfile @@ -16,6 +16,7 @@ ARG ASWF_VFXPLATFORM_VERSION ARG ASWF_OPENVDB_VERSION +ARG ASWF_GTEST_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_VFXPLATFORM_VERSION @@ -37,6 +38,7 @@ ARG ASWF_CONAN_CHANNEL ARG ASWF_OPENVDB_VERSION +ARG ASWF_GTEST_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_VFXPLATFORM_VERSION @@ -56,6 +58,7 @@ LABEL com.vfxplatform.version="${ASWF_VFXPLATFORM_VERSION}" LABEL io.aswf.docker.versions.openvdb="$ASWF_OPENVDB_VERSION" +LABEL io.aswf.docker.versions.gtest="$ASWF_GTEST_VERSION" LABEL io.aswf.docker.versions.numpy="$ASWF_NUMPY_VERSION" LABEL io.aswf.docker.versions.vfxplatform="$ASWF_VFXPLATFORM_VERSION" @@ -71,6 +74,7 @@ ENV ASWF_VFXPLATFORM_VERSION=${ASWF_VFXPLATFORM_VERSION} ENV ASWF_OPENVDB_VERSION=$ASWF_OPENVDB_VERSION +ENV ASWF_GTEST_VERSION=$ASWF_GTEST_VERSION ENV ASWF_NUMPY_VERSION=$ASWF_NUMPY_VERSION ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION @@ -91,6 +95,7 @@ COPY < . [requires] openvdb/${ASWF_OPENVDB_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +gtest/${ASWF_GTEST_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} EOF ENV CONAN_HOME=${ASWF_CONAN_HOME}/.conan2 diff --git a/ci-openvdb/README.md b/ci-openvdb/README.md index 7b5497ce..422adde2 100644 --- a/ci-openvdb/README.md +++ b/ci-openvdb/README.md @@ -22,6 +22,7 @@ Warning: this image does *not* contain OpenVDB itself as it is used to *build* O Contains: * openvdb-6.2.1 +* gtest-1.8.1 * numpy-1.14 * vfxplatform-2019 @@ -29,6 +30,7 @@ Contains: Contains: * openvdb-6.2.1 +* gtest-1.8.1 * numpy-1.14 * vfxplatform-2019 @@ -36,6 +38,7 @@ Contains: Contains: * openvdb-6.2.1 +* gtest-1.8.1 * numpy-1.14 * vfxplatform-2019 @@ -43,6 +46,7 @@ Contains: Contains: * openvdb-6.2.1 +* gtest-1.8.1 * numpy-1.14 * vfxplatform-2019 @@ -50,6 +54,7 @@ Contains: Contains: * openvdb-7.1.0 +* gtest-1.10.0 * numpy-1.16 * vfxplatform-2020 @@ -57,6 +62,7 @@ Contains: Contains: * openvdb-8.0.1 +* gtest-1.11.0 * numpy-1.19 * vfxplatform-2021 @@ -64,6 +70,7 @@ Contains: Contains: * openvdb-9.1.0 +* gtest-1.11.0 * numpy-1.20 * vfxplatform-2022 @@ -71,6 +78,7 @@ Contains: Contains: * openvdb-9.1.0 +* gtest-1.11.0 * numpy-1.20 * vfxplatform-2022 @@ -78,6 +86,7 @@ Contains: Contains: * openvdb-9.1.0 +* gtest-1.11.0 * numpy-1.20 * vfxplatform-2022 @@ -85,6 +94,7 @@ Contains: Contains: * openvdb-9.1.0 +* gtest-1.11.0 * numpy-1.20 * vfxplatform-2022 @@ -92,6 +102,7 @@ Contains: Contains: * openvdb-9.1.0 +* gtest-1.11.0 * numpy-1.20 * vfxplatform-2022 @@ -99,6 +110,7 @@ Contains: Contains: * openvdb-10.0.1 +* gtest-1.11.0 * numpy-1.23.5 * vfxplatform-2023 @@ -106,48 +118,55 @@ Contains: Contains: * openvdb-10.0.1 +* gtest-1.11.0 * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-openvdb:2024-clang16.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang16.3) +## [aswf/ci-openvdb:2024-clang16.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang16.4) Contains: * openvdb-11.0.0 +* gtest-1.15.2 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openvdb:2024-clang17.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang17.3) +## [aswf/ci-openvdb:2024-clang17.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang17.4) Contains: * openvdb-11.0.0 +* gtest-1.15.2 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openvdb:2025-clang18.2](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.2) +## [aswf/ci-openvdb:2025-clang18.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.3) Contains: -* openvdb-12.0.1 +* openvdb-12.1.0 +* gtest-1.15.2 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openvdb:2025-clang19.2](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.2) +## [aswf/ci-openvdb:2025-clang19.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.3) Contains: -* openvdb-12.0.1 +* openvdb-12.1.0 +* gtest-1.15.2 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openvdb:2026-clang19.0](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang19.0) +## [aswf/ci-openvdb:2026-clang19.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang19.1) Contains: -* openvdb-12.0.1 +* openvdb-12.1.0 +* gtest-1.17.0 * numpy-2.3.2 * vfxplatform-2026 -## [aswf/ci-openvdb:2026-clang20.0](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang20.0) +## [aswf/ci-openvdb:2026-clang20.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang20.1) Contains: -* openvdb-12.0.1 +* openvdb-12.1.0 +* gtest-1.17.0 * numpy-2.3.2 * vfxplatform-2026 diff --git a/ci-openvdb/image.yaml b/ci-openvdb/image.yaml index 3303fb8b..2ee556ac 100644 --- a/ci-openvdb/image.yaml +++ b/ci-openvdb/image.yaml @@ -5,6 +5,7 @@ description: | Warning: this image does *not* contain OpenVDB itself as it is used to *build* OpenVDB! packages: - openvdb # all dependencies will be installed except openvdb itself + - gtest # used by OpenVDB CI test suite implicit_packages: - numpy - vfxplatform diff --git a/ci-osl/README.md b/ci-osl/README.md index a71586c2..44c05cf7 100644 --- a/ci-osl/README.md +++ b/ci-osl/README.md @@ -228,7 +228,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-osl:2024-clang16.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang16.3) +## [aswf/ci-osl:2024-clang16.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang16.4) Contains: * cpython-3.11.13 @@ -245,7 +245,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-osl:2024-clang17.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang17.3) +## [aswf/ci-osl:2024-clang17.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang17.4) Contains: * cpython-3.11.13 @@ -262,7 +262,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-osl:2025-clang18.2](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.2) +## [aswf/ci-osl:2025-clang18.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.3) Contains: * cpython-3.11.13 @@ -279,7 +279,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-osl:2025-clang19.2](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.2) +## [aswf/ci-osl:2025-clang19.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.3) Contains: * cpython-3.11.13 @@ -296,12 +296,12 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-osl:2026-clang19.0](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang19.0) +## [aswf/ci-osl:2026-clang19.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang19.1) Contains: * cpython-3.13.3 * fmt-11.2.0 -* imath-3.2.0 +* imath-3.2.1 * oiio-3.0.9.1 * partio-1.19.0 * pugixml-1.15 @@ -313,12 +313,12 @@ Contains: * numpy-2.3.2 * vfxplatform-2026 -## [aswf/ci-osl:2026-clang20.0](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang20.0) +## [aswf/ci-osl:2026-clang20.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang20.1) Contains: * cpython-3.13.3 * fmt-11.2.0 -* imath-3.2.0 +* imath-3.2.1 * oiio-3.0.9.1 * partio-1.19.0 * pugixml-1.15 diff --git a/ci-otio/README.md b/ci-otio/README.md index d71eef57..84c1a43d 100644 --- a/ci-otio/README.md +++ b/ci-otio/README.md @@ -77,7 +77,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.9.15 * glew-2.1.0 * glfw-3.1.2 @@ -95,7 +95,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.10.11 * glew-2.1.0 * glfw-3.1.2 @@ -108,7 +108,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-otio:2024.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2024.3) +## [aswf/ci-otio:2024.4](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2024.4) Contains: * b2-5.2.1 @@ -125,7 +125,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* onetbb-2020_u3 +* onetbb-2020.3 * zlib-1.3.1 * zstd-1.5.6 * cpython-3.11.13 @@ -143,7 +143,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-otio:2025.2](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.2) +## [aswf/ci-otio:2025.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.3) Contains: * b2-5.2.1 @@ -178,7 +178,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-otio:2026.0](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2026.0) +## [aswf/ci-otio:2026.1](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2026.1) Contains: * b2-5.3.2 @@ -209,7 +209,7 @@ Contains: * md4c-0.5.2 * qt-6.8.3 * pyside-6.8.3 -* imath-3.2.0 +* imath-3.2.1 * numpy-2.3.2 * vfxplatform-2026 diff --git a/ci-rawtoaces/README.md b/ci-rawtoaces/README.md index ed79ce83..e267669e 100644 --- a/ci-rawtoaces/README.md +++ b/ci-rawtoaces/README.md @@ -18,21 +18,21 @@ Warning: this image does *not* contain rawtoaces itself as it is used to *build* [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-rawtoaces/Dockerfile) -## [aswf/ci-rawtoaces:2024.3](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2024.3) +## [aswf/ci-rawtoaces:2024.4](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2024.4) Contains: * rawtoaces-1.1.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-rawtoaces:2025.2](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2025.2) +## [aswf/ci-rawtoaces:2025.3](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2025.3) Contains: * rawtoaces-1.1.0 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-rawtoaces:2026.0](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2026.0) +## [aswf/ci-rawtoaces:2026.1](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2026.1) Contains: * rawtoaces-1.1.0 diff --git a/ci-usd/README.md b/ci-usd/README.md index 0e12437f..bbcb0122 100644 --- a/ci-usd/README.md +++ b/ci-usd/README.md @@ -101,7 +101,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.9.15 * glew-2.1.0 * glfw-3.1.2 @@ -128,7 +128,7 @@ Contains: Contains: * cppunit-1.15.1 * gtest-1.11.0 -* onetbb-2020_u3 +* onetbb-2020.3 * cpython-3.10.11 * glew-2.1.0 * glfw-3.1.2 @@ -150,7 +150,7 @@ Contains: * hdf5-1.8.23 * vfxplatform-2023 -## [aswf/ci-usd:2024.3](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2024.3) +## [aswf/ci-usd:2024.4](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2024.4) Contains: * b2-5.2.1 @@ -167,7 +167,7 @@ Contains: * pugixml-1.14 * pystring-1.1.4 * snappy-1.1.10 -* onetbb-2020_u3 +* onetbb-2020.3 * zlib-1.3.1 * zstd-1.5.6 * cpython-3.11.13 @@ -198,7 +198,7 @@ Contains: * hdf5-1.14.6 * vfxplatform-2024 -## [aswf/ci-usd:2025.2](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.2) +## [aswf/ci-usd:2025.3](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.3) Contains: * b2-5.2.1 @@ -246,7 +246,7 @@ Contains: * hdf5-1.14.6 * vfxplatform-2025 -## [aswf/ci-usd:2026.0](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2026.0) +## [aswf/ci-usd:2026.1](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2026.1) Contains: * b2-5.3.2 @@ -278,7 +278,7 @@ Contains: * qt-6.8.3 * pyside-6.8.3 * highway-1.2.0 -* imath-3.2.0 +* imath-3.2.1 * lcms-2.17 * libultrahdr-1.4.0 * opensubdiv-3.6.1 diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md index c2a72021..078cca85 100644 --- a/ci-vfxall/README.md +++ b/ci-vfxall/README.md @@ -323,7 +323,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-vfxall:2024-clang16.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang16.3) +## [aswf/ci-vfxall:2024-clang16.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang16.4) Contains: * cppunit-1.15.1 @@ -350,7 +350,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-vfxall:2024-clang17.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang17.3) +## [aswf/ci-vfxall:2024-clang17.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang17.4) Contains: * cppunit-1.15.1 @@ -377,7 +377,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-vfxall:2025-clang18.2](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.2) +## [aswf/ci-vfxall:2025-clang18.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.3) Contains: * cppunit-1.15.1 @@ -395,7 +395,7 @@ Contains: * oiio-3.0.9.1 * ocio-2.4.2 * openfx-1.5s -* openvdb-12.0.1 +* openvdb-12.1.0 * materialx-1.39.3 * usd-25.05.01 * osl-1.14.7.0 @@ -404,7 +404,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-vfxall:2025-clang19.2](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.2) +## [aswf/ci-vfxall:2025-clang19.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.3) Contains: * cppunit-1.15.1 @@ -422,7 +422,7 @@ Contains: * oiio-3.0.9.1 * ocio-2.4.2 * openfx-1.5s -* openvdb-12.0.1 +* openvdb-12.1.0 * materialx-1.39.3 * usd-25.05.01 * osl-1.14.7.0 @@ -431,7 +431,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-vfxall:2026-clang19.0](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang19.0) +## [aswf/ci-vfxall:2026-clang19.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang19.1) Contains: * cppunit-1.15.1 @@ -444,12 +444,12 @@ Contains: * opensubdiv-3.6.1 * partio-1.19.0 * alembic-1.8.8 -* imath-3.2.0 +* imath-3.2.1 * openexr-3.4-alpha * oiio-3.0.9.1 * ocio-2.4.2 * openfx-1.5s -* openvdb-12.0.1 +* openvdb-12.1.0 * materialx-1.39.3 * usd-25.08 * osl-1.14.7.0 @@ -458,7 +458,7 @@ Contains: * numpy-2.3.2 * vfxplatform-2026 -## [aswf/ci-vfxall:2026-clang20.0](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang20.0) +## [aswf/ci-vfxall:2026-clang20.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang20.1) Contains: * cppunit-1.15.1 @@ -471,12 +471,12 @@ Contains: * opensubdiv-3.6.1 * partio-1.19.0 * alembic-1.8.8 -* imath-3.2.0 +* imath-3.2.1 * openexr-3.4-alpha * oiio-3.0.9.1 * ocio-2.4.2 * openfx-1.5s -* openvdb-12.0.1 +* openvdb-12.1.0 * materialx-1.39.3 * usd-25.08 * osl-1.14.7.0 diff --git a/packages/common/Dockerfile b/packages/common/Dockerfile index d2d100d5..18973cbc 100644 --- a/packages/common/Dockerfile +++ b/packages/common/Dockerfile @@ -107,7 +107,7 @@ RUN --mount=type=cache,sharing=private,target=/tmp/downloads \ /tmp/install_conan.sh #################### ci-conan-package-builder #################### -FROM ci-baseos-gl-conan AS ci-conan-package-builder +FROM ${ASWF_ORG}/ci-baseos-gl-conan:${CI_COMMON_VERSION} AS ci-conan-package-builder ARG ASWF_ORG ARG ASWF_CCACHE_VERSION diff --git a/packages/conan/recipes/eigen/conanfile.py b/packages/conan/recipes/eigen/conanfile.py index bc8c4d5a..70852204 100644 --- a/packages/conan/recipes/eigen/conanfile.py +++ b/packages/conan/recipes/eigen/conanfile.py @@ -5,9 +5,10 @@ # From: https://github.com/conan-io/conan-center-index/blob/5f19361f49bc31a349b383c1f95c7f79627f728a/recipes/eigen/all/conanfile.py from conan import ConanFile -from conan.tools.cmake import CMake, cmake_layout, CMakeToolchain +from conan.tools.cmake import CMake, CMakeDeps, cmake_layout, CMakeToolchain from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, rmdir import os +import re required_conan_version = ">=1.52.0" @@ -52,6 +53,9 @@ def generate(self): tc.cache_variables["EIGEN_TEST_NOQT"] = True tc.generate() + deps = CMakeDeps(self) # ASWF: CMake dependencies generator + deps.generate() + def build(self): apply_conandata_patches(self) cmake = CMake(self) @@ -66,6 +70,19 @@ def package(self): copy(self, "COPYING.*", self.source_folder, os.path.join(self.package_folder, "licenses", self.name)) rmdir(self, os.path.join(self.package_folder, "share")) + # ASWF: package CMake files even though this is a header-library + target_dir = os.path.join(self.package_folder, "lib", "cmake", "Eigen3") + copy(self, "Eigen3Config.cmake", self.build_folder, target_dir) + copy(self, "Eigen3ConfigVersion.cmake", self.build_folder, target_dir) + copy(self, "Eigen3Targets.cmake", self.build_folder, target_dir) + # ASWF: since conan install is not processing these files, bake desired path + eigen3targets = os.path.join(target_dir,"Eigen3Targets.cmake") + with open(eigen3targets, 'r') as f: + file_data = f.read() + updated_data = re.sub(r"\/opt\/conan_home\/d\/b\/eigen[0-9a-f]{13}\/b\/src","/usr/local/include/eigen3", file_data) + with open(eigen3targets, 'w') as f: + f.write(updated_data) + def package_info(self): self.cpp_info.set_property("cmake_file_name", "Eigen3") self.cpp_info.set_property("cmake_target_name", "Eigen3::Eigen") diff --git a/packages/conan/recipes/imath/conandata.yml b/packages/conan/recipes/imath/conandata.yml index eda00351..764cb520 100644 --- a/packages/conan/recipes/imath/conandata.yml +++ b/packages/conan/recipes/imath/conandata.yml @@ -5,6 +5,9 @@ # From: https://github.com/conan-io/conan-center-index/blob/cceee569179c10fa56d1fd9c3582f3371944ba59/recipes/imath/all/conandata.yml sources: + "3.2.1": + url: "https://github.com/AcademySoftwareFoundation/Imath/archive/v3.2.1.tar.gz" + sha256: "b2c8a44c3e4695b74e9644c76f5f5480767355c6f98cde58ba0e82b4ad8c63ce" "3.2.0": url: "https://github.com/AcademySoftwareFoundation/Imath/archive/v3.2.0.tar.gz" sha256: "f3c0c4210b5e6fe17d90cd7ebbe9638eea9fb458421d00eddb4d1a9d5ad47b36" @@ -24,6 +27,9 @@ sources: url: "https://github.com/AcademySoftwareFoundation/Imath/archive/v3.1.8.tar.gz" sha256: "a23a4e2160ca8ff68607a4e129e484edd1d0d13f707394d32af7aed659020803" patches: + "3.2.1": + - patch_file: "patches/3.2.0-clang-format.patch" + patch_description: "Don't add heavyweight dependency on clang-format" "3.2.0": - patch_file: "patches/3.2.0-clang-format.patch" patch_description: "Don't add heavyweight dependency on clang-format" diff --git a/packages/conan/recipes/imath/conanfile.py b/packages/conan/recipes/imath/conanfile.py index 71129fd8..40978dec 100644 --- a/packages/conan/recipes/imath/conanfile.py +++ b/packages/conan/recipes/imath/conanfile.py @@ -79,16 +79,22 @@ def build(self): apply_conandata_patches(self) # ASWF: starting with version 3.2.0, src/python/CMakeLists.txt calls: - # find_package(Boost REQUIRED COMPONENTS python) - # but our buils of boost::python bake in the python version, so we have + # find_package(Boost CONFIG REQUIRED COMPONENTS python) + # but our builds of boost::python bake in the python version, so we have # to add the suffix based on the current Python version (can't be done - # by a static patch in conandat.yml) + # by a static patch in conandata.yml) if Version(self.version) >= "3.2.0": python_version = Version(self.dependencies["cpython"].ref.version) boost_component = f"python{python_version.major}{python_version.minor}" # 'python313' - replace_in_file(self, os.path.join(self.source_folder, "src", "python", "CMakeLists.txt"), - "find_package(Boost REQUIRED COMPONENTS python)", - f"find_package(Boost REQUIRED COMPONENTS {boost_component})") + if Version(self.version) == "3.2.0": + replace_in_file(self, os.path.join(self.source_folder, "src", "python", "CMakeLists.txt"), + "find_package(Boost REQUIRED COMPONENTS python)", + f"find_package(Boost REQUIRED COMPONENTS {boost_component})") + else: + # ASWF: removing CONFIG allows find_package(Boost...) to work in our Conan environment + replace_in_file(self, os.path.join(self.source_folder, "src", "python", "CMakeLists.txt"), + "find_package(Boost CONFIG REQUIRED COMPONENTS python)", + f"find_package(Boost REQUIRED COMPONENTS {boost_component})") dirs = [ "PyImath", "PyImathNumpy", "PyImathTest" ] for cmake_file in [os.path.join(self.source_folder, "src", "python", d, "CMakeLists.txt") for d in dirs]: replace_in_file(self, cmake_file, diff --git a/packages/conan/recipes/ocio/conandata.yml b/packages/conan/recipes/ocio/conandata.yml index b293b83e..d7bd8fc0 100644 --- a/packages/conan/recipes/ocio/conandata.yml +++ b/packages/conan/recipes/ocio/conandata.yml @@ -49,6 +49,9 @@ patches: - patch_file: "patches/2.3.2-0001-fix-cmake-source-dir-and-targets.patch" patch_description: "use cci package, use PROJECT_BINARY_DIR/PROJECT_SOURCE_DIR" patch_type: "conan" + - patch_file: "patches/2.3.2-0002-cmake-deps-for-shared-libs.patch" + patch_type: "conan" + patch_description: "don't skip cmake dependencies for shared builds" - patch_file: "patches/2.3.2-0004-find-python.patch" patch_description: "We call FindPython3" patch_type: "conan" diff --git a/packages/conan/recipes/ocio/conanfile.py b/packages/conan/recipes/ocio/conanfile.py index 326d8702..12c53e78 100644 --- a/packages/conan/recipes/ocio/conanfile.py +++ b/packages/conan/recipes/ocio/conanfile.py @@ -212,3 +212,17 @@ def package_info(self): if is_msvc(self) and not self.options.shared: self.cpp_info.defines.append("OpenColorIO_SKIP_IMPORTS") + + # ASWF: declare what we link against + self.cpp_info.requires = [ + "expat::expat", + "openexr::openexr", + "imath::imath", + "yaml-cpp::yaml-cpp", + "minizip-ng::minizip-ng", + "lcms::lcms", + "cpython::cpython", + "pybind11::pybind11", + "pystring::pystring", + "glew::glew", + ] diff --git a/packages/conan/recipes/ocio/patches/2.3.2-0002-cmake-deps-for-shared-libs.patch b/packages/conan/recipes/ocio/patches/2.3.2-0002-cmake-deps-for-shared-libs.patch new file mode 100644 index 00000000..3295b145 --- /dev/null +++ b/packages/conan/recipes/ocio/patches/2.3.2-0002-cmake-deps-for-shared-libs.patch @@ -0,0 +1,13 @@ +diff --git src/cmake/Config.cmake.in src/cmake/Config.cmake.in +index 0eaec4be..e711295c 100755 +--- src/cmake/Config.cmake.in ++++ src/cmake/Config.cmake.in +@@ -2,7 +2,7 @@ + + include(CMakeFindDependencyMacro) + +-if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ ++if (NOT OFF) # NOT @BUILD_SHARED_LIBS@ + if (APPLE) + # Store the previous value of CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE. + set(_PREVIOUS_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK}) diff --git a/packages/conan/recipes/ocio/patches/2.4.2-0001-fix-cmake-source-dir-and-targets.patch b/packages/conan/recipes/ocio/patches/2.4.2-0001-fix-cmake-source-dir-and-targets.patch index a34c9ba5..11eb3638 100644 --- a/packages/conan/recipes/ocio/patches/2.4.2-0001-fix-cmake-source-dir-and-targets.patch +++ b/packages/conan/recipes/ocio/patches/2.4.2-0001-fix-cmake-source-dir-and-targets.patch @@ -68,7 +68,6 @@ index 7d2894da..1e6570b4 100755 MINIZIP::minizip-ng ) - if(OCIO_USE_SIMD AND OCIO_USE_SSE2NEON AND COMPILER_SUPPORTS_SSE_WITH_SSE2NEON) diff --git src/apps/ociobakelut/CMakeLists.txt src/apps/ociobakelut/CMakeLists.txt index 3d6e586b..f7069a1f 100755 --- src/apps/ociobakelut/CMakeLists.txt diff --git a/packages/conan/recipes/oiio/conanfile.py b/packages/conan/recipes/oiio/conanfile.py index 0184aadf..bb87de76 100644 --- a/packages/conan/recipes/oiio/conanfile.py +++ b/packages/conan/recipes/oiio/conanfile.py @@ -251,6 +251,7 @@ def _add_component(self, name): def package_info(self): self.cpp_info.set_property("cmake_file_name", "OpenImageIO") + self.cpp_info.set_property("cmake_target_name", "OpenImageIO::OpenImageIO") # ASWF: since we set name to oiio self.cpp_info.set_property("pkg_config_name", "OpenImageIO") self.cpp_info.names["cmake_find_package"] = "OpenImageIO" @@ -273,6 +274,8 @@ def package_info(self): ) if self.options.with_tbb: self.cpp_info.components["OpenImageIO_Util"].requires.append("onetbb::onetbb") + # ASWF: set correct CMake target name since our package is called oiio + self.cpp_info.components["OpenImageIO_Util"].set_property("cmake_target_name", "OpenImageIO::OpenImageIO_Util") # OpenImageIO::OpenImageIO # ASWF: _add_component() deprecated in Conan 2.0 diff --git a/packages/conan/recipes/oiio/test_package/CMakeLists.txt b/packages/conan/recipes/oiio/test_package/CMakeLists.txt index 63c056b2..42d0c654 100644 --- a/packages/conan/recipes/oiio/test_package/CMakeLists.txt +++ b/packages/conan/recipes/oiio/test_package/CMakeLists.txt @@ -12,7 +12,7 @@ find_package(fmt REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) # ASWF: when building test package, Conan package name is part of target -target_link_libraries(${PROJECT_NAME} PRIVATE oiio::OpenImageIO - oiio::OpenImageIO_Util +target_link_libraries(${PROJECT_NAME} PRIVATE OpenImageIO::OpenImageIO + OpenImageIO::OpenImageIO_Util fmt::fmt) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14) diff --git a/packages/conan/recipes/onetbb/2020.x/conandata.yml b/packages/conan/recipes/onetbb/2020.x/conandata.yml index 92e4078c..33245941 100644 --- a/packages/conan/recipes/onetbb/2020.x/conandata.yml +++ b/packages/conan/recipes/onetbb/2020.x/conandata.yml @@ -5,16 +5,16 @@ # From: https://github.com/conan-io/conan-center-index/blob/cceee569179c10fa56d1fd9c3582f3371944ba59/recipes/onetbb/2020.x/conandata.yml sources: - "2020_u3.3": + "2020.3.3": url: "https://github.com/oneapi-src/oneTBB/archive/v2020.3.3.tar.gz" sha256: "494ac15f60e91d95ed7aec04f4e1d389b8a55bffc581d0fe9116b99336401963" - "2020_u3": + "2020.3": url: "https://github.com/oneapi-src/oneTBB/archive/v2020.3.tar.gz" sha256: "ebc4f6aa47972daed1f7bf71d100ae5bf6931c2e3144cf299c8cc7d041dca2f3" - "2020_u2": + "2020.2": url: "https://github.com/oneapi-src/oneTBB/archive/v2020.2.tar.gz" sha256: "4804320e1e6cbe3a5421997b52199e3c1a3829b2ecb6489641da4b8e32faf500" - "2020_u1": + "2020.1": url: "https://github.com/oneapi-src/oneTBB/archive/v2020.1.tar.gz" sha256: "7c96a150ed22bc3c6628bc3fef9ed475c00887b26d37bca61518d76a56510971" "2020": diff --git a/packages/conan/recipes/onetbb/config.yml b/packages/conan/recipes/onetbb/config.yml index 027b665c..0434d3a5 100644 --- a/packages/conan/recipes/onetbb/config.yml +++ b/packages/conan/recipes/onetbb/config.yml @@ -25,9 +25,9 @@ versions: folder: all "2021.3.0": folder: all - "2020_u3.3": + "2020.3.3": folder: "2020.x" - "2020_u3": + "2020.3": folder: "2020.x" "2020_u2": folder: "2020.x" diff --git a/packages/conan/recipes/openvdb/conandata.yml b/packages/conan/recipes/openvdb/conandata.yml index eadd12f7..3800cbfd 100644 --- a/packages/conan/recipes/openvdb/conandata.yml +++ b/packages/conan/recipes/openvdb/conandata.yml @@ -5,6 +5,9 @@ # From: https://github.com/conan-io/conan-center-index/blob/47ec06eaf213b77bf96c28079434b4fe4446cc46/recipes/openvdb/all/conandata.yml sources: + "12.1.0": + url: "https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v12.1.0.tar.gz" + sha256: "ebb9652ad1d67274e2c85e6736cced5f04e313c5671ae1ae548f174cc76e9e64" "12.0.1": url: "https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v12.0.1.tar.gz" sha256: "a3c8724ecadabaf558b6e1bd6f1d695e93b82a7cfdf144b8551e5253340ddce0" diff --git a/packages/conan/recipes/openvdb/conanfile.py b/packages/conan/recipes/openvdb/conanfile.py index b9d39698..7384cd6c 100644 --- a/packages/conan/recipes/openvdb/conanfile.py +++ b/packages/conan/recipes/openvdb/conanfile.py @@ -37,6 +37,7 @@ class OpenVDBConan(ConanFile): "shared": [True, False], "fPIC": [True, False], "build_ax": [True, False], + "build_binaries": [True, False], # ASWF: build binaries to exercise additional dependencies "simd": [None, "SSE42", "AVX"], "use_colored_output": [True, False], "use_delayed_loading": [True, False], @@ -51,7 +52,8 @@ class OpenVDBConan(ConanFile): default_options = { "shared": False, "fPIC": True, - "build_ax": False, # ASWF: need to figure out clang/llvm dependency to enable AX + "build_ax": True, # ASWF: OpenVDB + "build_binaries": True, # ASWF: build binaries to exercise additional dependencies "simd": None, "use_colored_output": False, "use_delayed_loading": False, @@ -64,6 +66,7 @@ class OpenVDBConan(ConanFile): } options_description = { "build_ax": "Build the OpenVDB AX library.", + "build_binaries": "Build the OpenVDB standalone utilities.", # ASWF "simd": ( "Choose whether to enable SIMD compiler flags or not. " "Although not required, it is strongly recommended to enable SIMD. AVX implies SSE42." @@ -122,6 +125,9 @@ def config_options(self): if Version(self.version) < "10.0.0": del self.options.use_explicit_instantiation del self.options.use_delayed_loading + # ASWF: support to build with clang/llvm 16 or newer only in 12.1.0 or newer + if Version(self.version) < "12.1.0": + self.options.build_ax = False def configure(self): if self.options.shared: @@ -147,11 +153,8 @@ def requirements(self): if self.options.with_log4cplus: # log4cplus 2.x is not supported self.requires("log4cplus/1.2.2", transitive_headers=True) - - def build_requirements(self): - # ASWF: need clang / llvm to build AX, FIXME need better way to determine llvm version - if self.options.build_ax: - self.tool_requires(f"clang/{os.environ['ASWF_PYSIDE_CLANG_VERSION']}@{self.user}/ci_common{os.environ['CI_COMMON_VERSION']}") + if self.options.build_binaries: + self.requires("glfw/3.4") def _check_compiler_version(self): compiler = str(self.settings.compiler) @@ -179,6 +182,8 @@ def build_requirements(self): if Version(self.version) >= "10.0.0": self.tool_requires("cmake/[>=3.18 <4]") if self.options.build_ax: + # ASWF: need clang / llvm to build AX, FIXME need better way to determine llvm version + self.tool_requires(f"clang/{os.environ['ASWF_PYSIDE_CLANG_VERSION']}@{self.user}/ci_common{os.environ['CI_COMMON_VERSION']}") if self._settings_build.os == "Windows": self.tool_requires("winflexbison/2.5.25") else: @@ -195,7 +200,7 @@ def generate(self): tc = CMakeToolchain(self) tc.variables["Boost_USE_STATIC_LIBS"] = not self.dependencies["boost"].options.shared tc.variables["OPENVDB_BUILD_AX"] = self.options.build_ax - tc.variables["OPENVDB_BUILD_BINARIES"] = False + tc.variables["OPENVDB_BUILD_BINARIES"] = self.options.build_binaries # ASWF tc.variables["OPENVDB_BUILD_CORE"] = True tc.variables["OPENVDB_BUILD_DOCS"] = False tc.variables["OPENVDB_BUILD_HOUDINI_ABITESTS"] = False @@ -304,6 +309,8 @@ def package_info(self): main_component.requires.append("log4cplus::log4cplus") if self.options.use_imath_half: main_component.requires.append("imath::imath") + if self.options.build_binaries: + main_component.requires.append("glfw::glfw") # TODO: to remove in conan v2 once cmake_find_package_* generators removed self.cpp_info.names["cmake_find_package"] = "OpenVDB" diff --git a/packages/conan/settings/profiles_aswf/vfx2024 b/packages/conan/settings/profiles_aswf/vfx2024 index 63acbc92..69a4c032 100644 --- a/packages/conan/settings/profiles_aswf/vfx2024 +++ b/packages/conan/settings/profiles_aswf/vfx2024 @@ -67,7 +67,7 @@ nss/*: nss/3.101.0@aswf/vfx2024 ocio/*: ocio/2.3.2@aswf/vfx2024 ogg/*: ogg/system@aswf/vfx2024 oiio/*: oiio/2.5.19.0@aswf/vfx2024 -onetbb/*: onetbb/2020_u3@aswf/vfx2024 +onetbb/*: onetbb/2020.3@aswf/vfx2024 openal-soft/*: openal-soft/system@aswf/vfx2024 opencl-headers/*: opencl-headers/system@aswf/vfx2024 opencl-icd-loader/*: opencl-icd-loader/system@aswf/vfx2024 diff --git a/packages/conan/settings/profiles_aswf/vfx2026 b/packages/conan/settings/profiles_aswf/vfx2026 index a4084a82..add3e5c5 100644 --- a/packages/conan/settings/profiles_aswf/vfx2026 +++ b/packages/conan/settings/profiles_aswf/vfx2026 @@ -33,7 +33,7 @@ harfbuzz/*: harfbuzz/11.0.1@aswf/vfx2026 hdf5/*: hdf5/1.14.6@aswf/vfx2026 highway/*: highway/1.2.0@aswf/vfx2026 icu/*: icu/system@aswf/vfx2026 -imath/*: imath/3.2.0@aswf/vfx2026 +imath/*: imath/3.2.1@aswf/vfx2026 jasper/*: jasper/4.2.5@aswf/vfx2026 lcms/*: lcms/2.17@aswf/vfx2026 libalsa/*: libalsa/system@aswf/vfx2026 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2024 b/packages/conan/settings/profiles_aswftesting/vfx2024 index 6c822ad2..9f491dc8 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2024 +++ b/packages/conan/settings/profiles_aswftesting/vfx2024 @@ -67,7 +67,7 @@ nss/*: nss/3.101.0@aswftesting/vfx2024 ocio/*: ocio/2.3.2@aswftesting/vfx2024 oiio/*: oiio/2.5.19.0@aswftesting/vfx2024 ogg/*: ogg/system@aswftesting/vfx2024 -onetbb/*: onetbb/2020_u3@aswftesting/vfx2024 +onetbb/*: onetbb/2020.3@aswftesting/vfx2024 openal-soft/*: openal-soft/system@aswftesting/vfx2024 opencl-headers/*: opencl-headers/system@aswftesting/vfx2024 opencl-icd-loader/*: opencl-icd-loader/system@aswftesting/vfx2024 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2026 b/packages/conan/settings/profiles_aswftesting/vfx2026 index 9c8864bd..cd5c53c6 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2026 +++ b/packages/conan/settings/profiles_aswftesting/vfx2026 @@ -33,7 +33,7 @@ harfbuzz/*: harfbuzz/11.0.1@aswftesting/vfx2026 hdf5/*: hdf5/1.14.6@aswftesting/vfx2026 highway/*: highway/1.2.0@aswftesting/vfx2026 icu/*: icu/system@aswftesting/vfx2026 -imath/*: imath/3.2.0@aswftesting/vfx2026 +imath/*: imath/3.2.1@aswftesting/vfx2026 jasper/*: jasper/4.2.5@aswftesting/vfx2026 lcms/*: lcms/2.17@aswftesting/vfx2026 libalsa/*: libalsa/system@aswftesting/vfx2026 diff --git a/python/aswfdocker/data/versions.yaml b/python/aswfdocker/data/versions.yaml index fc3dc3cd..2bbe1c72 100644 --- a/python/aswfdocker/data/versions.yaml +++ b/python/aswfdocker/data/versions.yaml @@ -433,7 +433,7 @@ versions: ASWF_PYSIDE_VERSION: "5.15.2" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.9" ASWF_QT_VERSION: "5.15.2" - ASWF_ONETBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020.3" ASWF_USD_VERSION: "22.11" ASWF_VFXPLATFORM_VERSION: "2022" ASWF_CXX_STANDARD: "17" @@ -493,7 +493,7 @@ versions: ASWF_PYSIDE_CLANG_VERSION: "14.0.6" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.10" ASWF_QT_VERSION: "5.15.9" - ASWF_ONETBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020.3" ASWF_USD_VERSION: "23.05" ASWF_VFXPLATFORM_VERSION: "2023" ASWF_CXX_STANDARD: "17" @@ -615,7 +615,7 @@ versions: ASWF_PYSIDE_CLANG_VERSION: "16.0.6" ASWF_PYTHON_MAJOR_MINOR_VERSION: "3.11" ASWF_QT_VERSION: "6.5.6" - ASWF_ONETBB_VERSION: "2020_u3" + ASWF_ONETBB_VERSION: "2020.3" ASWF_VFXPLATFORM_VERSION: "2024" ASWF_CXX_STANDARD: "17" # ASWF packages @@ -762,7 +762,7 @@ versions: ASWF_OPENEXR_VERSION: "3.3.5" ASWF_OPENFX_VERSION: "1.5s" ASWF_OPENRV_VERSION: "2.1.0" - ASWF_OPENVDB_VERSION: "12.0.1" + ASWF_OPENVDB_VERSION: "12.1.0" ASWF_OSL_VERSION: "1.14.7.0" ASWF_OTIO_VERSION: "0.17.0" ASWF_RAWTOACES_VERSION: "1.1.0" @@ -890,7 +890,7 @@ versions: ASWF_VFXPLATFORM_VERSION: "2026" ASWF_CXX_STANDARD: "20" # ASWF packages - ASWF_IMATH_VERSION: "3.2.0" + ASWF_IMATH_VERSION: "3.2.1" ASWF_MATERIALX_VERSION: "1.39.3" ASWF_OCIO_CONFIGS_VERSION: "1.0_r2" ASWF_OCIO_VERSION: "2.4.2" @@ -898,7 +898,7 @@ versions: ASWF_OPENEXR_VERSION: "3.4-alpha" ASWF_OPENFX_VERSION: "1.5s" ASWF_OPENRV_VERSION: "2.1.0" - ASWF_OPENVDB_VERSION: "12.0.1" + ASWF_OPENVDB_VERSION: "12.1.0" ASWF_OSL_VERSION: "1.14.7.0" ASWF_OTIO_VERSION: "0.17.0" ASWF_RAWTOACES_VERSION: "1.1.0" @@ -927,587 +927,587 @@ ci-packages: - "2-clang14.0" - "3-clang14.2" - "3-clang15.2" - - "4-clang16.3" - - "4-clang17.3" - - "5-clang18.2" - - "5-clang19.2" - - "6-clang19.0" - - "6-clang20.0" + - "4-clang16.4" + - "4-clang17.4" + - "5-clang18.3" + - "5-clang19.3" + - "6-clang19.1" + - "6-clang20.1" ninja: - "1.3" - "2.2" - "3.2" - - "4.3" - - "5.2" - - "6.0" + - "4.4" + - "5.3" + - "6.1" cmake: - "1.3" - "2.2" - "3.2" - - "4.3" - - "5.2" - - "6.0" + - "4.4" + - "5.3" + - "6.1" cpython: - "2019.2" - "2020.2" - "2021.2" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pybind11: - "2019.0" - "2020.0" - "2021.0" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" b2: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libbacktrace: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" boost: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" cppunit: - "2019.2" - "2020.2" - "2021.1" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" glew: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" glfw: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" log4cplus: - "2019.2" - "2020.2" - "2021.1" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" gtest: - "2019.0" - "2020.0" - "2021.0" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" qt: - "2019.2" - "2020.2" - "2021.2" - "2022.0" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pyside: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" c-blosc: - "2019.2" - "2020.2" - "2021.1" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" imath: - "2019.0" - "2020.0" - "2021.0" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openexr: - "2019.2" - "2020.2" - "2021.3" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openfx: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" alembic: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ocio: - "2019.2" - "2020.2" - "2021.4" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" oiio: - "2019.2" - "2020.2" - "2021.4" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opensubdiv: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ptex: - "2019.2" - "2020.2" - "2021.1" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openrv: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openvdb: - "2019.2" - "2020.2" - "2021.3" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" usd: - "2019.3" - "2020.2" - "2021.5" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" partio: - "2019.1" - "2020.1" - "2021.2" - "2022.2" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" osl: - "2019.1" - "2020.1" - "2021.3" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" otio: - "2019.1" - "2020.1" - "2021.3" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" rawtoaces: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" materialx: - "2019.0" - "2020.0" - "2021.0" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" expat: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" md4c: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" brotli: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" cimg: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" dbus: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" double-conversion: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" aces_container: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" bzip2: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ceres-solver: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" eigen: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" fmt: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" fontconfig: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" freetype: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" gdbm: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" giflib: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" glib: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" harfbuzz: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" hdf5: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" highway: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" icu: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" jasper: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" lcms: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libalsa: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libaom-av1: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libdeflate: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libdrm: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libffi: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libiconv: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libjpeg-turbo: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libjxl: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libmp3lame: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libpng: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libraw: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libsndfile: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libsquish: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libsvtav1: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libtiff: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libultrahdr: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libvpx: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libwebp: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libxcrypt: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" libxshmfence: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" lz4: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" minizip-ng: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" mpdecimal: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" mpg123: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" nasm: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" nlohmann_json: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" nspr: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" nss: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ogg: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" onetbb: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openal-soft: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opencl-headers: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opencl-icd-loader: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opengl: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openjpeg: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openssl: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opus: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pcre2: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pugixml: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pulseaudio: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" pystring: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" snappy: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" spdlog: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" sqlite3: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" tcl: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" tk: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" tsl-robin-map: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" util-linux-libuuid: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" vorbis: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" vulkan-headers: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" vulkan-loader: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" xkbcommon: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" xorg: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" xorg-proto: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" xz_utils: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" yaml-cpp: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" zlib: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" zstd: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ci-images: common: @@ -1523,97 +1523,97 @@ ci-images: - "2-clang14.0" - "3-clang14.2" - "3-clang15.2" - - "4-clang16.3" - - "4-clang17.3" - - "5-clang18.2" - - "5-clang19.2" - - "6-clang19.0" - - "6-clang20.0" + - "4-clang16.4" + - "4-clang17.4" + - "5-clang18.3" + - "5-clang19.3" + - "6-clang19.1" + - "6-clang20.1" base: - "2019.9" - "2020.9" - "2021.6" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" baseqt: - "2019.2" - "2020.2" - "2021.3" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openexr: - "2019.8" - "2020.8" - "2021.5" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openfx: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" ocio: - "2019.9" - "2020.8" - "2021.6" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" oiio: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" opencue: - "2019.10" - "2020.10" - "2021.7" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" rawtoaces: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" usd: - "2019.9" - "2020.8" - "2021.6" - "2022.4" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" otio: - "2019.3" - "2020.3" - "2021.5" - "2022.3" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" materialx: - "2022.1" - "2023.2" - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" openrv: - - "2024.3" - - "2025.2" - - "2026.0" + - "2024.4" + - "2025.3" + - "2026.1" osl: - "2019-clang6.5" - "2019-clang7.5" @@ -1630,12 +1630,12 @@ ci-images: - "2022-clang14.1" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.3" - - "2024-clang17.3" - - "2025-clang18.2" - - "2025-clang19.2" - - "2026-clang19.0" - - "2026-clang20.0" + - "2024-clang16.4" + - "2024-clang17.4" + - "2025-clang18.3" + - "2025-clang19.3" + - "2026-clang19.1" + - "2026-clang20.1" openvdb: - "2019-clang6.8" - "2019-clang7.8" @@ -1650,12 +1650,12 @@ ci-images: - "2022-clang14.2" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.3" - - "2024-clang17.3" - - "2025-clang18.2" - - "2025-clang19.2" - - "2026-clang19.0" - - "2026-clang20.0" + - "2024-clang16.4" + - "2024-clang17.4" + - "2025-clang18.3" + - "2025-clang19.3" + - "2026-clang19.1" + - "2026-clang20.1" vfxall: - "2019-clang6.12" - "2019-clang7.12" @@ -1670,12 +1670,12 @@ ci-images: - "2022-clang14.3" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.3" - - "2024-clang17.3" - - "2025-clang18.2" - - "2025-clang19.2" - - "2026-clang19.0" - - "2026-clang20.0" + - "2024-clang16.4" + - "2024-clang17.4" + - "2025-clang18.3" + - "2025-clang19.3" + - "2026-clang19.1" + - "2026-clang20.1" groups: package: diff --git a/scripts/common/install_yumpackages.sh b/scripts/common/install_yumpackages.sh index c58fd370..29a993a1 100755 --- a/scripts/common/install_yumpackages.sh +++ b/scripts/common/install_yumpackages.sh @@ -16,9 +16,15 @@ if [ "$BASEOS_MAJORVERSION" -gt "7" ]; then if [ "$BASEOS_MAJORVERSION" -eq "8" ]; then # Rocky 8 needs PowerTools and Devel repos enabled for some of these packages dnf config-manager --set-enabled powertools + # The Rocky 8 mirror repos seem to be getting increasingly unreliable, prefer going to the source + sed -i -e 's/^mirrorlist=/#mirrorlist=/g' -e 's/#baseurl=/baseurl=/g' /etc/yum.repos.d/Rocky-{BaseOS,AppStream,Extras,PowerTools}.repo # libbluray-devel is in EPEL 9, we may no longer need devel repo then - # same for yasm-devel and libdc1393-devel - dnf config-manager --set-enabled devel + # same for yasm-devel and libdc1394-devel + # But the devel repo in Rocky 8 warns that "WARNING! FOR BUILDROOT AND KOJI USE" + # And as of late August 2025 it is causing conflicts with BaseOS / AppStream. + # So we will only enable it for specific installs. + # dnf config-manager --set-enabled devel + # Rocky 8 base image doesn't have a system Python (3), install and make default dnf -y install python3 alternatives --set python /usr/bin/python3 @@ -33,7 +39,8 @@ if [ "$BASEOS_MAJORVERSION" -gt "7" ]; then XORG_X11_XKB_UTILS_RPM="setxkbmap xkbcomp" LIBXVMC_DEVEL_RPM="" fi - dnf makecache + # Ignore any DNF metadata cached in base image + dnf clean all fi yum install --setopt=tsflags=nodocs -y \ @@ -98,7 +105,6 @@ yum install --setopt=tsflags=nodocs -y \ libpcap-devel \ libpng \ libpng-devel \ - LibRaw-devel \ libsndfile-devel \ libtheora-devel \ libtiff \ @@ -147,7 +153,6 @@ yum install --setopt=tsflags=nodocs -y \ libXScrnSaver \ libXScrnSaver-devel \ libxshmfence-devel \ - libxslt \ libxslt-devel \ libXtst-devel \ libXv-devel \ @@ -222,32 +227,6 @@ yum install --setopt=tsflags=nodocs -y \ # This is needed for Xvfb to function properly. dbus-uuidgen > /etc/machine-id -# libxslt/xsltutils.h has broken include guards in EL8, breaks PySide unity builds -if [ "$BASEOS_MAJORVERSION" -eq "8" ]; then - cat << 'EOF' | patch -p1 -diff --git a/usr/include/libxslt/xsltutil.h b/usr/include/libxslt/xsltutil.h -index 6cf74b219a1..501394deede 100644 ---- /usr/include/libxslt/xsltutils.h -+++ /usr/include/libxslt/xsltutils.h -@@ -282,7 +282,6 @@ - * Sampling precision for profiling - */ - #define XSLT_TIMESTAMP_TICS_PER_SEC 100000l --#endif - - /* - * Hooks for the debugger. -@@ -322,6 +321,7 @@ - - #ifdef __cplusplus - } -+#endif - - #endif /* __XML_XSLTUTILS_H__ */ - -EOF -fi - yum -y groupinstall "Development Tools" if [ "$BASEOS_MAJORVERSION" -gt "7" ]; then @@ -277,9 +256,7 @@ yum install -y \ frei0r-devel \ lame-devel \ libaom-devel \ - libbluray-devel \ libcaca-devel \ - libdc1394-devel \ libdeflate-devel \ libdrm-devel \ libdrm \ @@ -297,9 +274,22 @@ yum install -y \ svt-av1-devel \ xcb-util-cursor \ xcb-util-cursor-devel \ - yasm-devel \ zvbi-devel +if [ "$BASEOS_MAJORVERSION" -eq "8" ]; then + # For Rocky 8 these exist in the mostly off limits devel repo. In Rocky 9 they are in EPEL. + dnf config-manager --set-enabled devel +fi + +yum install -y \ + libbluray-devel \ + libdc1394-devel \ + yasm-devel + +if [ "$BASEOS_MAJORVERSION" -eq "8" ]; then + dnf config-manager --set-disabled devel +fi + if [ "$BASEOS_MAJORVERSION" -gt "7" ]; then # Rocky 8 has git 2.31 and OpenSSL 1.1.1k by default # Recent Qt 5.15.x wants wayland-devel diff --git a/scripts/vfx/build_materialx.sh b/scripts/vfx/build_materialx.sh index 8dca194b..d377f7c0 100755 --- a/scripts/vfx/build_materialx.sh +++ b/scripts/vfx/build_materialx.sh @@ -20,7 +20,8 @@ cd build cmake \ -DCMAKE_INSTALL_PREFIX="${ASWF_INSTALL_PREFIX}" \ -DMATERIALX_BUILD_PYTHON=ON \ - -DMATERIALX_BUILD_VIEWER=ON \ + -DMATERIALX_BUILD_VIEWER=OFF \ + -DMATERIALX_BUILD_GRAPH_EDITOR=OFF \ -DMATERIALX_BUILD_SHARED_LIBS=ON \ -DMATERIALX_BUILD_OIIO=ON \ -DMATERIALX_BUILD_OCIO=ON \ diff --git a/scripts/vfx/build_rawtoaces.sh b/scripts/vfx/build_rawtoaces.sh index b2756651..8792e5a0 100755 --- a/scripts/vfx/build_rawtoaces.sh +++ b/scripts/vfx/build_rawtoaces.sh @@ -8,7 +8,7 @@ mkdir rawtoaces cd rawtoaces if [ ! -f "$DOWNLOADS_DIR/ptex-${ASWF_RAWTOACES_VERSION}.tar.gz" ]; then - curl --location "https://github.com/AcademySoftwareFoundation/rawtoaces/archive/refs/tags/${ASWF_RAWTOACES_VERSION}.tar.gz" -o "$DOWNLOADS_DIR/rawtoaces-${ASWF_RAWTOACES_VERSION}.tar.gz" + curl --location "https://github.com/AcademySoftwareFoundation/rawtoaces/archive/refs/tags/v${ASWF_RAWTOACES_VERSION}.tar.gz" -o "$DOWNLOADS_DIR/rawtoaces-${ASWF_RAWTOACES_VERSION}.tar.gz" fi tar -zxf "$DOWNLOADS_DIR/rawtoaces-${ASWF_RAWTOACES_VERSION}.tar.gz"