Skip to content

Commit 8b6b6c2

Browse files
committed
OpenFX, Boost, CLANG
- OpenFX Conan recipe updated to the one from the OpenFX repo - test_package remains WIP - requirements bring in more system wrappers and dependent packages: - cimg - spdlog - opencl-headers, open-icd-loader - Boost dependencies updated - CCI recipe doesn't built Python bindings by default so BoostPython was missing depenedencies - couldn't make the dependency update script work, updated manually - LLVM / clang finds gcc install again - since LLVM / clang 18, our build wasn't finding gcc install frmo gcc-toolset-XX, thus missing out on updated libstdc++ - fixes OSL C++ 20 build on EL 8 - Qt now builds with Harfbuzz text shaping engine Signed-off-by: Jean-Francois Panisset <[email protected]>
1 parent 6c51152 commit 8b6b6c2

File tree

73 files changed

+1563
-817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1563
-817
lines changed

.github/workflows/docker-builds.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
--use-conan \
176176
--build-missing
177177
178-
- name: Build base2 system wrapper and dependency Conan packages for ci-baseqt image
178+
- name: Build base2 system wrapper Conan packages for ci-baseqt image
179179
run: |
180180
set -ex
181181
pipenv run aswfdocker \
@@ -185,6 +185,19 @@ jobs:
185185
build \
186186
--ci-image-type PACKAGE \
187187
--group base2-wrappers \
188+
--version ${{ matrix.version_noclang }} \
189+
--use-conan \
190+
--build-missing
191+
192+
- name: Build base2 system Conan packages for ci-baseqt image
193+
run: |
194+
set -ex
195+
pipenv run aswfdocker \
196+
--repo-uri $GITHUB_REPOSITORY \
197+
--source-branch $GITHUB_REF \
198+
--verbose \
199+
build \
200+
--ci-image-type PACKAGE \
188201
--group base2-1
189202
--version ${{ matrix.version_noclang }} \
190203
--use-conan \
@@ -231,7 +244,7 @@ jobs:
231244
--version ${{ matrix.version }} \
232245
--push NO
233246
234-
- name: Build vfx1 system wrapper and level 1 Conan packages
247+
- name: Build vfx1 system wrapper Conan packages
235248
run: |
236249
set -ex
237250
pipenv run aswfdocker \
@@ -241,6 +254,20 @@ jobs:
241254
build \
242255
--ci-image-type PACKAGE \
243256
--group vfx1-wrappers \
257+
--version ${{ matrix.version_noclang }} \
258+
--use-conan \
259+
--build-missing \
260+
--push NO
261+
262+
- name: Build vfx1 level 1 Conan packages
263+
run: |
264+
set -ex
265+
pipenv run aswfdocker \
266+
--repo-uri $GITHUB_REPOSITORY \
267+
--source-branch $GITHUB_REF \
268+
--verbose \
269+
build \
270+
--ci-image-type PACKAGE \
244271
--group vfx1-1 \
245272
--version ${{ matrix.version_noclang }} \
246273
--use-conan \

CHANGELOG.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ consumers of these new images.
1919
- Sonar Cloud 7.1.0.4889 (was 6.2.1.4610)
2020
- Alembic 1.8.8 (was 1.8.6)
2121
- Blosc 1.21.6 (was 1.21.5)
22+
- fmt 11.2.0 (was 11.1.4)
2223
- GLEW 2.2.0 (was 2.1.0)
2324
- GLFW 3.4 (was 3.3.8)
2425
- gtest 1.15.2 (was 1.14.0)
@@ -39,32 +40,38 @@ consumers of these new images.
3940
- Ninja 1.13.1 (was 1.12.1)
4041
- Sonar Cloud 7.1.0.4889 (was 6.2.1.4610)
4142
- LLVM 19.1.7 (was 19.1.1)
43+
- fmt 11.2.0 (was 11.1.4)
4244
- hdf5 1.14.6
4345
- lcms 2.17 (was 2.16)
4446
- minizip-ng 4.0.10 (was 4.0.8)
4547
- opensubdiv 3.6.1 (was 3.6.0)
4648
- python 3.11.13 (was 3.11.11)
4749
- Qt 6.5.6 (was 6.5.4)
48-
- OIIO 3.0.8.1 (was 3.0.6.1)
50+
- OIIO 3.0.9.0 (was 3.0.6.1)
4951
- OpenEXR 3.3.5 (was 3.3.3)
5052
- OpenFX 1.5s
51-
- OSL 1.14.6.0 (was 1.14.5.1)
53+
- OpenVDB 12.0.1 (was 12.0.0)
54+
- OSL 1.14.7.0 (was 1.14.5.1)
5255
- PySide 6.5.6 (was 6.5.4)
5356
- USD 25.05.01 (was 25.05)
54-
- 2026.0
55-
- pre-release for testing purposes, does not yet include late releasing ASWF packages in final 2026 release (OOCIO, OpenEXR, OpenVDB)
57+
- 2026.0 draft images
58+
- pre-release for testing purposes, does not yet include final versions of late releasing packages for VFX Platform 2026 (OOCIO, OpenEXR, OpenVDB, OpenSubDiv)
59+
- OpenEXR includes a pre-release of 3.4.x
5660
- see `ci_common6` and `2026` sections of `versions.yaml` for full list of package versions
5761
- to minimize local changes against upstream Conan recipes and avoid spending time fighting build systems which hard code `lib` as the destination directory, all changes related to landing DSOs and support files in `lib64` are reverted
58-
- new Conan package and build images for OpenFX
59-
- new Conan package and build images for rawtoaces
62+
- new Conan package and build images for OpenFX based on conanfile.py from OpenFX repo (Conan Center Index has older version)
63+
- adds dependant Conan package cimg
64+
- new [Conan package and build images for rawtoaces](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/273)
6065
- adds dependant Conan packages libraw, jasper, jsonformoderncpp, ceres-solver, eigen , aces_container
6166
- Alembic now [built with hdf5 dependency](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/254)
6267
- OpenVDB now [built as a Conan package](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/231)
63-
- OpenImageIO builds with libraw support](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/264), [Python bindings](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/272) and OpenJPEG/JPEG2000 support
68+
- OpenImageIO builds with libraw support](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/264) and OpenJPEG/JPEG2000 support
6469
- system wrapper Conan packages
6570
- improved wrapper packages no longer declare include directories and libraries they don't include
6671
- query container OS for installed system package version instead of hard coding (pkgconfig / rpm)
6772
- libuhdr Conan package renamed to libultrahdr and updated to match new Conan Center Index package
73+
- blosc Conan package renamed to c-blosc to match Conan Center Index
74+
- Qt now built against harfbuzz text shaping library from vendored Conan package
6875
- aswfdocker utility gets "conandiff" option to show upstream changes to vendored Conan Center Index recipes to help
6976
with keeping recipes up to date
7077
- merge upstream recipe changes, in particular changes for CMake 4 compatibility

ci-base/README.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-baseqt/README.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-materialx/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-ocio/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-oiio/README.md

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-opencue/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openexr/README.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci-openfx/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)