diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61b7012e37..a90c0a2bad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -260,6 +260,22 @@ jobs: setenvs: export OIIO_CMAKE_FLAGS="-DOIIO_BUILD_TOOLS=0 -DOIIO_BUILD_TESTS=0 -DUSE_PYTHON=0" USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0 USE_FREETYPE=0 optional_deps_append: "Qt6" + - desc: ABI check 3.1 + nametag: abi-check-3.1 + runner: ubuntu-latest + container: aswf/ci-oiio:2025.5 + build_type: RelWithDebInfo + fmt_ver: 11.1.4 + fmt_commit: 123913715afeb8a437e6388b4473fcc4753e1c9a + python_ver: "3.11" + pybind11_ver: v3.0.0 + simd: "avx2,f16c" + skip_tests: 1 + # abi_check: v3.1.17.0 -- make sure we don't break versus 3.1 + abi_check: 73bc189f7d8469a9760ce9c5099b686c77695074 + setenvs: export OIIO_CMAKE_FLAGS="-DOIIO_BUILD_TOOLS=0 -DOIIO_BUILD_TESTS=0 -DUSE_PYTHON=0" + USE_OPENCV=0 USE_FFMPEG=0 USE_PYTHON=0 USE_FREETYPE=0 + optional_deps_append: "Qt6" # diff --git a/CHANGES.md b/CHANGES.md index 7446659d6d..c6380e3edd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -346,13 +346,9 @@ call signatures. - *docs*: Update description for dwaCompressionLevel [#5074](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5074) (by @Aamir-Raza / Aamir Raza) (3.2.0.1, 3.1.12.0) - *docs*: Fix formatting examples for version macros [#5073](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5073) (3.2.0.1, 3.1.12.0) - *docs*: Keep TextureSystem docs in sync with ImageCache [#5085](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5085) (3.2.0.1, 3.1.12.0, 3.0.17.0) - - *docs*: Fix typos and incorrect attribute name in a comment [#5093](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5093) (3.2.0.1, 3.1.12.0, 3.0.17.0) + - *docs*: Assorted typo fixes in code comments and documentation. [#5093](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5093) [#5255](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5255) [#5222](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5222) [#5238](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5238) (by @luna-y-kim / Luna Kim) [#5349](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5349) (by @jinhgkim / Jinnie Kim) (3.2.0.3) - *docs*: Fix misstatement about oiiotool `--if` [#5102](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5102) (3.2.0.1, 3.1.12.0, 3.0.17.0) - - *docs*: Fix typos in fmath.h comments. [#5222](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5222) (by @luna-y-kim / Luna Kim) (3.2.0.3, 3.1.15.0, 3.0.20.0) - *docs*: Clarify plugin.h explanations by noting their Unix-like equivalents. [#5226](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5226) (3.2.0.3, 3.1.15.0) - - *docs*: Fix typos and update a reference link in deepdata comments. [#5238](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5238) (by @luna-y-kim / Luna Kim) (3.2.0.3, 3.1.15.0) - - *docs*: Fix typo in bitcast docs. [#5255](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5255) (3.2.0.3, 3.1.15.0) - - *docs*: Fix typos. [#5349](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5349) (by @jinhgkim / Jinnie Kim) (3.2.0.3, 3.1.16.0) - *docs*: Update the ImageCache docs now that IC is fully de-virtualized, remove leftover docs for the old ImageBufAlgo header API, and fix minor typos found along the way. [#5352](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5352) (by @luna-y-kim / Luna Kim) (3.2.0.3, 3.1.16.0) - *docs*: Fix vcpkg install command syntax in INSTALL.md (`vcpkg install openimageio[tools]`, no space). [#5332](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5332) (by @BrianHanke / Brian R Hanke) (3.2.0.3, 3.1.16.0) - *docs*: Convert the ImageCache chapter's doc example from hardcoded text into compiling C++ and Python tests, referenced from the docs via `literalinclude`. [#5341](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5341) (by @FaisalXL / Faisal) @@ -362,19 +358,36 @@ call signatures. ### 🏢 Project Administration - *admin*: Refinements to the issue and PR templates [#4982](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4982) [#4995](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4995) (3.2.0.0) - - *admin*: Draft policy on use of AI coding assistants [#5072](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5072) [#5116](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5116) (3.2.0.1, 3.1.12.0, 3.0.17.0) - - *admin*: Update security instructions to prefer GitHub security advisory for vulnerability reports [#5149](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5149) (3.2.0.1, 3.1.13.0, 3.0.18.0) - - *admin*: Add CVE-2024-55194 (long since fixed) to security alerts. [#5216](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5216) (3.2.0.3, 3.1.14.0) - - *admin*: Update security alerts and clarify security policy to explain what qualifies as a vulnerability. [#5232](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5232) (3.2.0.3, 3.1.14.1, 3.0.19.1) + - *admin*: Policy on use of AI coding assistants [#5072](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5072) [#5116](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5116) (3.2.0.1, 3.1.12.0, 3.0.17.0) + - *admin*: Updates to SECURITY.md policies and vulnerability reports [#5149](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5149) (3.2.0.1, 3.1.13.0, 3.0.18.0) [#5216](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5216) (3.2.0.3, 3.1.14.0) [#5232](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5232) (3.2.0.3, 3.1.14.1, 3.0.19.1) [#5320](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5320) [#5329](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5329) (3.2.0.3, 3.1.16.0, 3.0.21.0) - *admin*: Misc administrative docs fixups. [#5233](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5233) (3.2.0.3, 3.1.14.1) - - *admin*: Minor fixes to README & SECURITY, and update SECURITY with new CVE assignments. [#5320](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5320) [#5329](https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/5329) (3.2.0.3, 3.1.16.0, 3.0.21.0) ### 🤝 Contributors - - First-time contributors since the 3.1 major release (3.2 will be the first - major release to credit them): Aamir Raza, Brad Smith, Brian R Hanke, - Dongju Lee, Faisal, Hannah Gulka, Hunter, Jackson Sun, Jinnie Kim, Lumina - Wang, Luna Kim, Mixie, Nathan Gray, Nathan Rusch, Nick D'Ademo, Qi-fly, Shane Smith, Valery - Angelique, Wayne Arnold. + +During the course of development of 3.2 (since splitting from the 3.1 branch), +OpenImageIO has had 46 unique contributors, of which 21 (indicated by an +asterisk) made their first contribution to the project after the 3.1 release +(v3.1.6.1). Some of their patches also appear in 3.1.x or 3.0.x releases +because they were backported from main. + +| | | | +| ------------------- | ------------------- | -------------------- | +| Aamir Raza (*) | Alejandro Conty | Aleksandr Motsjonov | +| Alex Fuller | Anton Dukhovnikov | Asish Kumar (*) | +| Brad Smith | Brecht Van Lommel | Brian R Hanke (*) | +| Carine Touraille | Connie Chang | Danny Greenstein | +| Dongju Lee (*) | Faisal (*) | Hannah Gulka (*) | +| Hunter (*) | Jackson Sun (*) | Jesse Yurkovich | +| Jinnie Kim (*) | Jonathan Brown | Larry Gritz | +| Li Ji | Loïc Vital | Lumina Wang (*) | +| Luna Kim (*) | Marta Feriani (*) | Matt Van Horn (*) | +| Maxwell Iverson (*) | Mixie (*) | Nathan Gray (*) | +| Nathan Rusch | Nick D'Ademo (*) | Oktay Comu | +| omcaif | Pascal Lecocq | Pavan Madduri (*) | +| Peter Kovář | Qi-fly (*) | rose413 (*) | +| Shane Smith | Todica Ionut | Valery Angelique (*) | +| Vanessa Valderrama | Vlad (Kuzmin) Erium | Wayne Arnold | +| Zach Lewis | | | --- --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ff5eb724fb..88ce908f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required (VERSION 3.23.0...4.0) -set (OpenImageIO_VERSION "3.2.0.2") +set (OpenImageIO_VERSION "3.2.0.3") set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING "Version override (use with caution)!") mark_as_advanced (OpenImageIO_VERSION_OVERRIDE) @@ -19,12 +19,12 @@ project (OpenImageIO VERSION ${OpenImageIO_VERSION} set (PROJ_NAME OIIO) # short name, caps string (TOLOWER ${PROJ_NAME} PROJ_NAME_LOWER) # short name lower case string (TOUPPER ${PROJ_NAME} PROJ_NAME_UPPER) # short name upper case -set (PROJECT_VERSION_RELEASE_TYPE "dev" CACHE STRING +set (PROJECT_VERSION_RELEASE_TYPE "beta1" CACHE STRING "Build type, for example: dev, beta2, RC1 (empty string for normal release)") set (${PROJECT_NAME}_VERSION_RELEASE_TYPE ${PROJECT_VERSION_RELEASE_TYPE}) set (PROJECT_AUTHORS "Contributors to the OpenImageIO project") option (${PROJECT_NAME}_SUPPORTED_RELEASE - "Set ON for supported release branches, OFF for 'main'" OFF) + "Set ON for supported release branches, OFF for 'main'" ON) if (${PROJECT_NAME}_SUPPORTED_RELEASE) set (${PROJECT_NAME}_DEV_RELEASE OFF) else ()