diff --git a/CHANGELOG.md b/CHANGELOG.md index 151ebd00..dc96b575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ All notable changes to this project will be documented in this file. +# 2025-11-08 + +2024.5 / 2025.4 / 2026.2 releases. VFX Platform 2026 release is now feature complete. + +- All releases + - Add OpenJPH 0.24.5 package + - OIIO builds against OpenJPH to handle JPEG-2000 j2c files ([#312](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/312)) + - Add build_XXX.sh in /usr/local and missing env vars to ci-XXX images to help test images ([307](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/307)) + - Separate ci-imath image include Imath dependencies but not Imath itself ([306](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/306)) +- 2024.4 + - Update OpenEXR 3.2.4 to 3.2.5 to address potential buffer overflow / use after free issues +- 2025.3 + - Update OpenEXR 3.3.5 to 3.3.6 to address potential buffer overflow / use after free issues +- 2026.2 + - Update OpenVDB 12.1.1 to 13.0.0. VFX Platform 2026 is now feature complete. + - Update OpenEXR 3.4.2 to 3.4.3 to address potential buffer overflow / user after free issues + - OpenEXR 3.4.x builds against bundled OpenJPH instead of downloading and building it by itself ([#298](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/298)) + # 2025-10-24 2024.4 / 2025.3 / 2026.1 releases to address issues in the previous set of releases encountered by consumer diff --git a/README.md b/README.md index 7931c45f..eaeb9a57 100644 --- a/README.md +++ b/README.md @@ -42,15 +42,18 @@ The `ci-packagename` image contains all the dependencies required to build `pack | | [aswf/ci-baseqt:2024](https://hub.docker.com/r/aswf/ci-baseqt/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-baseqt/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-baseqt/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-baseqt) | Based on `aswf/ci-common:4` with most VFX Platform requirements pre-installed with Qt and Pyside. | | | [aswf/ci-baseqt:2025](https://hub.docker.com/r/aswf/ci-baseqt/tags?name=2025) ![Image Version](https://img.shields.io/docker/v/aswf/ci-baseqt/2025) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-baseqt/2025) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-baseqt) | Based on `aswf/ci-common:5` with most VFX Platform requirements pre-installed with Qt and PySide. | | | [aswf/ci-baseqt:2026](https://hub.docker.com/r/aswf/ci-baseqt/tags?name=2026) ![Image Version](https://img.shields.io/docker/v/aswf/ci-baseqt/2026) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-baseqt/2026) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-baseqt) | Based on `aswf/ci-common:6` with most VFX Platform requirements pre-installed with Qt and PySide. | +| [aswf/ci-imath](https://hub.docker.com/r/aswf/ci-imath) | [aswf/ci-imath:2024](https://hub.docker.com/r/aswf/ci-imath/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-imath/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-imath/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-imath) | Based on `aswf/ci-common:4`, comes with all Imath upstream dependencies pre-installed. | +| | [aswf/ci-imath:2025](https://hub.docker.com/r/aswf/ci-imath/tags?name=2025) ![Image Version](https://img.shields.io/docker/v/aswf/ci-imath/2025) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-imath/2025) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-imath) | Based on `aswf/ci-common:5`, comes with all Imath upstream dependencies pre-installed. | +| | [aswf/ci-imath:2026](https://hub.docker.com/r/aswf/ci-imath/tags?name=2026) ![Image Version](https://img.shields.io/docker/v/aswf/ci-imath/2026) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-imath/2026) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-imath) | Based on `aswf/ci-common:6`, comes with all Imath upstream dependencies pre-installed. | | [aswf/ci-openexr](https://hub.docker.com/r/aswf/ci-openexr) | [aswf/ci-openexr:2018](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2018) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2018) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2018) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:1`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | | | [aswf/ci-openexr:2019](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2019) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2019) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2019) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:1`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | | | [aswf/ci-openexr:2020](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2020) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2020) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2020) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:1`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | | | [aswf/ci-openexr:2021](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2021) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2021) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2021) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:2`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | | | [aswf/ci-openexr:2022](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2022) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2022) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2022) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:2`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | | | [aswf/ci-openexr:2023](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2023) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2023) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2023) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:3`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | -| | [aswf/ci-openexr:2024](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:4`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | -| | [aswf/ci-openexr:2025](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2025) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2025) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2025) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:5`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | -| | [aswf/ci-openexr:2026](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2026) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2026) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2026) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:6`, comes with all Imath and OpenEXR upstream dependencies pre-installed. | +| | [aswf/ci-openexr:2024](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2024) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2024) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2024) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:4`, comes with all OpenEXR upstream dependencies pre-installed. | +| | [aswf/ci-openexr:2025](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2025) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2025) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2025) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:5`, comes with all OpenEXR upstream dependencies pre-installed. | +| | [aswf/ci-openexr:2026](https://hub.docker.com/r/aswf/ci-openexr/tags?name=2026) ![Image Version](https://img.shields.io/docker/v/aswf/ci-openexr/2026) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-openexr/2026) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-openexr) | Based on `aswf/ci-common:6`, comes with all OpenEXR upstream dependencies pre-installed. | | [aswf/ci-ocio](https://hub.docker.com/r/aswf/ci-ocio) | [aswf/ci-ocio:2018](https://hub.docker.com/r/aswf/ci-ocio/tags?name=2018) ![Image Version](https://img.shields.io/docker/v/aswf/ci-ocio/2018) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-ocio/2018) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-ocio) | Based on `aswf/ci-common:1`, comes with all OpenColorIO upstream dependencies pre-installed. | | | [aswf/ci-ocio:2019](https://hub.docker.com/r/aswf/ci-ocio/tags?name=2019) ![Image Version](https://img.shields.io/docker/v/aswf/ci-ocio/2019) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-ocio/2019) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-ocio) | Based on `aswf/ci-common:1`, comes with all OpenColorIO upstream dependencies pre-installed. | | | [aswf/ci-ocio:2020](https://hub.docker.com/r/aswf/ci-ocio/tags?name=2020) ![Image Version](https://img.shields.io/docker/v/aswf/ci-ocio/2020) | ![Image Size](https://img.shields.io/docker/image-size/aswf/ci-ocio/2020) ![Pulls](https://img.shields.io/docker/pulls/aswf/ci-ocio) | Based on `aswf/ci-common:1`, comes with all OpenColorIO upstream dependencies pre-installed. | diff --git a/ci-base/Dockerfile b/ci-base/Dockerfile index c9994504..6472b3b3 100644 --- a/ci-base/Dockerfile +++ b/ci-base/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -61,6 +62,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -147,6 +149,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -189,7 +192,6 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-base/README.md ci-base/image.yaml /usr/local/aswf/ - COPY scripts/common/install_conanpackages.sh /tmp/ ARG ASWF_PYTHON_MAJOR_MINOR_VERSION diff --git a/ci-base/README.md b/ci-base/README.md index 09e7a33e..1686f550 100644 --- a/ci-base/README.md +++ b/ci-base/README.md @@ -92,7 +92,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-base:2024.4](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2024.4) +## [aswf/ci-base:2024.5](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2024.5) Contains: * b2-5.2.1 @@ -123,7 +123,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-base:2025.3](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.3) +## [aswf/ci-base:2025.4](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2025.4) Contains: * b2-5.2.1 @@ -154,7 +154,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-base:2026.1](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2026.1) +## [aswf/ci-base:2026.2](https://hub.docker.com/r/aswf/ci-base/tags?page=1&name=2026.2) Contains: * b2-5.3.2 diff --git a/ci-baseos-gl-conan/Dockerfile b/ci-baseos-gl-conan/Dockerfile index 98156256..88cf1e96 100644 --- a/ci-baseos-gl-conan/Dockerfile +++ b/ci-baseos-gl-conan/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_CUDA_VERSION @@ -41,6 +42,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_DTS_PREFIX @@ -84,6 +86,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -103,7 +106,6 @@ ENV ASWF_CONAN_PYTHON_VERSION=$ASWF_CONAN_PYTHON_VERSION COPY ci-baseos-gl-conan/README.md ci-baseos-gl-conan/image.yaml /usr/local/aswf/ - COPY ../scripts/common/install_cudadevel.sh /tmp/ RUN --mount=type=cache,sharing=private,target=/var/cache/yum \ diff --git a/ci-baseos-gl-conan/README.md b/ci-baseos-gl-conan/README.md index 910a4378..08480661 100644 --- a/ci-baseos-gl-conan/README.md +++ b/ci-baseos-gl-conan/README.md @@ -17,7 +17,7 @@ Contains: GCC and all base OS libraries [Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-baseos-gl-conan/Dockerfile) -## [aswf/ci-baseos-gl-conan:4.4](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=4.4) +## [aswf/ci-baseos-gl-conan:4.5](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=4.5) Contains: * cuda-12.6.3 @@ -30,7 +30,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-baseos-gl-conan:5.3](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=5.3) +## [aswf/ci-baseos-gl-conan:5.4](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=5.4) Contains: * cuda-12.6.3 @@ -43,7 +43,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-baseos-gl-conan:6.1](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=6.1) +## [aswf/ci-baseos-gl-conan:6.2](https://hub.docker.com/r/aswf/ci-baseos-gl-conan/tags?page=1&name=6.2) Contains: * cuda-12.9.1 diff --git a/ci-baseqt/Dockerfile b/ci-baseqt/Dockerfile index 7e20bed9..e59e9183 100644 --- a/ci-baseqt/Dockerfile +++ b/ci-baseqt/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -66,6 +67,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -162,6 +164,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -209,7 +212,6 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-baseqt/README.md ci-baseqt/image.yaml /usr/local/aswf/ - COPY scripts/common/install_conanpackages.sh /tmp/ ARG ASWF_PYTHON_MAJOR_MINOR_VERSION diff --git a/ci-baseqt/README.md b/ci-baseqt/README.md index 3e7b07e6..67eaa89c 100644 --- a/ci-baseqt/README.md +++ b/ci-baseqt/README.md @@ -102,7 +102,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-baseqt:2024.4](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2024.4) +## [aswf/ci-baseqt:2024.5](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2024.5) Contains: * b2-5.2.1 @@ -137,7 +137,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-baseqt:2025.3](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.3) +## [aswf/ci-baseqt:2025.4](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2025.4) Contains: * b2-5.2.1 @@ -172,7 +172,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-baseqt:2026.1](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2026.1) +## [aswf/ci-baseqt:2026.2](https://hub.docker.com/r/aswf/ci-baseqt/tags?page=1&name=2026.2) Contains: * b2-5.3.2 diff --git a/ci-common/Dockerfile b/ci-common/Dockerfile index 5615fb5c..3e5c4d68 100644 --- a/ci-common/Dockerfile +++ b/ci-common/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_CLANG_VERSION @@ -43,6 +44,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_DTS_PREFIX @@ -90,6 +92,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -111,7 +114,6 @@ ENV ASWF_CONAN_PYTHON_VERSION=$ASWF_CONAN_PYTHON_VERSION COPY ci-common/README.md ci-common/image.yaml /usr/local/aswf/ - USER root COPY ../scripts/common/install_cudadevel.sh /tmp/ diff --git a/ci-common/README.md b/ci-common/README.md index 84671ab9..88da6dd5 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.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang16.4) +## [aswf/ci-common:4-clang16.5](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang16.5) Contains: * clang-16.0.6 @@ -188,7 +188,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:4-clang17.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang17.4) +## [aswf/ci-common:4-clang17.5](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=4-clang17.5) Contains: * clang-17.0.6 @@ -203,7 +203,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:5-clang18.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.3) +## [aswf/ci-common:5-clang18.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang18.4) Contains: * clang-18.1.8 @@ -218,7 +218,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:5-clang19.3](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.3) +## [aswf/ci-common:5-clang19.4](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=5-clang19.4) Contains: * clang-19.1.7 @@ -233,7 +233,7 @@ Contains: * conan-2.18.1 * yq-4.45.2 -## [aswf/ci-common:6-clang19.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang19.1) +## [aswf/ci-common:6-clang19.2](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang19.2) Contains: * clang-19.1.7 @@ -248,7 +248,7 @@ Contains: * conan-2.18.1 * yq-4.45.4 -## [aswf/ci-common:6-clang20.1](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang20.1) +## [aswf/ci-common:6-clang20.2](https://hub.docker.com/r/aswf/ci-common/tags?page=1&name=6-clang20.2) Contains: * clang-20.1.7 diff --git a/ci-imath/Dockerfile b/ci-imath/Dockerfile new file mode 100644 index 00000000..d619f5e7 --- /dev/null +++ b/ci-imath/Dockerfile @@ -0,0 +1,107 @@ +# syntax=docker/dockerfile:1.10 +# check=skip=InvalidDefaultArgInFrom +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +# !!! This file is automatically generated from a template and the `image.yaml` file in the same folder !!! + +ARG ASWF_ORG +ARG ASWF_PKG_ORG +ARG CI_COMMON_VERSION +ARG ASWF_CLANG_MAJOR_VERSION +ARG ASWF_PYSIDE_CLANG_VERSION +ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD + +ARG ASWF_VFXPLATFORM_VERSION + + +ARG ASWF_IMATH_VERSION +ARG ASWF_NUMPY_VERSION +ARG ASWF_VFXPLATFORM_VERSION + + + + +# Comment out this block to use Conan packages +FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} AS ci-imath + + +ARG ASWF_ORG +ARG ASWF_CONAN_HOME +ARG ASWF_PKG_ORG +ARG ASWF_VERSION +ARG CI_COMMON_VERSION +ARG ASWF_PYSIDE_CLANG_VERSION +ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD + + + +ARG ASWF_IMATH_VERSION +ARG ASWF_NUMPY_VERSION +ARG ASWF_VFXPLATFORM_VERSION + + +LABEL org.opencontainers.image.name="$ASWF_ORG/ci-imath" +LABEL org.opencontainers.image.title="Imath CI Docker Image" +LABEL org.opencontainers.image.description="Contains: Python and other Imath upstream dependencies\ +Warning: this image does *not* contain Imath itself as it is used to *build* Imath!" +LABEL org.opencontainers.image.url="http://aswf.io/" +LABEL org.opencontainers.image.source="https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-imath/Dockerfile" +LABEL org.opencontainers.image.vendor="AcademySoftwareFoundation" +LABEL org.opencontainers.image.authors="Built by aswf.io CI Working Group" +LABEL org.opencontainers.image.version="${ASWF_VERSION}" + + +LABEL com.vfxplatform.version="${ASWF_VFXPLATFORM_VERSION}" + + +LABEL io.aswf.docker.versions.imath="$ASWF_IMATH_VERSION" +LABEL io.aswf.docker.versions.numpy="$ASWF_NUMPY_VERSION" +LABEL io.aswf.docker.versions.vfxplatform="$ASWF_VFXPLATFORM_VERSION" + + +ENV ASWF_ORG=${ASWF_ORG} +ENV ASWF_VERSION=${ASWF_VERSION} +ENV ASWF_INSTALL_PREFIX=/usr/local +ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} + + + +ENV ASWF_VFXPLATFORM_VERSION=${ASWF_VFXPLATFORM_VERSION} + + +ENV ASWF_IMATH_VERSION=$ASWF_IMATH_VERSION +ENV ASWF_NUMPY_VERSION=$ASWF_NUMPY_VERSION +ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION + + +COPY ci-imath/README.md ci-imath/image.yaml /usr/local/aswf/ + +COPY scripts/vfx/build_imath.sh /usr/local/aswf + + +COPY scripts/common/install_conanpackages.sh /tmp/ + +ARG ASWF_PYTHON_MAJOR_MINOR_VERSION +ENV ASWF_PYTHON_MAJOR_MINOR_VERSION=${ASWF_PYTHON_MAJOR_MINOR_VERSION} + +# conan-only packages +COPY < . +[requires] +imath/${ASWF_IMATH_VERSION}@${ASWF_PKG_ORG}/${ASWF_CONAN_CHANNEL} +EOF + +ENV CONAN_HOME=${ASWF_CONAN_HOME}/.conan2 + + +RUN --mount=type=cache,target=/opt/conan_home/d \ + --mount=type=bind,rw,target=/opt/conan_home/.conan2,source=packages/conan/settings \ + /tmp/install_conanpackages.sh /usr/local vfx${ASWF_VFXPLATFORM_VERSION} imath + + diff --git a/ci-imath/README.md b/ci-imath/README.md new file mode 100644 index 00000000..92562356 --- /dev/null +++ b/ci-imath/README.md @@ -0,0 +1,41 @@ + + +# Academy Software Foundation Docker Image + +See [aswf.io](https://aswf.io) and [aswf-docker](https://github.com/AcademySoftwareFoundation/aswf-docker) +for further information, and participate in the discussion on the +[ASWF Slack #wg-ci channel](https://academysoftwarefdn.slack.com/archives/C0169RX7MMK). + +## Imath CI Docker Image + +Contains: Python and other Imath upstream dependencies +Warning: this image does *not* contain Imath itself as it is used to *build* Imath! + +[Docker Image Source](https://github.com/AcademySoftwareFoundation/aswf-docker/blob/main/ci-imath/Dockerfile) + +## [aswf/ci-imath:2024.5](https://hub.docker.com/r/aswf/ci-imath/tags?page=1&name=2024.5) + +Contains: +* imath-3.1.12 +* numpy-1.24.3 +* vfxplatform-2024 + +## [aswf/ci-imath:2025.4](https://hub.docker.com/r/aswf/ci-imath/tags?page=1&name=2025.4) + +Contains: +* imath-3.1.12 +* numpy-1.26.4 +* vfxplatform-2025 + +## [aswf/ci-imath:2026.2](https://hub.docker.com/r/aswf/ci-imath/tags?page=1&name=2026.2) + +Contains: +* imath-3.2.2 +* numpy-2.3.2 +* vfxplatform-2026 + diff --git a/ci-imath/image.yaml b/ci-imath/image.yaml new file mode 100644 index 00000000..40e2f100 --- /dev/null +++ b/ci-imath/image.yaml @@ -0,0 +1,12 @@ +name: "imath" +title: "Imath CI Docker Image" +description: | + Contains: Python and other Imath upstream dependencies + Warning: this image does *not* contain Imath itself as it is used to *build* Imath! +packages: + - imath # all dependencies will be installed except imath itself +implicit_packages: + - numpy + - vfxplatform +docker_from: ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} +docker_package_version: $ASWF_VFXPLATFORM_VERSION diff --git a/ci-materialx/Dockerfile b/ci-materialx/Dockerfile index c79e8f3e..58ca5df1 100644 --- a/ci-materialx/Dockerfile +++ b/ci-materialx/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-materialx/README.md ci-materialx/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_materialx.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-materialx/README.md b/ci-materialx/README.md index 98bfca12..54e1ae78 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.4](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2024.4) +## [aswf/ci-materialx:2024.5](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2024.5) Contains: * materialx-1.39.1 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-materialx:2025.3](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.3) +## [aswf/ci-materialx:2025.4](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2025.4) Contains: * materialx-1.39.3 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-materialx:2026.1](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2026.1) +## [aswf/ci-materialx:2026.2](https://hub.docker.com/r/aswf/ci-materialx/tags?page=1&name=2026.2) Contains: * materialx-1.39.3 diff --git a/ci-ocio/Dockerfile b/ci-ocio/Dockerfile index 19bda436..bf1ed714 100644 --- a/ci-ocio/Dockerfile +++ b/ci-ocio/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-ocio/README.md ci-ocio/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_ocio.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-ocio/README.md b/ci-ocio/README.md index 251c1d35..49a83ed2 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.4](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2024.4) +## [aswf/ci-ocio:2024.5](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2024.5) Contains: * ocio-2.3.2 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-ocio:2025.3](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.3) +## [aswf/ci-ocio:2025.4](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2025.4) Contains: * ocio-2.4.2 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-ocio:2026.1](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2026.1) +## [aswf/ci-ocio:2026.2](https://hub.docker.com/r/aswf/ci-ocio/tags?page=1&name=2026.2) Contains: * ocio-2.5.0 diff --git a/ci-oiio/Dockerfile b/ci-oiio/Dockerfile index e527bdcf..e86e0201 100644 --- a/ci-oiio/Dockerfile +++ b/ci-oiio/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-oiio/README.md ci-oiio/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_oiio.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-oiio/README.md b/ci-oiio/README.md index 048d97e3..fcbac0e8 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.4](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2024.4) +## [aswf/ci-oiio:2024.5](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2024.5) Contains: * oiio-2.5.19.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-oiio:2025.3](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.3) +## [aswf/ci-oiio:2025.4](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2025.4) Contains: * oiio-3.1.6.2 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-oiio:2026.1](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2026.1) +## [aswf/ci-oiio:2026.2](https://hub.docker.com/r/aswf/ci-oiio/tags?page=1&name=2026.2) Contains: * oiio-3.1.6.2 diff --git a/ci-opencue/Dockerfile b/ci-opencue/Dockerfile index 1178f39b..8eaff441 100644 --- a/ci-opencue/Dockerfile +++ b/ci-opencue/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-opencue/README.md ci-opencue/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_opencue.sh /usr/local/aswf RUN sudo yum -y install \ java-17-openjdk.x86_64 \ java-17-openjdk-devel.x86_64 diff --git a/ci-opencue/README.md b/ci-opencue/README.md index 557d1ebd..990c048e 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.4](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2024.4) +## [aswf/ci-opencue:2024.5](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2024.5) Contains: * cpython-3.11.13 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-opencue:2025.3](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.3) +## [aswf/ci-opencue:2025.4](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2025.4) Contains: * cpython-3.11.13 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-opencue:2026.1](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2026.1) +## [aswf/ci-opencue:2026.2](https://hub.docker.com/r/aswf/ci-opencue/tags?page=1&name=2026.2) Contains: * cpython-3.13.3 diff --git a/ci-openexr/Dockerfile b/ci-openexr/Dockerfile index 7c9aa1a6..d9171b74 100644 --- a/ci-openexr/Dockerfile +++ b/ci-openexr/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-openexr/README.md ci-openexr/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_openexr.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-openexr/README.md b/ci-openexr/README.md index eb93a340..9f7fc1ca 100644 --- a/ci-openexr/README.md +++ b/ci-openexr/README.md @@ -53,24 +53,24 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-openexr:2024.4](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2024.4) +## [aswf/ci-openexr:2024.5](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2024.5) Contains: -* openexr-3.2.4 +* openexr-3.2.5 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openexr:2025.3](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.3) +## [aswf/ci-openexr:2025.4](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2025.4) Contains: -* openexr-3.3.5 +* openexr-3.3.6 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openexr:2026.1](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2026.1) +## [aswf/ci-openexr:2026.2](https://hub.docker.com/r/aswf/ci-openexr/tags?page=1&name=2026.2) Contains: -* openexr-3.4.2 +* openexr-3.4.3 * numpy-2.3.2 * vfxplatform-2026 diff --git a/ci-openfx/Dockerfile b/ci-openfx/Dockerfile index a7a6c536..3cd872d1 100644 --- a/ci-openfx/Dockerfile +++ b/ci-openfx/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-openfx/README.md ci-openfx/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_openfx.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-openfx/README.md b/ci-openfx/README.md index c40cc6d8..01f06247 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.4](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2024.4) +## [aswf/ci-openfx:2024.5](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2024.5) Contains: * openfx-1.5s * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openfx:2025.3](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2025.3) +## [aswf/ci-openfx:2025.4](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2025.4) Contains: * openfx-1.5s * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openfx:2026.1](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2026.1) +## [aswf/ci-openfx:2026.2](https://hub.docker.com/r/aswf/ci-openfx/tags?page=1&name=2026.2) Contains: * openfx-1.5s diff --git a/ci-openrv/Dockerfile b/ci-openrv/Dockerfile index f7286c25..884730fb 100644 --- a/ci-openrv/Dockerfile +++ b/ci-openrv/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -35,6 +36,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -70,6 +72,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -85,6 +88,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-openrv/README.md ci-openrv/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_openrv.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-openrv/README.md b/ci-openrv/README.md index 56581b05..ed3c27c9 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.4](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2024.4) +## [aswf/ci-openrv:2024.5](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2024.5) Contains: * cpython-3.11.13 @@ -27,7 +27,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openrv:2025.3](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.3) +## [aswf/ci-openrv:2025.4](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2025.4) Contains: * cpython-3.11.13 @@ -36,7 +36,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openrv:2026.1](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2026.1) +## [aswf/ci-openrv:2026.2](https://hub.docker.com/r/aswf/ci-openrv/tags?page=1&name=2026.2) Contains: * cpython-3.13.3 diff --git a/ci-openvdb/Dockerfile b/ci-openvdb/Dockerfile index 26caf749..016e0c94 100644 --- a/ci-openvdb/Dockerfile +++ b/ci-openvdb/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -34,6 +35,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -67,6 +69,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -81,6 +84,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-openvdb/README.md ci-openvdb/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_openvdb.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-openvdb/README.md b/ci-openvdb/README.md index acd16b29..b0c2bbf3 100644 --- a/ci-openvdb/README.md +++ b/ci-openvdb/README.md @@ -122,7 +122,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-openvdb:2024-clang16.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang16.4) +## [aswf/ci-openvdb:2024-clang16.5](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang16.5) Contains: * openvdb-11.0.0 @@ -130,7 +130,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openvdb:2024-clang17.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang17.4) +## [aswf/ci-openvdb:2024-clang17.5](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2024-clang17.5) Contains: * openvdb-11.0.0 @@ -138,7 +138,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-openvdb:2025-clang18.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.3) +## [aswf/ci-openvdb:2025-clang18.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang18.4) Contains: * openvdb-12.1.1 @@ -146,7 +146,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openvdb:2025-clang19.3](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.3) +## [aswf/ci-openvdb:2025-clang19.4](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2025-clang19.4) Contains: * openvdb-12.1.1 @@ -154,18 +154,18 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-openvdb:2026-clang19.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang19.1) +## [aswf/ci-openvdb:2026-clang19.2](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang19.2) Contains: -* openvdb-12.1.1 +* openvdb-13.0.0 * gtest-1.17.0 * numpy-2.3.2 * vfxplatform-2026 -## [aswf/ci-openvdb:2026-clang20.1](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang20.1) +## [aswf/ci-openvdb:2026-clang20.2](https://hub.docker.com/r/aswf/ci-openvdb/tags?page=1&name=2026-clang20.2) Contains: -* openvdb-12.1.1 +* openvdb-13.0.0 * gtest-1.17.0 * numpy-2.3.2 * vfxplatform-2026 diff --git a/ci-osl/Dockerfile b/ci-osl/Dockerfile index 20eaff57..31208944 100644 --- a/ci-osl/Dockerfile +++ b/ci-osl/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -29,6 +30,7 @@ ARG ASWF_CUDA_VERSION ARG ASWF_OPTIX_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_VFXPLATFORM_VERSION +ARG ASWF_OSL_VERSION @@ -44,6 +46,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -61,6 +64,7 @@ ARG ASWF_CUDA_VERSION ARG ASWF_OPTIX_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_VFXPLATFORM_VERSION +ARG ASWF_OSL_VERSION LABEL org.opencontainers.image.name="$ASWF_ORG/ci-osl" @@ -97,6 +101,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -117,10 +122,12 @@ ENV ASWF_CUDA_VERSION=$ASWF_CUDA_VERSION ENV ASWF_OPTIX_VERSION=$ASWF_OPTIX_VERSION ENV ASWF_NUMPY_VERSION=$ASWF_NUMPY_VERSION ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION +ENV ASWF_OSL_VERSION=$ASWF_OSL_VERSION COPY ci-osl/README.md ci-osl/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_osl.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-osl/README.md b/ci-osl/README.md index d369dd86..7b16d5d6 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.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang16.4) +## [aswf/ci-osl:2024-clang16.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang16.5) Contains: * cpython-3.11.13 @@ -245,7 +245,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-osl:2024-clang17.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang17.4) +## [aswf/ci-osl:2024-clang17.5](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2024-clang17.5) Contains: * cpython-3.11.13 @@ -262,7 +262,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-osl:2025-clang18.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.3) +## [aswf/ci-osl:2025-clang18.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang18.4) Contains: * cpython-3.11.13 @@ -279,7 +279,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-osl:2025-clang19.3](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.3) +## [aswf/ci-osl:2025-clang19.4](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2025-clang19.4) Contains: * cpython-3.11.13 @@ -296,7 +296,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-osl:2026-clang19.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang19.1) +## [aswf/ci-osl:2026-clang19.2](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang19.2) Contains: * cpython-3.13.3 @@ -313,7 +313,7 @@ Contains: * numpy-2.3.2 * vfxplatform-2026 -## [aswf/ci-osl:2026-clang20.1](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang20.1) +## [aswf/ci-osl:2026-clang20.2](https://hub.docker.com/r/aswf/ci-osl/tags?page=1&name=2026-clang20.2) Contains: * cpython-3.13.3 diff --git a/ci-otio/Dockerfile b/ci-otio/Dockerfile index 6564e516..14549345 100644 --- a/ci-otio/Dockerfile +++ b/ci-otio/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -66,6 +67,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -163,6 +165,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -209,6 +212,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-otio/README.md ci-otio/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_otio.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-otio/README.md b/ci-otio/README.md index fe0cc0bb..85848b8a 100644 --- a/ci-otio/README.md +++ b/ci-otio/README.md @@ -108,7 +108,7 @@ Contains: * numpy-1.23.5 * vfxplatform-2023 -## [aswf/ci-otio:2024.4](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2024.4) +## [aswf/ci-otio:2024.5](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2024.5) Contains: * b2-5.2.1 @@ -143,7 +143,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-otio:2025.3](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.3) +## [aswf/ci-otio:2025.4](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2025.4) Contains: * b2-5.2.1 @@ -178,7 +178,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-otio:2026.1](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2026.1) +## [aswf/ci-otio:2026.2](https://hub.docker.com/r/aswf/ci-otio/tags?page=1&name=2026.2) Contains: * b2-5.3.2 diff --git a/ci-rawtoaces/Dockerfile b/ci-rawtoaces/Dockerfile index 5a28c15f..e49b587a 100644 --- a/ci-rawtoaces/Dockerfile +++ b/ci-rawtoaces/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -33,6 +34,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -64,6 +66,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -77,6 +80,7 @@ ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION COPY ci-rawtoaces/README.md ci-rawtoaces/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_rawtoaces.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-rawtoaces/README.md b/ci-rawtoaces/README.md index e267669e..c54b6a45 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.4](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2024.4) +## [aswf/ci-rawtoaces:2024.5](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2024.5) Contains: * rawtoaces-1.1.0 * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-rawtoaces:2025.3](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2025.3) +## [aswf/ci-rawtoaces:2025.4](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2025.4) Contains: * rawtoaces-1.1.0 * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-rawtoaces:2026.1](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2026.1) +## [aswf/ci-rawtoaces:2026.2](https://hub.docker.com/r/aswf/ci-rawtoaces/tags?page=1&name=2026.2) Contains: * rawtoaces-1.1.0 diff --git a/ci-usd/Dockerfile b/ci-usd/Dockerfile index 1ca58993..07465957 100644 --- a/ci-usd/Dockerfile +++ b/ci-usd/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -64,6 +65,7 @@ ARG ASWF_MATERIALX_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_HDF5_VERSION ARG ASWF_VFXPLATFORM_VERSION +ARG ASWF_USD_VERSION @@ -79,6 +81,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -131,6 +134,7 @@ ARG ASWF_MATERIALX_VERSION ARG ASWF_NUMPY_VERSION ARG ASWF_HDF5_VERSION ARG ASWF_VFXPLATFORM_VERSION +ARG ASWF_USD_VERSION LABEL org.opencontainers.image.name="$ASWF_ORG/ci-usd" @@ -202,6 +206,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -257,10 +262,12 @@ ENV ASWF_MATERIALX_VERSION=$ASWF_MATERIALX_VERSION ENV ASWF_NUMPY_VERSION=$ASWF_NUMPY_VERSION ENV ASWF_HDF5_VERSION=$ASWF_HDF5_VERSION ENV ASWF_VFXPLATFORM_VERSION=$ASWF_VFXPLATFORM_VERSION +ENV ASWF_USD_VERSION=$ASWF_USD_VERSION COPY ci-usd/README.md ci-usd/image.yaml /usr/local/aswf/ +COPY scripts/vfx/build_usd.sh /usr/local/aswf COPY scripts/common/install_conanpackages.sh /tmp/ diff --git a/ci-usd/README.md b/ci-usd/README.md index 1777b0b7..641e0130 100644 --- a/ci-usd/README.md +++ b/ci-usd/README.md @@ -150,7 +150,7 @@ Contains: * hdf5-1.8.23 * vfxplatform-2023 -## [aswf/ci-usd:2024.4](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2024.4) +## [aswf/ci-usd:2024.5](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2024.5) Contains: * b2-5.2.1 @@ -189,7 +189,7 @@ Contains: * partio-1.19.0 * ptex-2.4.2 * libjxl-0.11.1 -* openexr-3.2.4 +* openexr-3.2.5 * alembic-1.8.8 * ocio-2.3.2 * oiio-2.5.19.0 @@ -198,7 +198,7 @@ Contains: * hdf5-1.14.6 * vfxplatform-2024 -## [aswf/ci-usd:2025.3](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.3) +## [aswf/ci-usd:2025.4](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2025.4) Contains: * b2-5.2.1 @@ -237,7 +237,7 @@ Contains: * partio-1.19.0 * ptex-2.4.3 * libjxl-0.11.1 -* openexr-3.3.5 +* openexr-3.3.6 * alembic-1.8.8 * ocio-2.4.2 * oiio-3.1.6.2 @@ -246,7 +246,7 @@ Contains: * hdf5-1.14.6 * vfxplatform-2025 -## [aswf/ci-usd:2026.1](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2026.1) +## [aswf/ci-usd:2026.2](https://hub.docker.com/r/aswf/ci-usd/tags?page=1&name=2026.2) Contains: * b2-5.3.2 @@ -285,7 +285,7 @@ Contains: * partio-1.19.0 * ptex-2.4.3 * libjxl-0.11.1 -* openexr-3.4.2 +* openexr-3.4.3 * alembic-1.8.8 * ocio-2.5.0 * oiio-3.1.6.2 diff --git a/ci-vfxall/Dockerfile b/ci-vfxall/Dockerfile index 727f3786..11e2cbf0 100644 --- a/ci-vfxall/Dockerfile +++ b/ci-vfxall/Dockerfile @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD ARG ASWF_VFXPLATFORM_VERSION @@ -56,6 +57,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD @@ -126,6 +128,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} @@ -163,7 +166,6 @@ COPY --from=ci-package-otio /. /usr/local/ COPY ci-vfxall/README.md ci-vfxall/image.yaml /usr/local/aswf/ - COPY scripts/common/install_conanpackages.sh /tmp/ ARG ASWF_PYTHON_MAJOR_MINOR_VERSION diff --git a/ci-vfxall/README.md b/ci-vfxall/README.md index 1a447367..5715d78f 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.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang16.4) +## [aswf/ci-vfxall:2024-clang16.5](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang16.5) Contains: * cppunit-1.15.1 @@ -337,7 +337,7 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.1.12 -* openexr-3.2.4 +* openexr-3.2.5 * oiio-2.5.19.0 * ocio-2.3.2 * openfx-1.5s @@ -350,7 +350,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-vfxall:2024-clang17.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang17.4) +## [aswf/ci-vfxall:2024-clang17.5](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2024-clang17.5) Contains: * cppunit-1.15.1 @@ -364,7 +364,7 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.1.12 -* openexr-3.2.4 +* openexr-3.2.5 * oiio-2.5.19.0 * ocio-2.3.2 * openfx-1.5s @@ -377,7 +377,7 @@ Contains: * numpy-1.24.3 * vfxplatform-2024 -## [aswf/ci-vfxall:2025-clang18.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.3) +## [aswf/ci-vfxall:2025-clang18.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang18.4) Contains: * cppunit-1.15.1 @@ -391,7 +391,7 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.1.12 -* openexr-3.3.5 +* openexr-3.3.6 * oiio-3.1.6.2 * ocio-2.4.2 * openfx-1.5s @@ -404,7 +404,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-vfxall:2025-clang19.3](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.3) +## [aswf/ci-vfxall:2025-clang19.4](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2025-clang19.4) Contains: * cppunit-1.15.1 @@ -418,7 +418,7 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.1.12 -* openexr-3.3.5 +* openexr-3.3.6 * oiio-3.1.6.2 * ocio-2.4.2 * openfx-1.5s @@ -431,7 +431,7 @@ Contains: * numpy-1.26.4 * vfxplatform-2025 -## [aswf/ci-vfxall:2026-clang19.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang19.1) +## [aswf/ci-vfxall:2026-clang19.2](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang19.2) Contains: * cppunit-1.15.1 @@ -445,11 +445,11 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.2.2 -* openexr-3.4.2 +* openexr-3.4.3 * oiio-3.1.6.2 * ocio-2.5.0 * openfx-1.5s -* openvdb-12.1.1 +* openvdb-13.0.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.1](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang20.1) +## [aswf/ci-vfxall:2026-clang20.2](https://hub.docker.com/r/aswf/ci-vfxall/tags?page=1&name=2026-clang20.2) Contains: * cppunit-1.15.1 @@ -472,11 +472,11 @@ Contains: * partio-1.19.0 * alembic-1.8.8 * imath-3.2.2 -* openexr-3.4.2 +* openexr-3.4.3 * oiio-3.1.6.2 * ocio-2.5.0 * openfx-1.5s -* openvdb-12.1.1 +* openvdb-13.0.0 * materialx-1.39.3 * usd-25.08 * osl-1.14.7.0 diff --git a/packages/conan/recipes/oiio/conandata.yml b/packages/conan/recipes/oiio/conandata.yml index 99996e0e..3b5904ef 100644 --- a/packages/conan/recipes/oiio/conandata.yml +++ b/packages/conan/recipes/oiio/conandata.yml @@ -5,6 +5,9 @@ # From: https://github.com/conan-io/conan-center-index/blob/9a66422e07df06d2c502501de6e00b8b1213b563/recipes/openimageio/all/conandata.yml sources: + "3.1.7.0": + url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v3.1.7.0.tar.gz" + sha256: "d5160dc44a62897104f44488ebdb19249a78448a25fbae3504fc1ea6fda54878" "3.1.6.2": url: "https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/refs/tags/v3.1.6.2.tar.gz" sha256: "a1e515e6a6ea9925a70c23db21dda37f3ce2c24780a6bfedd8685fea063f698a" diff --git a/packages/conan/recipes/oiio/conanfile.py b/packages/conan/recipes/oiio/conanfile.py index bb87de76..2a5acfa0 100644 --- a/packages/conan/recipes/oiio/conanfile.py +++ b/packages/conan/recipes/oiio/conanfile.py @@ -52,7 +52,8 @@ class OpenImageIOConan(ConanFile): "with_libjxl": [True, False], "with_libultrahdr": [True, False], "with_iv": [True, False], - "with_python": [True, False], + "with_python": [True, False], # ASWF + "with_openjph": [True, False], # ASWF } default_options = { "shared": False, @@ -77,6 +78,7 @@ class OpenImageIOConan(ConanFile): "with_libultrahdr": True, "with_iv": False, # ASWF: enable once we figure out why configure doesn't find Qt or OpenGL "with_python": True, # ASWF: build Python bindings + "with_openjph": True, # ASWF: use OpenJPH since OpenEXR uses it } def export_sources(self): @@ -153,6 +155,8 @@ def requirements(self): self.requires("qt/6.8.3") if self.options.with_python: # ASWF: build Python bindings self.requires("cpython/[>=3.0.0") + if self.options.with_openjph: # ASWF: use OpenJPH for JPEG-2000 + self.requires("openjph/0.24.5") def validate(self): if self.settings.compiler.cppstd: @@ -337,6 +341,8 @@ def package_info(self): self.cpp_info.components["OpenImageIO"].requires.append("libultrahdr::libultrahdr") if self.options.with_python: # ASWF: build Python bindings self.cpp_info.components["OpenImageIO"].requires.append("cpython::cpython") + if self.options.with_python: # ASWF: Use OpenJPH for JPEG-2000 + self.cpp_info.components["OpenImageIO"].requires.append("openjph::openjph") if self.settings.os in ["Linux", "FreeBSD"]: self.cpp_info.components["OpenImageIO"].system_libs.extend(["dl", "m", "pthread"]) diff --git a/packages/conan/recipes/openexr/conandata.yml b/packages/conan/recipes/openexr/conandata.yml index f4e6edd0..742d4a5f 100644 --- a/packages/conan/recipes/openexr/conandata.yml +++ b/packages/conan/recipes/openexr/conandata.yml @@ -5,6 +5,9 @@ # From: https://github.com/conan-io/conan-center-index/blob/cceee569179c10fa56d1fd9c3582f3371944ba59/recipes/openexr/3.x/conandata.yml sources: + "3.4.3": + url: "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.4.3.tar.gz" + sha256: "06494da42eb91c47265ffbad02d0c73cf65d8ad7f24683b801f34d842c4ecb6d" "3.4.2": url: "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.4.2.tar.gz" sha256: "d7d38eb6a63ea8ba0f301d0ad6a80094032d488e9e6c525b35236d20a9ae3ef2" @@ -17,6 +20,9 @@ sources: "3.4-alpha": url: "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.4-alpha.tar.gz" sha256: "5a78b497576a323979b03a343ad63a253d955462365c67597ab6fcac87e79193" + "3.3.6": + url: "https://github.com/AcademySoftwareFoundation/openexr/releases/download/v3.3.6/openexr-3.3.6.tar.gz" + sha256: "35d3d597ca2a9dcbf405874c774bd716cd729fb35ab27ccbd75a1355ee9d9c0f" "3.3.5": url: "https://github.com/AcademySoftwareFoundation/openexr/releases/download/v3.3.5/openexr-3.3.5.tar.gz" sha256: "8f9241f0e9d6b7aec7e9509cf2a9224416b9cd9d41740deab3827b1f2d01c662" @@ -35,6 +41,9 @@ sources: "3.3.0": url: "https://github.com/AcademySoftwareFoundation/OpenEXR/archive/v3.3.0.tar.gz" sha256: "58b00f50d2012f3107573c4b7371f70516d2972c2b301a50925e1b4a60a7be6f" + "3.2.5": + url: "https://github.com/AcademySoftwareFoundation/OpenEXR/archive/v3.2.5.tar.gz" + sha256: "89374d93401dda1a49bf4acb930a906b9936f9526523d0f318dacb9fa8f025d7" "3.2.4": url: "https://github.com/AcademySoftwareFoundation/OpenEXR/archive/v3.2.4.tar.gz" sha256: "81e6518f2c4656fdeaf18a018f135e96a96e7f66dbe1c1f05860dd94772176cc" @@ -54,6 +63,9 @@ sources: url: "https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v3.1.7.tar.gz" sha256: "78dbca39115a1c526e6728588753955ee75fa7f5bb1a6e238bed5b6d66f91fd7" patches: + "3.4.3": + - patch_file: "patches/3.4.3-openjph-setup.patch" + patch_description: "Find previously installed openjph" "3.2.4": - patch_file: "patches/3.2.1-gcc5-bug-workaround.patch" patch_description: "Workaround for GCC 5 bug" diff --git a/packages/conan/recipes/openexr/conanfile.py b/packages/conan/recipes/openexr/conanfile.py index 7960034d..4c4b6670 100644 --- a/packages/conan/recipes/openexr/conanfile.py +++ b/packages/conan/recipes/openexr/conanfile.py @@ -52,6 +52,11 @@ def _minimum_compiler_version(self): def _with_libdeflate(self): return Version(self.version) >= "3.2" + # ASWF: OpenEXR 3.4 now supports OpenJPH: + @property + def _with_openjph(self): + return Version(self.version) >= "3.4" + def export_sources(self): export_conandata_patches(self) @@ -74,6 +79,9 @@ def requirements(self): self.requires("libdeflate/1.19") # ASWF: add explicit dependencies on cpython, Conan profile provides real versions self.requires("cpython/[>=3.0.0]") + # ASWF: OpenEXR 3.4 supports OpenJPH + if self._with_openjph: + self.requires("openjph/0.24.5") def validate(self): if self.settings.compiler.get_safe("cppstd"): @@ -186,6 +194,8 @@ def package_info(self): OpenEXRCore.requires = [self._conan_comp("OpenEXRConfig"), "zlib::zlib"] if self._with_libdeflate: OpenEXRCore.requires.append("libdeflate::libdeflate") + if self._with_openjph: + OpenEXRCore.requires.append("openjph::openjph") if self.settings.os in ["Linux", "FreeBSD"]: OpenEXRCore.system_libs = ["m"] diff --git a/packages/conan/recipes/openexr/patches/3.4.3-openjph-setup.patch b/packages/conan/recipes/openexr/patches/3.4.3-openjph-setup.patch new file mode 100644 index 00000000..21984198 --- /dev/null +++ b/packages/conan/recipes/openexr/patches/3.4.3-openjph-setup.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/OpenEXRSetup.cmake b/cmake/OpenEXRSetup.cmake +index bccd980..c8438f3 100644 +--- a/cmake/OpenEXRSetup.cmake ++++ b/cmake/OpenEXRSetup.cmake +@@ -267,7 +267,7 @@ + endif() + + message(STATUS "Using OpenJPH ${openjph_VERSION} from ${openjph_DIR}") +- set(EXR_OPENJPH_LIB openjph) ++ set(EXR_OPENJPH_LIB openjph::openjph) + else() + # If not found, try pkgconfig + find_package(PkgConfig) diff --git a/packages/conan/recipes/openjph/conandata.yml b/packages/conan/recipes/openjph/conandata.yml new file mode 100644 index 00000000..83cb03ad --- /dev/null +++ b/packages/conan/recipes/openjph/conandata.yml @@ -0,0 +1,15 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/5d3d03d17ad9f83e87f8cfc3b6a701352bb517cc/recipes/openjph/all/conandata.yml + +sources: + "0.24.5": + url: "https://github.com/aous72/OpenJPH/archive/0.24.5.tar.gz" + sha256: "46e33b5c61798bc0fb5aef19bcdd2aa8d207cecc0d389293ee3cf0524165c648" +patches: + "0.24.5": + - patch_file: "patches/0.24.5-cmake-cxx-standard-pic.patch" + patch_description: "Remove setting of CXX standard to a fixed value overriding the toolchain provided by Conan and PIC hardcoded option" + patch_type: "conan" diff --git a/packages/conan/recipes/openjph/conanfile.py b/packages/conan/recipes/openjph/conanfile.py new file mode 100644 index 00000000..8996ea54 --- /dev/null +++ b/packages/conan/recipes/openjph/conanfile.py @@ -0,0 +1,97 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/5d3d03d17ad9f83e87f8cfc3b6a701352bb517cc/recipes/openjph/all/conanfile.py + +from conan import ConanFile +from conan.tools.build import check_min_cppstd +from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout +from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir +from conan.tools.microsoft import is_msvc +from conan.tools.scm import Version + +import os + +required_conan_version = ">=2.1" + +class OpenJPH(ConanFile): + name = "openjph" + description = "Open-source implementation of JPEG2000 Part-15 (or JPH or HTJ2K)" + license = "BSD-2-Clause" + url = "https://github.com/conan-io/conan-center-index" + homepage = "https://github.com/aous72/OpenJPH" + topics = ("ht-j2k", "jpeg2000", "jp2", "openjph", "image", "multimedia", "format", "graphics") + package_type = "library" + settings = "os", "arch", "compiler", "build_type" + options = { + "shared": [True, False], + "fPIC": [True, False], + "with_executables": [True, False], + "with_tiff": [True, False], + "with_stream_expand_tool": [True, False], + "disable_simd": [True, False], + } + default_options = { + "shared": False, + "fPIC": True, + "with_executables": True, + "with_tiff": True, + "with_stream_expand_tool": False, + "disable_simd": False, + } + implements = ["auto_shared_fpic"] + + def export_sources(self): + export_conandata_patches(self) + + def layout(self): + cmake_layout(self, src_folder="src") + + def requirements(self): + if self.options.with_executables and self.options.with_tiff: + self.requires("libtiff/[>=4.6.0 <5]") + + def validate(self): + check_min_cppstd(self, 11) + + def source(self): + get(self, **self.conan_data["sources"][self.version], strip_root=True) + apply_conandata_patches(self) + + def generate(self): + tc = CMakeToolchain(self) + tc.cache_variables["OJPH_BUILD_EXECUTABLES"] = self.options.with_executables + tc.cache_variables["OJPH_ENABLE_TIFF_SUPPORT"] = self.options.with_tiff + tc.cache_variables["OJPH_BUILD_STREAM_EXPAND"] = self.options.with_stream_expand_tool + tc.cache_variables["OJPH_DISABLE_SIMD"] = self.options.disable_simd + tc.generate() + + deps = CMakeDeps(self) + deps.generate() + + def build(self): + cm = CMake(self) + cm.configure() + cm.build() + + def package(self): + cm = CMake(self) + cm.install() + + copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses", self.name)) # ASWF + # rmdir(self, os.path.join(self.package_folder, "lib", "cmake")) # ASWF + rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig")) + + def package_info(self): + self.cpp_info.set_property("cmake_file_name", "openjph") + self.cpp_info.set_property("cmake_target_name", "openjph::openjph") + self.cpp_info.set_property("pkg_config_name", "openjph") + + version_suffix = "_d" if self.settings.build_type == "Debug" else "" + if is_msvc(self): + v = Version(self.version) + version_suffix = f".{v.major}.{v.minor}" + if self.settings.build_type == "Debug": + version_suffix += "d" + self.cpp_info.libs = ["openjph" + version_suffix] diff --git a/packages/conan/recipes/openjph/patches/0.24.5-cmake-cxx-standard-pic.patch b/packages/conan/recipes/openjph/patches/0.24.5-cmake-cxx-standard-pic.patch new file mode 100644 index 00000000..17310980 --- /dev/null +++ b/packages/conan/recipes/openjph/patches/0.24.5-cmake-cxx-standard-pic.patch @@ -0,0 +1,13 @@ +diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt +index ea19aea..132a619 100644 +--- src/core/CMakeLists.txt ++++ src/core/CMakeLists.txt +@@ -135,7 +135,7 @@ if (BUILD_SHARED_LIBS AND WIN32) + endif() + + ## include library version/name +-set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON) ++#set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON) + target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64) + target_include_directories(openjph PUBLIC $ $) + diff --git a/packages/conan/recipes/openjph/test_package/CMakeLists.txt b/packages/conan/recipes/openjph/test_package/CMakeLists.txt new file mode 100644 index 00000000..9885973e --- /dev/null +++ b/packages/conan/recipes/openjph/test_package/CMakeLists.txt @@ -0,0 +1,13 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/5d3d03d17ad9f83e87f8cfc3b6a701352bb517cc/recipes/openjph/all/test_package/CMakeLists.txt + +cmake_minimum_required(VERSION 3.11) +project(test_package LANGUAGES CXX) + +find_package(openjph REQUIRED CONFIG) + +add_executable(${PROJECT_NAME} test_package.cpp) +target_link_libraries(${PROJECT_NAME} PRIVATE openjph::openjph) diff --git a/packages/conan/recipes/openjph/test_package/conanfile.py b/packages/conan/recipes/openjph/test_package/conanfile.py new file mode 100644 index 00000000..5b96e012 --- /dev/null +++ b/packages/conan/recipes/openjph/test_package/conanfile.py @@ -0,0 +1,31 @@ +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/5d3d03d17ad9f83e87f8cfc3b6a701352bb517cc/recipes/openjph/all/test_package/conanfile.py + +from conan import ConanFile +from conan.tools.build import can_run +from conan.tools.cmake import CMake, cmake_layout +import os + + +class TestPackageConan(ConanFile): + settings = "os", "arch", "compiler", "build_type" + generators = "CMakeToolchain", "CMakeDeps" + + def layout(self): + cmake_layout(self) + + def requirements(self): + self.requires(self.tested_reference_str) + + def build(self): + cmake = CMake(self) + cmake.configure() + cmake.build() + + def test(self): + if can_run(self): + bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package") + self.run(bin_path, env="conanrun") diff --git a/packages/conan/recipes/openjph/test_package/test_package.cpp b/packages/conan/recipes/openjph/test_package/test_package.cpp new file mode 100644 index 00000000..a77746a6 --- /dev/null +++ b/packages/conan/recipes/openjph/test_package/test_package.cpp @@ -0,0 +1,21 @@ +/* +# Copyright (c) Contributors to the conan-center-index Project. All rights reserved. +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: MIT +# +# From: https://github.com/conan-io/conan-center-index/blob/5d3d03d17ad9f83e87f8cfc3b6a701352bb517cc/recipes/openjph/all/test_package/test_package.cpp +*/ + +#include +#include + +#include + + +int main() { + // Print the version number but also do an API call to check the library + std::cout << "OpenJPH Version: " << OPENJPH_VERSION_MAJOR << '.' << OPENJPH_VERSION_MINOR << '.' << OPENJPH_VERSION_PATCH << std::endl; + std::cout << "CPU Extension level: " << ojph::get_cpu_ext_level() << std::endl; + + return EXIT_SUCCESS; +} diff --git a/packages/conan/recipes/openvdb/conandata.yml b/packages/conan/recipes/openvdb/conandata.yml index a25c0e46..dcd28161 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: + "13.0.0": + url: "https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v13.0.0.tar.gz" + sha256: "4d6a91df5f347017496fe8d22c3dbb7c4b5d7289499d4eb4d53dd2c75bb454e1" "12.1.1": url: "https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v12.1.1.tar.gz" sha256: "ccd0ea1669a53c7c13087a08ac5a1351041c4cdd308f6d6f591074a106fcb565" diff --git a/packages/conan/settings/profiles_aswf/vfx2024 b/packages/conan/settings/profiles_aswf/vfx2024 index 88f4f51a..bec8dafb 100644 --- a/packages/conan/settings/profiles_aswf/vfx2024 +++ b/packages/conan/settings/profiles_aswf/vfx2024 @@ -72,9 +72,10 @@ 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 -openexr/*: openexr/3.2.4@aswf/vfx2024 +openexr/*: openexr/3.2.5@aswf/vfx2024 opengl/*: opengl/system@aswf/vfx2024 openjpeg/*: openjpeg/2.4.0@aswf/vfx2024 +openjph/*: openjph/0.24.5@aswf/vfx2024 openssl/*: openssl/system@aswf/vfx2024 openvdb/*: openvdb/11.0.0@aswf/vfx2024 opus/*: opus/system@aswf/vfx2024 diff --git a/packages/conan/settings/profiles_aswf/vfx2025 b/packages/conan/settings/profiles_aswf/vfx2025 index 696f9f6e..d3fc0828 100644 --- a/packages/conan/settings/profiles_aswf/vfx2025 +++ b/packages/conan/settings/profiles_aswf/vfx2025 @@ -72,9 +72,10 @@ onetbb/*: onetbb/2021.13.0@aswf/vfx2025 openal-soft/*: openal-soft/system@aswf/vfx2025 opencl-headers/*: opencl-headers/system@aswf/vfx2025 opencl-icd-loader/*: opencl-icd-loader/system@aswf/vfx2025 -openexr/*: openexr/3.3.5@aswf/vfx2025 +openexr/*: openexr/3.3.6@aswf/vfx2025 opengl/*: opengl/system@aswf/vfx2025 openjpeg/*: openjpeg/2.4.0@aswf/vfx2025 +openjph/*: openjph/0.24.5@aswf/vfx2025 openssl/*: openssl/system@aswf/vfx2025 openvdb/*: openvdb/12.1.1@aswf/vfx2025 opus/*: opus/system@aswf/vfx2025 diff --git a/packages/conan/settings/profiles_aswf/vfx2026 b/packages/conan/settings/profiles_aswf/vfx2026 index 6fe1b1f6..df3ea332 100644 --- a/packages/conan/settings/profiles_aswf/vfx2026 +++ b/packages/conan/settings/profiles_aswf/vfx2026 @@ -74,11 +74,12 @@ onetbb/*: onetbb/2022.1.0@aswf/vfx2026 openal-soft/*: openal-soft/system@aswf/vfx2026 opencl-headers/*: opencl-headers/system@aswf/vfx2026 opencl-icd-loader/*: opencl-icd-loader/system@aswf/vfx2026 -openexr/*: openexr/3.4.2@aswf/vfx2026 +openexr/*: openexr/3.4.3@aswf/vfx2026 opengl/*: opengl/system@aswf/vfx2026 openjpeg/*: openjpeg/2.4.0@aswf/vfx2026 +openjph/*: openjph/0.24.5@aswf/vfx2026 openssl/*: openssl/system@aswf/vfx2026 -openvdb/*: openvdb/12.1.1@aswf/vfx2026 +openvdb/*: openvdb/13.0.0/vfx2026 opus/*: opus/system@aswf/vfx2026 pcre2/*: pcre2/system@aswf/vfx2026 ptex/*: ptex/2.4.3@aswf/vfx2026 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2024 b/packages/conan/settings/profiles_aswftesting/vfx2024 index 1c1538f7..5e0d962d 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2024 +++ b/packages/conan/settings/profiles_aswftesting/vfx2024 @@ -72,9 +72,10 @@ 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 -openexr/*: openexr/3.2.4@aswftesting/vfx2024 +openexr/*: openexr/3.2.5@aswftesting/vfx2024 opengl/*: opengl/system@aswftesting/vfx2024 openjpeg/*: openjpeg/2.4.0@aswftesting/vfx2024 +openjph/*: openjph/0.24.5@aswftesting/vfx2024 openssl/*: openssl/system@aswftesting/vfx2024 openvdb/*: openvdb/11.0.0@aswftesting/vfx2024 opus/*: opus/system@aswftesting/vfx2024 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2025 b/packages/conan/settings/profiles_aswftesting/vfx2025 index 87c654d7..e57af278 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2025 +++ b/packages/conan/settings/profiles_aswftesting/vfx2025 @@ -72,9 +72,10 @@ onetbb/*: onetbb/2021.13.0@aswftesting/vfx2025 openal-soft/*: openal-soft/system@aswftesting/vfx2025 opencl-headers/*: opencl-headers/system@aswftesting/vfx2025 opencl-icd-loader/*: opencl-icd-loader/system@aswftesting/vfx2025 -openexr/*: openexr/3.3.5@aswftesting/vfx2025 +openexr/*: openexr/3.3.6@aswftesting/vfx2025 opengl/*: opengl/system@aswftesting/vfx2025 openjpeg/*: openjpeg/2.4.0@aswftesting/vfx2025 +openjph/*: openjph/0.24.5@aswftesting/vfx2025 openssl/*: openssl/system@aswftesting/vfx2025 openvdb/*: openvdb/12.1.1@aswftesting/vfx2025 opus/*: opus/system@aswftesting/vfx2025 diff --git a/packages/conan/settings/profiles_aswftesting/vfx2026 b/packages/conan/settings/profiles_aswftesting/vfx2026 index 687cf0fc..cc30d4b7 100644 --- a/packages/conan/settings/profiles_aswftesting/vfx2026 +++ b/packages/conan/settings/profiles_aswftesting/vfx2026 @@ -74,11 +74,12 @@ onetbb/*: onetbb/2022.1.0@aswftesting/vfx2026 openal-soft/*: openal-soft/system@aswftesting/vfx2026 opencl-headers/*: opencl-headers/system@aswftesting/vfx2026 opencl-icd-loader/*: opencl-icd-loader/system@aswftesting/vfx2026 -openexr/*: openexr/3.4.2@aswftesting/vfx2026 +openexr/*: openexr/3.4.3@aswftesting/vfx2026 opengl/*: opengl/system@aswftesting/vfx2026 openjpeg/*: openjpeg/2.4.0@aswftesting/vfx2026 +openjph/*: openjph/0.24.5@aswftesting/vfx2026 openssl/*: openssl/system@aswftesting/vfx2026 -openvdb/*: openvdb/12.1.1@aswftesting/vfx2026 +openvdb/*: openvdb/13.0.0@aswftesting/vfx2026 opus/*: opus/system@aswftesting/vfx2026 pcre2/*: pcre2/system@aswftesting/vfx2026 ptex/*: ptex/2.4.3@aswftesting/vfx2026 diff --git a/python/aswfdocker/cli/aswfdocker.py b/python/aswfdocker/cli/aswfdocker.py index 6a7ac311..ed3cdb03 100644 --- a/python/aswfdocker/cli/aswfdocker.py +++ b/python/aswfdocker/cli/aswfdocker.py @@ -8,7 +8,6 @@ import logging import warnings import re -import subprocess import click from github import Github, Auth @@ -539,10 +538,9 @@ def pushoverview( @pass_build_info def conandiff(build_info, recipe, checkwrappers, branch): """Check for outdated conanfile.py files in packages/conan/recipes directory.""" - from aswfdocker import settings # Initialize GitHub client - s = settings.Settings() + s = aswf_settings.Settings() if s.github_access_token: auth = Auth.Token(s.github_access_token) g = Github(auth=auth) @@ -588,7 +586,7 @@ def conandiff(build_info, recipe, checkwrappers, branch): if not os.path.exists(conanfile_path): continue - with open(conanfile_path, "r") as f: + with open(conanfile_path, "r", encoding="utf-8") as f: content = f.read() # Skip system wrapper packages unless --checkwrappers is specified @@ -599,7 +597,10 @@ def conandiff(build_info, recipe, checkwrappers, branch): package_name = os.path.basename(recipe_dir) # Find SHA-1 hashes in URLs - sha_pattern = r"https://github.com/conan-io/conan-center-index/blob/([a-fA-F0-9]{40})/recipes/([^/]+)/all/conanfile\.py" + sha_pattern = ( + r"https://github.com/conan-io/conan-center-index/blob/" + r"([a-fA-F0-9]{40})/recipes/([^/]+)/all/conanfile\.py" + ) matches = re.findall(sha_pattern, content) if not matches: continue @@ -637,7 +638,7 @@ def conandiff(build_info, recipe, checkwrappers, branch): if newer_commits: found_outdated = True - click.secho(f"\nFound outdated conanfile.py:", fg="yellow") + click.secho("\nFound outdated conanfile.py:", fg="yellow") click.echo(f"{conanfile_path}:") click.echo(f" Package: {package_name}") click.echo(f" Current SHA: {permalink_sha}") diff --git a/python/aswfdocker/data/ci-image-dockerfile.jinja2 b/python/aswfdocker/data/ci-image-dockerfile.jinja2 index a3de03ae..e3763779 100644 --- a/python/aswfdocker/data/ci-image-dockerfile.jinja2 +++ b/python/aswfdocker/data/ci-image-dockerfile.jinja2 @@ -11,6 +11,7 @@ ARG CI_COMMON_VERSION ARG ASWF_CLANG_MAJOR_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD {% if name != "common" and name != "baseos-gl-conan" %} ARG ASWF_VFXPLATFORM_VERSION {% endif %} @@ -22,6 +23,9 @@ ARG {{ arg }} {% for package in packages + implicit_packages -%} ARG ASWF_{{package|upper|replace("-", "_")}}_VERSION {% endfor -%} +{% if name == "osl" or name == "usd" -%} +ARG ASWF_{{name|upper}}_VERSION +{% endif -%} {% for package in packages + implicit_packages -%} {% for arg in index.package_data(package).get("docker_args", []) -%} @@ -52,6 +56,7 @@ ARG ASWF_VERSION ARG CI_COMMON_VERSION ARG ASWF_PYSIDE_CLANG_VERSION ARG ASWF_CONAN_CHANNEL +ARG ASWF_CXX_STANDARD {% if name == "common" or name == "baseos-gl-conan" %} ARG ASWF_DTS_PREFIX @@ -64,6 +69,9 @@ ARG {{ arg }} {% for package in packages + implicit_packages -%} ARG ASWF_{{package|upper|replace("-", "_")}}_VERSION {% endfor -%} +{% if name == "osl" or name == "usd" -%} +ARG ASWF_{{name|upper}}_VERSION +{% endif -%} {% for package in packages + implicit_packages -%} {% for arg in index.package_data(package).get("docker_args", []) -%} @@ -92,6 +100,7 @@ ENV ASWF_ORG=${ASWF_ORG} ENV ASWF_VERSION=${ASWF_VERSION} ENV ASWF_INSTALL_PREFIX=/usr/local ENV ASWF_PYSIDE_CLANG_VERSION=${ASWF_PYSIDE_CLANG_VERSION} +ENV ASWF_CXX_STANDARD=${ASWF_CXX_STANDARD} {% if name != "common" and name != "baseos-gl-conan" %} @@ -107,6 +116,9 @@ ENV {{ arg }}=${{ arg }} {% for package in packages + implicit_packages -%} ENV ASWF_{{package|upper|replace("-", "_")}}_VERSION=$ASWF_{{package|upper|replace("-", "_")}}_VERSION {% endfor -%} +{% if name == "osl" or name == "usd" -%} +ENV ASWF_{{name|upper}}_VERSION=$ASWF_{{name|upper}}_VERSION +{% endif -%} {% for package in packages + implicit_packages -%} {% for arg in index.package_data(package).get("docker_args", []) -%} @@ -121,6 +133,9 @@ COPY --from=ci-package-{{ package }} /. /usr/local/ {% endfor -%} COPY ci-{{name}}/README.md ci-{{name}}/image.yaml /usr/local/aswf/ +{% if name != "common" and name != "baseos-gl-conan" and name != "base" and name != "baseqt" and name != "vfxall" %} +COPY scripts/vfx/build_{{name}}.sh /usr/local/aswf +{% endif -%} {{ docker_commands }} diff --git a/python/aswfdocker/data/versions.yaml b/python/aswfdocker/data/versions.yaml index 779ae695..f92d6646 100644 --- a/python/aswfdocker/data/versions.yaml +++ b/python/aswfdocker/data/versions.yaml @@ -179,7 +179,6 @@ versions: ASWF_CLANG_VERSION: "17.0.6" "5": major_version: "5" - tags: ["latest"] ci_common_version: "5" conan_profile: "ci_common5" package_versions: @@ -208,7 +207,6 @@ versions: "5-clang19": parent_versions: ["5"] major_version: "5" - tags: ["latest"] ci_common_version: "5" use_major_version_as_tag: true package_versions: @@ -216,7 +214,7 @@ versions: ASWF_CLANG_VERSION: "19.1.7" "6": major_version: "6" - tags: ["draft"] + tags: ["latest"] ci_common_version: "6" conan_profile: "ci_common6" package_versions: @@ -245,7 +243,7 @@ versions: "6-clang20": parent_versions: ["6"] major_version: "6" - tags: ["draft"] + tags: ["latest"] ci_common_version: "6" use_major_version_as_tag: true package_versions: @@ -593,6 +591,7 @@ versions: ASWF_MD4C_VERSION: "0.4.8" ASWF_MINIZIP_NG_VERSION: "4.0.10" ASWF_NLOHMANN_JSON_VERSION: "3.12.0" + ASWF_OPENJPH_VERSION: "0.24.5" ASWF_PARTIO_VERSION: "1.19.0" ASWF_PUGIXML_VERSION: "1.14" ASWF_PYBIND11_VERSION: "2.13.6" @@ -624,7 +623,7 @@ versions: ASWF_OCIO_CONFIGS_VERSION: "1.0_r2" ASWF_OCIO_VERSION: "2.3.2" ASWF_OIIO_VERSION: "2.5.19.0" - ASWF_OPENEXR_VERSION: "3.2.4" + ASWF_OPENEXR_VERSION: "3.2.5" ASWF_OPENFX_VERSION: "1.5s" ASWF_OPENRV_VERSION: "2.1.0" ASWF_OPENVDB_VERSION: "11.0.0" @@ -643,7 +642,6 @@ versions: "2025": parent_versions: ["5", "5-clang18"] major_version: "2025" - tags: ["latest"] ci_common_version: "5" conan_profile: "vfx2025" package_versions: @@ -728,6 +726,7 @@ versions: ASWF_MD4C_VERSION: "0.4.8" ASWF_MINIZIP_NG_VERSION: "4.0.10" ASWF_NLOHMANN_JSON_VERSION: "3.12.0" + ASWF_OPENJPH_VERSION: "0.24.5" ASWF_PARTIO_VERSION: "1.19.0" ASWF_PUGIXML_VERSION: "1.14" ASWF_PYBIND11_VERSION: "2.13.6" @@ -759,7 +758,7 @@ versions: ASWF_OCIO_CONFIGS_VERSION: "1.0_r2" ASWF_OCIO_VERSION: "2.4.2" ASWF_OIIO_VERSION: "3.1.6.2" - ASWF_OPENEXR_VERSION: "3.3.5" + ASWF_OPENEXR_VERSION: "3.3.6" ASWF_OPENFX_VERSION: "1.5s" ASWF_OPENRV_VERSION: "2.1.0" ASWF_OPENVDB_VERSION: "12.1.1" @@ -773,13 +772,12 @@ versions: "2025-clang19": parent_versions: ["5", "5-clang19", "2025"] major_version: "2025" - tags: ["latest"] use_major_version_as_tag: true ci_common_version: "5" "2026": parent_versions: ["6", "6-clang19"] major_version: "2026" - tags: ["draft"] + tags: ["latest"] ci_common_version: "6" conan_profile: "vfx2026" package_versions: @@ -864,6 +862,7 @@ versions: ASWF_MD4C_VERSION: "0.5.2" ASWF_MINIZIP_NG_VERSION: "4.0.10" ASWF_NLOHMANN_JSON_VERSION: "3.12.0" + ASWF_OPENJPH_VERSION: "0.24.5" ASWF_PARTIO_VERSION: "1.19.0" ASWF_PUGIXML_VERSION: "1.15" ASWF_PYBIND11_VERSION: "2.13.6" @@ -895,10 +894,10 @@ versions: ASWF_OCIO_CONFIGS_VERSION: "1.0_r2" ASWF_OCIO_VERSION: "2.5.0" ASWF_OIIO_VERSION: "3.1.6.2" - ASWF_OPENEXR_VERSION: "3.4.2" + ASWF_OPENEXR_VERSION: "3.4.3" ASWF_OPENFX_VERSION: "1.5s" ASWF_OPENRV_VERSION: "2.1.0" - ASWF_OPENVDB_VERSION: "12.1.1" + ASWF_OPENVDB_VERSION: "13.0.0" ASWF_OSL_VERSION: "1.14.7.0" ASWF_OTIO_VERSION: "0.17.0" ASWF_RAWTOACES_VERSION: "1.1.0" @@ -928,593 +927,597 @@ ci-packages: - "2-clang14.0" - "3-clang14.2" - "3-clang15.2" - - "4-clang16.4" - - "4-clang17.4" - - "5-clang18.3" - - "5-clang19.3" - - "6-clang19.1" - - "6-clang20.1" + - "4-clang16.5" + - "4-clang17.5" + - "5-clang18.4" + - "5-clang19.4" + - "6-clang19.2" + - "6-clang20.2" ninja: - "1.3" - "2.2" - "3.2" - - "4.4" - - "5.3" - - "6.1" + - "4.5" + - "5.4" + - "6.2" cmake: - "1.3" - "2.2" - "3.2" - - "4.4" - - "5.3" - - "6.1" + - "4.5" + - "5.4" + - "6.2" cpython: - "2019.2" - "2020.2" - "2021.2" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pybind11: - "2019.0" - "2020.0" - "2021.0" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" b2: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libbacktrace: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" boost: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" cppunit: - "2019.2" - "2020.2" - "2021.1" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" glew: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" glfw: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" log4cplus: - "2019.2" - "2020.2" - "2021.1" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" gtest: - "2019.0" - "2020.0" - "2021.0" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" qt: - "2019.2" - "2020.2" - "2021.2" - "2022.0" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pyside: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" c-blosc: - "2019.2" - "2020.2" - "2021.1" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" imath: - "2019.0" - "2020.0" - "2021.0" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openexr: - "2019.2" - "2020.2" - "2021.3" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.5" + - "2026.2" openfx: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" alembic: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ocio: - "2019.2" - "2020.2" - "2021.4" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" oiio: - "2019.2" - "2020.2" - "2021.4" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opensubdiv: - "2019.2" - "2020.2" - "2021.2" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ptex: - "2019.2" - "2020.2" - "2021.1" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openrv: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openvdb: - "2019.2" - "2020.2" - "2021.3" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" usd: - "2019.3" - "2020.2" - "2021.5" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" partio: - "2019.1" - "2020.1" - "2021.2" - "2022.2" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" osl: - "2019.1" - "2020.1" - "2021.3" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" otio: - "2019.1" - "2020.1" - "2021.3" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" rawtoaces: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" materialx: - "2019.0" - "2020.0" - "2021.0" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" expat: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" md4c: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" brotli: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" cimg: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" dbus: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" double-conversion: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" aces_container: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" bzip2: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ceres-solver: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" eigen: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" fmt: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" fontconfig: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" freetype: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" gdbm: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" giflib: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" glib: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" harfbuzz: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" hdf5: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" highway: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" icu: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" jasper: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" lcms: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libalsa: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libaom-av1: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libdeflate: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libdrm: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libffi: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libiconv: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libjpeg-turbo: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libjxl: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libmp3lame: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libpng: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libraw: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libsndfile: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libsquish: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libsvtav1: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libtiff: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libultrahdr: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libvpx: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libwebp: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libxcrypt: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" libxshmfence: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" lz4: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" minizip-ng: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" mpdecimal: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" mpg123: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" nasm: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" nlohmann_json: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" nspr: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" nss: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ogg: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" onetbb: - "2019.2" - "2020.2" - "2021.2" - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openal-soft: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opencl-headers: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opencl-icd-loader: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opengl: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openjpeg: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" + openjph: + - "2024.5" + - "2025.4" + - "2026.2" openssl: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opus: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pcre2: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pugixml: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pulseaudio: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" pystring: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" snappy: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" spdlog: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" sqlite3: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" tcl: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" tk: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" tsl-robin-map: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" util-linux-libuuid: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" vorbis: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" vulkan-headers: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" vulkan-loader: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" xkbcommon: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" xorg: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" xorg-proto: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" xz_utils: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" yaml-cpp: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" zlib: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" zstd: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ci-images: baseos-gl-conan: - - "4.4" - - "5.3" - - "6.1" + - "4.5" + - "5.4" + - "6.2" common: - "1-clang6.8" - "1-clang7.8" @@ -1528,97 +1531,101 @@ ci-images: - "2-clang14.0" - "3-clang14.2" - "3-clang15.2" - - "4-clang16.4" - - "4-clang17.4" - - "5-clang18.3" - - "5-clang19.3" - - "6-clang19.1" - - "6-clang20.1" + - "4-clang16.5" + - "4-clang17.5" + - "5-clang18.4" + - "5-clang19.4" + - "6-clang19.2" + - "6-clang20.2" base: - "2019.9" - "2020.9" - "2021.6" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" baseqt: - "2019.2" - "2020.2" - "2021.3" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" + imath: + - "2024.5" + - "2025.4" + - "2026.2" openexr: - "2019.8" - "2020.8" - "2021.5" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openfx: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" ocio: - "2019.9" - "2020.8" - "2021.6" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" oiio: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" opencue: - "2019.10" - "2020.10" - "2021.7" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" rawtoaces: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" usd: - "2019.9" - "2020.8" - "2021.6" - "2022.4" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" otio: - "2019.3" - "2020.3" - "2021.5" - "2022.3" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" materialx: - "2022.1" - "2023.2" - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" openrv: - - "2024.4" - - "2025.3" - - "2026.1" + - "2024.5" + - "2025.4" + - "2026.2" osl: - "2019-clang6.5" - "2019-clang7.5" @@ -1635,12 +1642,12 @@ ci-images: - "2022-clang14.1" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.4" - - "2024-clang17.4" - - "2025-clang18.3" - - "2025-clang19.3" - - "2026-clang19.1" - - "2026-clang20.1" + - "2024-clang16.5" + - "2024-clang17.5" + - "2025-clang18.4" + - "2025-clang19.4" + - "2026-clang19.2" + - "2026-clang20.2" openvdb: - "2019-clang6.8" - "2019-clang7.8" @@ -1655,12 +1662,12 @@ ci-images: - "2022-clang14.2" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.4" - - "2024-clang17.4" - - "2025-clang18.3" - - "2025-clang19.3" - - "2026-clang19.1" - - "2026-clang20.1" + - "2024-clang16.5" + - "2024-clang17.5" + - "2025-clang18.4" + - "2025-clang19.4" + - "2026-clang19.2" + - "2026-clang20.2" vfxall: - "2019-clang6.12" - "2019-clang7.12" @@ -1675,12 +1682,12 @@ ci-images: - "2022-clang14.3" - "2023-clang14.2" - "2023-clang15.2" - - "2024-clang16.4" - - "2024-clang17.4" - - "2025-clang18.3" - - "2025-clang19.3" - - "2026-clang19.1" - - "2026-clang20.1" + - "2024-clang16.5" + - "2024-clang17.5" + - "2025-clang18.4" + - "2025-clang19.4" + - "2026-clang19.2" + - "2026-clang20.2" groups: package: @@ -1789,6 +1796,7 @@ groups: - jasper - lcms - libultrahdr + - openjph - opensubdiv - partio - ptex @@ -1823,6 +1831,7 @@ groups: - base - baseqt vfx1: + - imath - opencue - openexr - openfx @@ -1928,6 +1937,7 @@ conan_only: - openfx - opengl - openjpeg + - openjph - openssl - opensubdiv - openvdb diff --git a/scripts/vfx/build_opencue.sh b/scripts/vfx/build_opencue.sh new file mode 100755 index 00000000..2c4b5346 --- /dev/null +++ b/scripts/vfx/build_opencue.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Copyright (c) Contributors to the aswf-docker Project. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +set -ex + +# This is a only a placeholder script diff --git a/scripts/vfx/build_rawtoaces.sh b/scripts/vfx/build_rawtoaces.sh index 8792e5a0..cef06413 100755 --- a/scripts/vfx/build_rawtoaces.sh +++ b/scripts/vfx/build_rawtoaces.sh @@ -7,7 +7,7 @@ set -ex mkdir rawtoaces cd rawtoaces -if [ ! -f "$DOWNLOADS_DIR/ptex-${ASWF_RAWTOACES_VERSION}.tar.gz" ]; then +if [ ! -f "$DOWNLOADS_DIR/rawtoaces-${ASWF_RAWTOACES_VERSION}.tar.gz" ]; then 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