Skip to content

Commit ac344c4

Browse files
jfpanissetjfpanisset
committed
re-release ci-oiio 2026.3 - 2025.5 - 2024.6
- All releases - Update GitHub action versions for [NodeJS 24](#350) - Update some Python dependencies - [Enable building iv for OpenImageIO](#357) to include Qt in ci-oiio, re-release ci-oiio 2026.3 / 2025.5 / 2024.6 images Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent fa500a2 commit ac344c4

12 files changed

Lines changed: 888 additions & 520 deletions

File tree

‎.github/workflows/docker-builds.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
test: ""
3434

3535
steps:
36-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3737

3838
- name: Activate Docker buildx
39-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
39+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
4040
with:
4141
driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
4242

4343
- name: Set up Python
44-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
44+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4545
with:
4646
python-version: 3.9
4747
cache: 'pipenv'

‎.github/workflows/python-sonar.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
13+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1414
- name: Set up Python
15-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
15+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
1616
with:
1717
python-version: 3.9
1818
cache: 'pipenv'

‎.github/workflows/python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121

2222
- name: Set up Python
23-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
23+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2424
with:
2525
python-version: 3.9
2626
cache: 'pipenv'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
push_description: false
2929

3030
steps:
31-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232

3333
- name: Activate Docker buildx
34-
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
34+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3535
with:
3636
driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
3737

3838
- name: Set up Python
39-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
39+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4040
with:
4141
python-version: 3.9
4242
cache: 'pipenv'

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
# 2026-03-14
6+
7+
- All releases
8+
- Update GitHub action versions for [NodeJS 24](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/350)
9+
- Update some Python dependencies
10+
- [Enable building iv for OpenImageIO](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/357) to include Qt in ci-oiio, re-release ci-oiio 2026.3 / 2025.5 / 2024.6 images
11+
512
# 2026-02-24
613

714
2024.6 / 2025.5 / 2026.3 releases.

‎Pipfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ twine = "*"
2323
[packages]
2424
aswfdocker = {editable = true, path = "."}
2525
click = "*"
26+
setuptools = "*"
2627
pygithub = "*"
2728
pyyaml = "*"
2829
jinja2 = "*"

‎Pipfile.lock‎

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

‎packages/conan/recipes/oiio/conanfile.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class OpenImageIOConan(ConanFile):
7676
"with_libwebp": True,
7777
"with_libjxl": True,
7878
"with_libultrahdr": True,
79-
"with_iv": False, # ASWF: enable once we figure out why configure doesn't find Qt or OpenGL
79+
"with_iv": True,
8080
"with_python": True, # ASWF: build Python bindings
8181
"with_openjph": True, # ASWF: use OpenJPH since OpenEXR uses it
8282
}
@@ -151,7 +151,7 @@ def requirements(self):
151151
self.requires("libultrahdr/1.4.0")
152152
# TODO: R3DSDK dependency
153153
# TODO: Nuke dependency
154-
if self.options.with_iv:
154+
if self.options.with_iv:# ASWF: need Qt and OpenGL to build iv
155155
self.requires("opengl/system")
156156
self.requires("qt/6.8.3")
157157
if self.options.with_python: # ASWF: build Python bindings
@@ -214,11 +214,13 @@ def generate(self):
214214
tc.variables["USE_R3DSDK"] = False
215215
tc.variables["USE_NUKE"] = False
216216
tc.variables["USE_OPENGL"] = False
217-
tc.variables["USE_QT"] = False
217+
tc.variables["USE_QT"] = self.options.with_iv
218218
tc.variables["USE_LIBPNG"] = self.options.with_libpng
219219
tc.variables["USE_FREETYPE"] = self.options.with_freetype
220220
tc.variables["USE_LIBWEBP"] = self.options.with_libwebp
221221
tc.variables["USE_OPENJPEG"] = self.options.with_openjpeg
222+
if Version(self.version) < "2.6":
223+
tc.variables["CMAKE_CXX_STANDARD"] = self.settings.compiler.cppstd # ASWF: older OIIO versions need to be told compiler version
222224

223225
tc.generate()
224226
cd = CMakeDeps(self)
@@ -342,5 +344,16 @@ def package_info(self):
342344
if self.settings.os in ["Linux", "FreeBSD"]:
343345
self.cpp_info.components["OpenImageIO"].system_libs.extend(["dl", "m", "pthread"])
344346

347+
# ASWF: iv needs Qt and OpenGL, but we don't want force consummers of OpenImageIO libraries to need Qt
348+
if self.options.with_iv:
349+
iv = self.cpp_info.components["iv"]
350+
# no iv.libs, it is an executable, but we expose its bindir
351+
iv.bindirs = ["bin"]
352+
# Make sure consumers can locate the binary if needed
353+
iv.set_property("cmake_file_name", "OpenImageIO")
354+
iv.set_property("cmake_target_name", "OpenImageIO::iv")
355+
# Do NOT add "qt" (or Qt components) to the library components' requires
356+
iv.requires = ["qt::qt", "opengl::opengl"]
357+
345358
if not self.options.shared:
346359
self.cpp_info.components["OpenImageIO"].defines.append("OIIO_STATIC_DEFINE")

‎packages/conan/recipes/oiio/patches/2.5.19.0-cmake-targets.patch‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -286,14 +286,12 @@ index 6556cd2eb..b9c4cd958 100644
286286

287287
if (FFmpeg_FOUND OR FREETYPE_FOUND)
288288
checked_find_package (BZip2) # Used by ffmpeg and freetype
289-
@@ -273,8 +309,8 @@ endif()
290-
289+
@@ -274,7 +310,7 @@
291290
# Qt -- used for iv
292291
option (USE_QT "Use Qt if found" ON)
293-
-if (USE_QT)
292+
if (USE_QT)
294293
- checked_find_package (OpenGL) # used for iv
295-
+if (USE_OPENGL)
296-
+ checked_find_package (OpenGL REQUIRED) # used for iv
294+
+ set(OPENGL_FOUND TRUE) # used for iv
297295
endif ()
298296
if (USE_QT AND OPENGL_FOUND)
299297
checked_find_package (Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets)

‎packages/conan/recipes/oiio/patches/3.1.10.0-cmake-fmt.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@ diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake
22
index d99dd79ac..bfda2778a 100644
33
--- src/cmake/externalpackages.cmake
44
+++ src/cmake/externalpackages.cmake
5+
@@ -212,7 +212,7 @@
6+
# Qt -- used for iv
7+
option (USE_QT "Use Qt if found" ON)
8+
if (USE_QT)
9+
- checked_find_package (OpenGL) # used for iv
10+
+ set(OPENGL_FOUND TRUE) # used for iv
11+
endif ()
12+
if (USE_QT AND OPENGL_FOUND)
13+
checked_find_package (Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets)
514
@@ -238,7 +238,9 @@
615
VERSION_MIN 7.0
716
BUILD_LOCAL missing

0 commit comments

Comments
 (0)