Skip to content

Commit 692bcb6

Browse files
lgritzlgritz
committed
deps: Raise OpenColorIO minimum to 2.3 (#4865)
Signed-off-by: Larry Gritz <[email protected]>
1 parent 3a2cf01 commit 692bcb6

File tree

5 files changed

+23
-213
lines changed

5 files changed

+23
-213
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fail-fast: false
4848
matrix:
4949
include:
50-
- desc: VP2022 gcc9/C++17 py39 exr3.1 ocio2.1
50+
- desc: VP2022 gcc9/C++17 py39 exr3.1 ocio2.3
5151
nametag: linux-vfx2022
5252
runner: ubuntu-latest
5353
container: aswf/ci-osl:2022-clang11
@@ -57,9 +57,10 @@ jobs:
5757
python_ver: 3.9
5858
simd: "avx2,f16c"
5959
fmt_ver: 8.1.1
60+
opencolorio_ver: v2.3.0
6061
pybind11_ver: v2.9.0
6162
setenvs: export FREETYPE_VERSION=VER-2-12-0
62-
- desc: VP2022 clang13/C++17 py39 avx2 exr3.1 ocio2.1
63+
- desc: VP2022 clang13/C++17 py39 avx2 exr3.1 ocio2.3
6364
nametag: linux-vfx2022.clang13
6465
runner: ubuntu-latest
6566
container: aswf/ci-osl:2022-clang13
@@ -68,12 +69,13 @@ jobs:
6869
cc_compiler: clang
6970
cxx_compiler: clang++
7071
cxx_std: 17
72+
opencolorio_ver: v2.3.2
73+
pybind11_ver: v2.8.1
7174
python_ver: 3.9
7275
simd: "avx2,f16c"
7376
fmt_ver: 9.1.0
74-
pybind11_ver: v2.8.1
7577
setenvs: export FREETYPE_VERSION=VER-2-12-0
76-
- desc: oldest gcc9.3/C++17 py3.9 exr-3.1
78+
- desc: oldest gcc9.3/C++17 py3.9 exr3.1 ocio2.3
7779
# Oldest versions of the dependencies that we support.
7880
nametag: linux-oldest
7981
runner: ubuntu-latest
@@ -82,7 +84,7 @@ jobs:
8284
old_node: 1
8385
cxx_std: 17
8486
fmt_ver: 7.0.1
85-
opencolorio_ver: v2.2.1
87+
opencolorio_ver: v2.3.0
8688
openexr_ver: v3.1.0
8789
pybind11_ver: v2.7.0
8890
python_ver: 3.9
@@ -102,7 +104,7 @@ jobs:
102104
old_node: 1
103105
cxx_std: 17
104106
fmt_ver: 7.0.1
105-
opencolorio_ver: v2.2.1
107+
opencolorio_ver: v2.3.0
106108
openexr_ver: v3.1.0
107109
pybind11_ver: v2.7.0
108110
python_ver: 3.9
@@ -250,20 +252,21 @@ jobs:
250252
fail-fast: false
251253
matrix:
252254
include:
253-
- desc: VFX2023 gcc11/C++17 py3.10 exr3.1 ocio2.2
255+
- desc: VFX2023 gcc11/C++17 py3.10 exr3.1 ocio2.3
254256
nametag: linux-vfx2023
255257
runner: ubuntu-latest
256258
container: aswf/ci-osl:2023-clang15
259+
opencolorio_ver: v2.3.0
257260
python_ver: "3.10"
258261
simd: "avx2,f16c"
259262
fmt_ver: 10.1.1
260263
pybind11_ver: v2.10.0
261264
setenvs: export PUGIXML_VERSION=v1.13
262-
- desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
265+
- desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.3 qt5.15
263266
nametag: linux-vfx2023.icc
264267
runner: ubuntu-latest
265268
container: aswf/ci-osl:2023
266-
opencolorio_ver: v2.2.1
269+
opencolorio_ver: v2.3.0
267270
python_ver: "3.10"
268271
# simd: "avx2,f16c"
269272
fmt_ver: 7.1.3
@@ -275,18 +278,18 @@ jobs:
275278
DISABLE_libuhdr=1
276279
# For icc, use fp-model precise to eliminate needless LSB errors
277280
# that make test results differ from other platforms.
278-
- desc: VFX2023 icx/C++17 py3.10 exr3.1 ocio2.2 qt5.15
281+
- desc: VFX2023 icx/C++17 py3.10 exr3.1 ocio2.3 qt5.15
279282
nametag: linux-vfx2023.icx
280283
runner: ubuntu-latest
281284
container: aswf/ci-osl:2023
282285
cc_compiler: icx
283286
cxx_compiler: icpx
287+
opencolorio_ver: v2.3.0
284288
python_ver: "3.10"
285289
pybind11_ver: v2.10.0
286290
simd: "avx2,f16c"
287291
benchmark: 1
288292
setenvs: export USE_OPENVDB=0
289-
xOPENCOLORIO_CXX=g++
290293
UHDR_CMAKE_C_COMPILER=gcc
291294
UHDR_CMAKE_CXX_COMPILER=g++
292295
# Building libuhdr with icx results in test failures
@@ -295,6 +298,7 @@ jobs:
295298
nametag: linux-vfx2024
296299
runner: ubuntu-latest
297300
container: aswf/ci-oiio:2024.2
301+
opencolorio_ver: v2.3.2
298302
python_ver: "3.11"
299303
simd: "avx2,f16c"
300304
fmt_ver: 10.1.1
@@ -307,6 +311,7 @@ jobs:
307311
container: aswf/ci-oiio:2024.2
308312
cc_compiler: clang
309313
cxx_compiler: clang++
314+
opencolorio_ver: v2.3.2
310315
python_ver: "3.11"
311316
simd: "avx2,f16c"
312317
fmt_ver: 10.1.1
@@ -341,7 +346,7 @@ jobs:
341346
cc_compiler: clang
342347
cxx_compiler: clang++
343348
build_type: Debug
344-
opencolorio_ver: v2.3.2
349+
opencolorio_ver: v2.4.2
345350
python_ver: "3.11"
346351
ctest_test_timeout: "1200"
347352
setenvs: export SANITIZE=address,undefined
@@ -450,14 +455,14 @@ jobs:
450455
PUGIXML_VERSION=v1.14
451456
WEBP_VERSION=v1.4.0
452457

453-
- desc: clang15 C++17 avx2 exr3.1 ocio2.2
458+
- desc: clang15 C++17 avx2 exr3.1 ocio2.3
454459
nametag: linux-clang15
455460
runner: ubuntu-22.04
456461
cxx_compiler: clang++-15
457462
cc_compiler: clang-15
458463
cxx_std: 17
459464
fmt_ver: 10.1.1
460-
opencolorio_ver: v2.2.1
465+
opencolorio_ver: v2.3.0
461466
openexr_ver: v3.1.13
462467
pybind11_ver: v2.12.0
463468
python_ver: "3.10"

‎CHANGES.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ABI compatibility, but we do expect some behavior changes.
2626

2727
### New minimum dependencies and compatibility changes:
2828
* *Python*: 3.9 minimum (from 3.7) [#4830](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4830) (3.1.4.0)
29+
* *OpenColorIO*: 2.3 minimum (from 2.2) [#4865](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4865) (3.1.4.0)
2930

3031
### ⛰️ New features and public API changes:
3132
* *New image file format support:*
@@ -199,6 +200,7 @@ ABI compatibility, but we do expect some behavior changes.
199200
- *windows*: Include Windows version information on produced binaries [#4696](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4696) (by Jesse Yurkovich) (3.1.3.0)
200201
- windows + ARM64*: Add arm_neon.h include on Windows ARM64 with clang-cl [#4691](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4691) (by Anthony Roberts)
201202
- *build/windows*: Propagate CMAKE_MSVC_RUNTIME_LIBRARY [#4842](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4842) (3.1.4.0)
203+
* *deps*: Raise OpenColorIO minimum to 2.3 (from 2.2) [#4865](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4865) (3.1.4.0)
202204
* Testing and Continuous integration (CI) systems:
203205
- *tests*: Improve Ptex testing [#4573](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4573) (3.1.1.0)
204206
- *tests*: Better testing coverage of null image reader/writer [#4578](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4578) (3.1.1.0)

‎INSTALL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
2424
* Imath >= 3.1 (tested through 3.2 and main)
2525
* OpenEXR >= 3.1 (tested through 3.4 and main)
2626
* libTIFF >= 4.0 (tested through 4.7 and master)
27-
* OpenColorIO >= 2.2 (tested through 2.4 and main)
27+
* *OpenColorIO >= 2.3* (tested through 2.4 and main)
2828
* libjpeg >= 8 (tested through jpeg9e), or libjpeg-turbo >= 2.1 (tested
2929
through 3.1)
3030
* zlib >= 1.2.7 (tested through 1.3.1)

‎src/cmake/externalpackages.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ checked_find_package (Freetype
137137
DEFINITIONS USE_FREETYPE=1 )
138138

139139
checked_find_package (OpenColorIO REQUIRED
140-
VERSION_MIN 2.2
140+
VERSION_MIN 2.3
141141
VERSION_MAX 2.9
142142
)
143143
if (NOT OPENCOLORIO_INCLUDES)

0 commit comments

Comments
 (0)