Merge branch 'AcademySoftwareFoundation:main' into R3D

Author: 1div0

.github/ISSUE_TEMPLATE/build_problem.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**PLEASE DO NOT REPORT BUILD TROUBLES AS GITHUB "ISSUES" UNLESS YOU ARE RALLY SURE IT'S A BUG**
+**PLEASE DO NOT REPORT BUILD TROUBLES AS GITHUB "ISSUES" UNLESS YOU ARE REALLY SURE IT'S A BUG**
 
 The best way to get help with your build problems is to ask a question on the
 [oiio-dev developer mail list](https://lists.aswf.io/g/oiio-dev).

.github/workflows/ci.yml

@@ -251,30 +251,29 @@ jobs:
             fmt_ver: 7.1.3
             # icc MUST use this older FMT version
             pybind11_ver: v2.9.0
-            setenvs: export USE_ICC=1 USE_OPENVDB=0
+            setenvs: export USE_ICC=1 USE_OPENVDB=0 USE_OPENCV=0
                             OIIO_EXTRA_CPP_ARGS="-fp-model=precise"
                             FREETYPE_VERSION=VER-2-13-0
                             DISABLE_libuhdr=1
             # For icc, use fp-model precise to eliminate needless LSB errors
             # that make test results differ from other platforms.
             optional_deps_append: "LibRaw;Ptex;Qt6"
-          - desc: VFX2023 icx/C++17 py3.10 exr3.1 ocio2.3 qt5.15
+          - desc: VFX2025 icx/C++17 py3.11 exr3.3 ocio2.4 qt5.15
             nametag: linux-vfx2023.icx
             runner: ubuntu-latest
-            container: aswf/ci-osl:2023
+            container: aswf/ci-oiio:2025
             cc_compiler: icx
             cxx_compiler: icpx
-            opencolorio_ver: v2.3.0
-            python_ver: "3.10"
-            pybind11_ver: v2.10.0
+            fmt_ver: 11.2.0
+            python_ver: "3.11"
+            pybind11_ver: v2.13.6
             simd: "avx2,f16c"
             benchmark: 1
-            setenvs: export USE_OPENVDB=0
+            setenvs: export USE_OPENVDB=0 USE_OPENCV=0
                             UHDR_CMAKE_C_COMPILER=gcc
                             UHDR_CMAKE_CXX_COMPILER=g++
             # Building libuhdr with icx results in test failures
-            # so we force using gcc/g++.
-            optional_deps_append: "LibRaw;Ptex;Qt6"
+            optional_deps_append: "LibRaw;Ptex;openjph;Qt6"
           - desc: VFX2024 gcc11/C++17 py3.11 exr3.2 ocio2.3
             nametag: linux-vfx2024
             runner: ubuntu-latest
@@ -284,7 +283,6 @@ jobs:
             simd: "avx2,f16c"
             fmt_ver: 10.1.1
             pybind11_ver: v2.12.0
-            benchmark: 1
             setenvs: export PUGIXML_VERSION=v1.14
             optional_deps_append: "LibRaw"
           - desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3
@@ -298,7 +296,6 @@ jobs:
             simd: "avx2,f16c"
             fmt_ver: 10.1.1
             pybind11_ver: v2.12.0
-            benchmark: 1
             setenvs: export PUGIXML_VERSION=v1.14
             optional_deps_append: "LibRaw"
           - desc: VFX2025 gcc11/C++17 py3.11 exr3.3 ocio2.4
@@ -313,6 +310,31 @@ jobs:
             benchmark: 1
             setenvs: export PUGIXML_VERSION=v1.15
             optional_deps_append: "openjph;Qt6"
+          - desc: VFX2025 Debug gcc11/C++17 py3.11 exr3.3 ocio2.4
+            nametag: linux-vfx2025-debug
+            runner: ubuntu-latest
+            container: aswf/ci-oiio:2025
+            cxx_std: 17
+            build_type: Debug
+            python_ver: "3.11"
+            simd: "avx2,f16c"
+            fmt_ver: 11.2.0
+            pybind11_ver: v2.13.6
+            setenvs: export PUGIXML_VERSION=v1.15
+            optional_deps_append: "openjph;Qt6"
+          # - desc: VFX2025 Static gcc11/C++17 py3.11 exr3.3 ocio2.4
+          #   nametag: linux-vfx2025-static
+          #   runner: ubuntu-latest
+          #   container: aswf/ci-oiio:2025
+          #   cxx_std: 17
+          #   python_ver: "3.11"
+          #   simd: "avx2,f16c"
+          #   fmt_ver: 11.2.0
+          #   pybind11_ver: v2.13.6
+          #   benchmark: 1
+          #   setenvs: export PUGIXML_VERSION=v1.15
+          #                   BUILD_SHARED_LIBS=OFF
+          #   optional_deps_append: "openjph;Qt6"
           - desc: VFX2026 gcc14/C++20 py3.13 exr3.4 ocio2.4
             nametag: linux-vfx2026
             runner: ubuntu-latest
@@ -430,9 +452,9 @@ jobs:
             cc_compiler: gcc-13
             cxx_compiler: g++-13
             cxx_std: 20
-            fmt_ver: 12.0.0
+            fmt_ver: 12.1.0
             opencolorio_ver: v2.5.0
-            openexr_ver: v3.4.0
+            openexr_ver: v3.4.3
             pybind11_ver: v3.0.1
             python_ver: "3.12"
             simd: avx2,f16c
@@ -507,39 +529,15 @@ jobs:
             pybind11_ver: v2.12.0
             python_ver: "3.10"
             simd: avx2,f16c
-          - desc: debug gcc9/C++17, sse4.2, exr3.1
-            nametag: linux-gcc9-cpp17-debug
-            runner: ubuntu-22.04
-            cxx_compiler: g++-9
-            cxx_std: 17
-            build_type: Debug
-            python_ver: "3.10"
-            simd: sse4.2
-            openexr_ver: v3.1.13
-            pybind11_ver: v2.7.0
-            ctest_test_timeout: 1200
-            setenvs: export PUGIXML_VERSION=v1.9
-          - desc: static libs gcc9 C++17 exr3.1
-            nametag: linux-static
-            runner: ubuntu-22.04
-            cxx_compiler: g++-9
-            cxx_std: 17
-            openexr_ver: v3.1.13
-            python_ver: "3.10"
-            pybind11_ver: v2.7.0
-            setenvs: export BUILD_SHARED_LIBS=OFF
-            depcmds: |
-              sudo rm -rf /usr/local/include/OpenEXR
-              sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
           - desc: Linux ARM latest releases gcc14 C++20 py3.12 exr3.4 ocio2.4
             nametag: linux-arm-latest-releases
             runner: ubuntu-24.04-arm
             cc_compiler: gcc-14
             cxx_compiler: g++-14
             cxx_std: 20
-            fmt_ver: 12.0.0
+            fmt_ver: 12.1.0
             opencolorio_ver: v2.5.0
-            openexr_ver: v3.4.0
+            openexr_ver: v3.4.3
             pybind11_ver: v3.0.1
             python_ver: "3.12"
             setenvs: export LIBJPEGTURBO_VERSION=3.1.2
@@ -558,9 +556,9 @@ jobs:
             cc_compiler: clang-18
             cxx_compiler: clang++-18
             cxx_std: 20
-            fmt_ver: 12.0.0
-            opencolorio_ver: v2.4.2
-            openexr_ver: v3.4.0
+            fmt_ver: 12.1.0
+            opencolorio_ver: v2.5.0
+            openexr_ver: v3.4.3
             pybind11_ver: v3.0.1
             python_ver: "3.12"
             setenvs: export LIBJPEGTURBO_VERSION=3.1.2