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>

Author: jfpanisset

.github/workflows/docker-builds.yml

@@ -33,15 +33,15 @@ jobs:
             test: ""
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Activate Docker buildx
-      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       with: 
         driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
 
     - name: Set up Python
-      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: 3.9
         cache: 'pipenv'

.github/workflows/python-sonar.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Set up Python
-      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: 3.9
         cache: 'pipenv'

.github/workflows/python.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Set up Python
-      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: 3.9
         cache: 'pipenv'

.github/workflows/release.yml

@@ -28,15 +28,15 @@ jobs:
             push_description: false
 
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Activate Docker buildx
-      uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+      uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       with:
         driver-opts: env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760
 
     - name: Set up Python
-      uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
       with:
         python-version: 3.9
         cache: 'pipenv'

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+# 2026-03-14
+
+- All releases
+  - Update GitHub action versions for [NodeJS 24](https://github.com/AcademySoftwareFoundation/aswf-docker/issues/350)
+  - Update some Python dependencies
+  - [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
+
 # 2026-02-24
 
 2024.6 / 2025.5 / 2026.3 releases.

Pipfile

@@ -23,6 +23,7 @@ twine = "*"
 [packages]
 aswfdocker = {editable = true, path = "."}
 click = "*"
+setuptools = "*"
 pygithub = "*"
 pyyaml = "*"
 jinja2 = "*"

Pipfile.lock

@@ -76,7 +76,7 @@ class OpenImageIOConan(ConanFile):
         "with_libwebp": True,
         "with_libjxl": True,
         "with_libultrahdr": True,
-        "with_iv": False, # ASWF: enable once we figure out why configure doesn't find Qt or OpenGL
+        "with_iv": True,
         "with_python": True, # ASWF: build Python bindings
         "with_openjph": True, # ASWF: use OpenJPH since OpenEXR uses it
     }
@@ -151,7 +151,7 @@ def requirements(self):
             self.requires("libultrahdr/1.4.0")
         # TODO: R3DSDK dependency
         # TODO: Nuke dependency
-        if self.options.with_iv:
+        if self.options.with_iv:# ASWF: need Qt and OpenGL to build iv
            self.requires("opengl/system")
            self.requires("qt/6.8.3")
         if self.options.with_python: # ASWF: build Python bindings
@@ -214,11 +214,13 @@ def generate(self):
         tc.variables["USE_R3DSDK"] = False
         tc.variables["USE_NUKE"] = False
         tc.variables["USE_OPENGL"] = False
-        tc.variables["USE_QT"] = False
+        tc.variables["USE_QT"] = self.options.with_iv
         tc.variables["USE_LIBPNG"] = self.options.with_libpng
         tc.variables["USE_FREETYPE"] = self.options.with_freetype
         tc.variables["USE_LIBWEBP"] = self.options.with_libwebp
         tc.variables["USE_OPENJPEG"] = self.options.with_openjpeg
+        if Version(self.version) < "2.6":
+          tc.variables["CMAKE_CXX_STANDARD"] = self.settings.compiler.cppstd # ASWF: older OIIO versions need to be told compiler version
 
         tc.generate()
         cd = CMakeDeps(self)
@@ -342,5 +344,16 @@ def package_info(self):
         if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.components["OpenImageIO"].system_libs.extend(["dl", "m", "pthread"])
 
+        # ASWF: iv needs Qt and OpenGL, but we don't want force consummers of OpenImageIO libraries to need Qt
+        if self.options.with_iv:
+            iv = self.cpp_info.components["iv"]
+            # no iv.libs, it is an executable, but we expose its bindir
+            iv.bindirs = ["bin"]
+            # Make sure consumers can locate the binary if needed
+            iv.set_property("cmake_file_name", "OpenImageIO")
+            iv.set_property("cmake_target_name", "OpenImageIO::iv")
+            # Do NOT add "qt" (or Qt components) to the library components' requires
+            iv.requires = ["qt::qt", "opengl::opengl"]
+
         if not self.options.shared:
             self.cpp_info.components["OpenImageIO"].defines.append("OIIO_STATIC_DEFINE")

packages/conan/recipes/oiio/conanfile.py

@@ -286,14 +286,12 @@ index 6556cd2eb..b9c4cd958 100644
 
  if (FFmpeg_FOUND OR FREETYPE_FOUND)
      checked_find_package (BZip2)   # Used by ffmpeg and freetype
-@@ -273,8 +309,8 @@ endif()
- 
+@@ -274,7 +310,7 @@
  # Qt -- used for iv
  option (USE_QT "Use Qt if found" ON)
--if (USE_QT)
+ if (USE_QT)
 -    checked_find_package (OpenGL)   # used for iv
-+if (USE_OPENGL)
-+    checked_find_package (OpenGL REQUIRED)   # used for iv
++    set(OPENGL_FOUND TRUE)   # used for iv
  endif ()
  if (USE_QT AND OPENGL_FOUND)
      checked_find_package (Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets)

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

@@ -2,6 +2,15 @@ diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake
 index d99dd79ac..bfda2778a 100644
 --- src/cmake/externalpackages.cmake
 +++ src/cmake/externalpackages.cmake
+@@ -212,7 +212,7 @@
+ # Qt -- used for iv
+ option (USE_QT "Use Qt if found" ON)
+ if (USE_QT)
+-    checked_find_package (OpenGL)   # used for iv
++    set(OPENGL_FOUND TRUE)   # used for iv
+ endif ()
+ if (USE_QT AND OPENGL_FOUND)
+     checked_find_package (Qt6 COMPONENTS Core Gui Widgets OpenGLWidgets)
 @@ -238,7 +238,9 @@
                        VERSION_MIN 7.0
                        BUILD_LOCAL missing