Merge branch 'AcademySoftwareFoundation:main' into R3D

Author: 1div0

.github/workflows/ci.yml

@@ -367,7 +367,7 @@ jobs:
             simd: "avx2,f16c"
             skip_tests: 1
             # abi_check: v2.6.2.0
-            abi_check: 889cf33b61e84025750bdc2c827608fe6157c834
+            abi_check: 730687ae79bb6c3290afff535aa0e98b0531d165
             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
 
@@ -397,16 +397,16 @@ jobs:
             cc_compiler: gcc-13
             cxx_compiler: g++-13
             cxx_std: 20
-            fmt_ver: 11.1.2
-            opencolorio_ver: v2.4.0
-            openexr_ver: v3.3.0
-            pybind11_ver: v2.13.5
+            fmt_ver: 11.1.4
+            opencolorio_ver: v2.4.2
+            openexr_ver: v3.3.3
+            pybind11_ver: v2.13.6
             python_ver: "3.12"
             simd: avx2,f16c
-            setenvs: export LIBJPEGTURBO_VERSION=3.0.3
-                            LIBRAW_VERSION=0.21.2
+            setenvs: export LIBJPEGTURBO_VERSION=3.1.0
+                            LIBRAW_VERSION=0.21.3
                             LIBTIFF_VERSION=v4.7.0
-                            OPENJPEG_VERSION=v2.5.2
+                            OPENJPEG_VERSION=v2.5.3
                             PTEX_VERSION=v2.4.3
                             PUGIXML_VERSION=v1.15
                             WEBP_VERSION=v1.5.0

.github/workflows/wheel.yml

@@ -383,6 +383,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
+          CMAKE_POLICY_VERSION_MINIMUM: 3.5
 
       - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:

CHANGES.md

@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 # https://github.com/AcademySoftwareFoundation/OpenImageIO
 
-cmake_minimum_required (VERSION 3.18.2)
+cmake_minimum_required (VERSION 3.18.2...4.0)
 
-set (OpenImageIO_VERSION "3.1.0.0")
+set (OpenImageIO_VERSION "3.1.1.0")
 set (OpenImageIO_VERSION_OVERRIDE "" CACHE STRING
      "Version override (use with caution)!")
 mark_as_advanced (OpenImageIO_VERSION_OVERRIDE)
@@ -170,6 +170,11 @@ message(STATUS "Joint namespace PROJ_NAMESPACE_V:       ${PROJ_NAMESPACE_V}")
 # defined for downstream projects using OIIO.
 add_compile_definitions (OIIO_INTERNAL=1)
 
+# If CMake variable OIIO_SITE is set, set compile symbol OIIO_SITE_sitename
+if (OIIO_SITE)
+    add_compile_definitions (OIIO_SITE_${OIIO_SITE})
+endif ()
+
 include (GNUInstallDirs)
 
 # Utilities for build instructions of the format-reading plugins
@@ -253,13 +258,6 @@ set (format_plugin_libs "")
 set (format_plugin_include_dirs "")
 set (format_plugin_definitions "")
 file (GLOB all_format_plugin_dirs src/*.imageio)
-if ("${OIIO_SITE}" STREQUAL "SPI")
-    # SPI only -- because of a workaround for a very weird linkage issue
-    # specific to our system, we need to be sure libtiff is referenced first.
-    file (GLOB tiff_format_plugin_dir src/tiff.imageio)
-    list (REMOVE_ITEM all_format_plugin_dirs ${tiff_format_plugin_dir})
-    list (INSERT all_format_plugin_dirs 0 ${tiff_format_plugin_dir})
-endif ()
 if (EMBEDPLUGINS AND NOT BUILD_OIIOUTIL_ONLY)
     foreach (plugin_dir ${all_format_plugin_dirs})
         add_subdirectory (${plugin_dir})

CMakeLists.txt

@@ -134,6 +134,7 @@ [email protected]
 * LazyDodo
 * Leonid Onokhov
 * Leszek Godlewski
+* Li Ji
 * Lucas Panian
 * Lucille Caillaud
 * Lukas Schrangl

CREDITS.md

@@ -14,62 +14,66 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
 
 ### Required dependencies -- OIIO will not build at all without these
 
- * **C++17 or higher** (also builds with C++20)
+ * C++17 or higher (also builds with C++20)
      * The default build mode is C++17. This can be controlled by via the
        CMake configuration flag: `-DCMAKE_CXX_STANDARD=20`, etc.
- * Compilers: **gcc 9.3** - 14.2, **clang 5** - 19, MSVS 2017 - 2019 (**v19.14
-   and up**), **Intel icc 19+**, Intel OneAPI C++ compiler 2022+.
- * **CMake >= 3.18.2** (tested through 3.31)
- * **Imath >= 3.1** (tested through 3.1.x and main)
- * **OpenEXR >= 3.1** (tested through 3.3 and main)
- * **libTIFF >= 4.0** (tested through 4.7)
- * **OpenColorIO >= 2.2** (tested through 2.4 and main)
- * libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested
-   through 3.0)
- * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 11.1).
+ * Compilers: gcc 9.3 - 14.2, clang 5 - 19, MSVS 2017 - 2019 (v19.14
+   and up), Intel icc 19+, Intel OneAPI C++ compiler 2022+.
+ * CMake >= 3.18.2 (tested through 4.0)
+ * Imath >= 3.1 (tested through 3.1.x and main)
+ * OpenEXR >= 3.1 (tested through 3.3 and main)
+ * libTIFF >= 4.0 (tested through 4.7)
+ * OpenColorIO >= 2.2 (tested through 2.4 and main)
+ * libjpeg >= 8 (tested through jpeg9e), or libjpeg-turbo >= 2.1 (tested
+   through 3.1)
+ * [fmtlib](https://github.com/fmtlib/fmt) >= 7.0 (tested through 11.1).
    If not found at build time, this will be automatically downloaded unless
    the build sets `-DBUILD_MISSING_FMT=OFF`.
+ * [Robin-map](https://github.com/Tessil/robin-map) (unknown minimum, tested
+   through 1.4, which is the recommended version). If not found at build time,
+   this will be automatically downloaded unless the build sets
+   `-DBUILD_MISSING_FMT=OFF`.
 
 ### Optional dependencies -- features may be disabled if not found
  * If you are building the `iv` viewer (which will be disabled if any of
    these are not found):
-     * Qt5 >= 5.6 (tested through 5.15) or Qt6 (tested through 6.7)
+     * Qt5 >= 5.6 (tested through 5.15) or Qt6 (tested through 6.8)
      * OpenGL
  * If you are building the Python bindings or running the testsuite:
-     * **Python >= 3.7** (tested through 3.13)
-     * **pybind11 >= 2.7** (tested through 2.12)
-     * NumPy
+     * Python >= 3.7 (tested through 3.13)
+     * pybind11 >= 2.7 (tested through 2.13)
+     * NumPy (tested through 2.2.4)
  * If you want support for PNG files:
-     * **libPNG >= 1.6.0** (tested though 1.6.47)
+     * libPNG >= 1.6.0 (tested though 1.6.47)
  * If you want support for camera "RAW" formats:
-     * **LibRaw >= 0.20** (tested though 0.21.3 and master)
+     * LibRaw >= 0.20 (tested though 0.21.3 and master)
  * If you want support for a wide variety of video formats:
-     * **ffmpeg >= 4.0** (tested through 7.0)
+     * ffmpeg >= 4.0 (tested through 7.0)
  * If you want support for jpeg 2000 images:
      * OpenJpeg >= 2.0 (tested through 2.5; we recommend 2.4 or higher
        for multithreading support)
  * If you want support for OpenVDB files:
-     * OpenVDB >= 9.0 (tested through 11.0). Note that using OpenVDB >= 10.0
+     * OpenVDB >= 9.0 (tested through 12.0). Note that using OpenVDB >= 10.0
        requires that you compile OIIO with C++17 or higher.
  * If you want to use TBB as the thread pool:
      * TBB >= 2018 (tested through 2021 and OneTBB)
  * If you want support for converting to and from OpenCV data structures,
    or for capturing images from a camera:
-     * **OpenCV 4.x** (tested through 4.10)
+     * OpenCV 4.x (tested through 4.11)
  * If you want support for GIF images:
-     * **giflib >= 5.0** (tested through 5.2)
+     * giflib >= 5.0 (tested through 5.2.2)
  * If you want support for HEIF/HEIC or AVIF images:
-     * **libheif >= 1.11** (1.16 required for correct orientation support,
-       tested through 1.18.2)
+     * libheif >= 1.11 (1.16 required for correct orientation support,
+       tested through 1.19.7)
      * libheif must be built with an AV1 encoder/decoder for AVIF support.
  * If you want support for DICOM medical image files:
      * DCMTK >= 3.6.1 (tested through 3.6.8)
  * If you want support for WebP images:
-     * **WebP >= 1.1** (tested through 1.5)
+     * WebP >= 1.1 (tested through 1.5)
  * If you want support for Ptex:
-     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.2)
+     * Ptex >= 2.3.1 (probably works for older; tested through 2.4.3)
  * If you want to be able to do font rendering into images:
-     * **Freetype >= 2.10.0** (tested through 2.13)
+     * Freetype >= 2.10.0 (tested through 2.13)
  * We use PugiXML for XML parsing. There is a version embedded in the OIIO
    tree, but if you want to use an external, system-installed version (as
    may be required by some software distributions with policies against

INSTALL.md

@@ -414,7 +414,7 @@ notes process be simpler and more automated.
 We have been using the [git-cliff](https://github.com/orhun/git-cliff) tool
 as the starting point for release notes. The command we use is:
 
-    git cliff -c src/doc/cliff.toml -d v1.2.3.4..HEAD > cliff.out.md
+    git cliff -c src/doc/cliff.toml v1.2.3.4..HEAD > cliff.out.md
 
 where v1.2.3.4 in this example is the tag of the last release. You could also
 use commit hashes to denote the range of changes you want to document.

docs/dev/RELEASING.md

@@ -20,6 +20,10 @@ FREETYPE_BUILD_DIR=${FREETYPE_BUILD_DIR:=${FREETYPE_SRC_DIR}/build}
 FREETYPE_INSTALL_DIR=${FREETYPE_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 FREETYPE_BUILD_TYPE=${FREETYPE_BUILD_TYPE:=Release}
 
+# Fix for freetype breaking against cmake 4.0 because of too-old cmake min.
+# Remove when freetype is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 pwd
 echo "Freetype install dir will be: ${FREETYPE_INSTALL_DIR}"
 

src/build-scripts/build_Freetype.bash

@@ -20,6 +20,10 @@ OPENJPEG_BUILD_DIR=${OPENJPEG_BUILD_DIR:=${OPENJPEG_SRC_DIR}/build}
 OPENJPEG_INSTALL_DIR=${OPENJPEG_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
 #OPENJPEG_CONFIG_OPTS=${OPENJPEG_CONFIG_OPTS:=}
 
+# Fix for openjpeg breaking against cmake 4.0 because of too-old cmake min.
+# Remove when openjpeg is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 pwd
 echo "OpenJPEG install dir will be: ${OPENJPEG_INSTALL_DIR}"
 

src/build-scripts/build_OpenJPEG.bash

@@ -28,6 +28,11 @@ OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
                        -DOCIO_BUILD_PYTHON=OFF -DOCIO_BUILD_PYGLUE=OFF \
                        -DOCIO_BUILD_JAVA=OFF \
                        -DBUILD_SHARED_LIBS=${OPENCOLORIO_BUILD_SHARED_LIBS:=ON}"
+
+# Fix yaml-cpp which breaks against cmake 4.0 because of too-old cmake min.
+# Remove when yaml-cpp is fixed to declare its own minimum high enough.
+export CMAKE_POLICY_VERSION_MINIMUM=3.5
+
 BASEDIR=`pwd`
 pwd
 echo "OpenColorIO install dir will be: ${OPENCOLORIO_INSTALL_DIR}"