From b7f26c28bec1974b3ea91038ed5c8987d66d1380 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sat, 27 Jan 2024 13:18:01 -0800 Subject: [PATCH] ci: Bump 'latest' test to newer dep versions, document Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 14 +++++++------- INSTALL.md | 16 ++++++++-------- src/cmake/externalpackages.cmake | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 480b61da45..70e0c7e0db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -283,17 +283,17 @@ jobs: cxx_compiler: g++-12 cxx_std: 17 fmt_ver: 10.1.1 - openexr_ver: v3.2.0 + openexr_ver: v3.2.1 pybind11_ver: v2.11.1 python_ver: "3.10" simd: avx2,f16c - setenvs: export LIBJPEGTURBO_VERSION=3.0.0 - LIBRAW_VERSION=0.20.2 - LIBTIFF_VERSION=v4.5.0 - OPENCOLORIO_VERSION=v2.3.0 + setenvs: export LIBJPEGTURBO_VERSION=3.0.1 + LIBRAW_VERSION=0.21.2 + LIBTIFF_VERSION=v4.6.0 + OPENCOLORIO_VERSION=v2.3.1 OPENJPEG_VERSION=v2.4.0 - PTEX_VERSION=v2.4.0 - PUGIXML_VERSION=v1.13 + PTEX_VERSION=v2.4.2 + PUGIXML_VERSION=v1.14 USE_OPENVDB=0 WEBP_VERSION=v1.3.0 # The installed OpenVDB has a TLS conflict with Python 3.8 diff --git a/INSTALL.md b/INSTALL.md index 5c89a97c4d..7e7ad229b4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,15 +18,15 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * The default build mode is C++17. This can be controlled by via the CMake configuration flag: `-DCMAKE_CXX_STANDARD=14`, etc. * ADVISORY: We expect that OIIO 2.6 in 2024 will require C++17 or higher. - * Compilers: gcc 6.1 - 13.1, clang 3.4 - 16, MSVS 2017 - 2019, + * Compilers: gcc 6.1 - 13.1, clang 3.4 - 17, MSVS 2017 - 2019, Intel icc 17+, Intel OneAPI C++ compiler 2022+. - * **CMake >= 3.15** (tested through 3.27) + * **CMake >= 3.15** (tested through 3.28) * **OpenEXR/Imath >= 2.4** (recommended: 3.1 or higher; tested through 3.2 and main) (ADVISORY: We expect that OIIO 2.6 in 2024 will require OpenEXR >= 3.1) * libTIFF >= 3.9 (recommended: 4.0+; tested through 4.6) * libjpeg >= 8 (tested through jpeg9e), or **libjpeg-turbo >= 2.1** (tested through 3.0) - * Boost >= 1.53 (recommended: at least 1.66; tested through 1.83) + * Boost >= 1.53 (recommended: at least 1.66; tested through 1.84) * **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 10.1). If not found at build time, this will be automatically downloaded unless the build sets `-DBUILD_MISSING_FMT=OFF`. @@ -42,10 +42,10 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. not support Python < 3.6.) * NumPy * If you want support for camera "RAW" formats: - * LibRaw >= 0.18 (tested though 0.21.1; if + * LibRaw >= 0.18 (tested though 0.21.2; if building with C++17 or higher, LibRaw >= 0.20 is necessary) * If you want support for a wide variety of video formats: - * ffmpeg >= 3.0 (tested through 6.0) + * ffmpeg >= 3.0 (tested through 6.1) * If you want support for jpeg 2000 images: * OpenJpeg >= 2.0 (tested through 2.5; we recommend 2.4 or higher for multithreading support) @@ -56,16 +56,16 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * 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 3.x, or 4.x (tested through 4.5) + * OpenCV 3.x, or 4.x (tested through 4.9) * If you want support for GIF images: * giflib >= 4.1 (tested through 5.2; 5.0+ is strongly recommended for stability and thread safety) * If you want support for HEIF/HEIC or AVIF images: - * libheif >= 1.3 (1.7 required for AVIF support, tested through 1.17) + * libheif >= 1.3 (1.7 required for AVIF support, tested through 1.17.6) * libheif must be built with an AV1 encoder/decoder for AVIF support. * Avoid libheif 1.10 on Mac, it is very broken. Libheif 1.11+ is fine. * If you want support for DICOM medical image files: - * DCMTK >= 3.6.1 (tested through 3.6.7) + * DCMTK >= 3.6.1 (tested through 3.6.8) * If you want support for WebP images: * WebP >= 0.6.1 (tested through 1.3.2) * If you want support for OpenColorIO color transformations: diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake index 9e722a7593..bf6bb57157 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake @@ -101,7 +101,7 @@ checked_find_package (TIFF REQUIRED checked_find_package (OpenEXR REQUIRED VERSION_MIN 2.4 RECOMMEND_MIN 3.1 - PRINT IMATH_INCLUDES OPENEXR_INCLUDES) + PRINT IMATH_INCLUDES OPENEXR_INCLUDES Imath_VERSION) # Force Imath includes to be before everything else to ensure that we have # the right Imath/OpenEXR version, not some older version in the system # library. This shouldn't be necessary, except for the common case of people