diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42bd8fa383..b64de2c1e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -305,10 +305,10 @@ jobs: # cc_compiler: gcc-13 # cxx_compiler: g++-13 cxx_std: 23 - fmt_ver: 12.1.0 - fmt_commit: 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f + fmt_ver: 12.2.0 + fmt_commit: 1be298e1bd68957e4cd352e1f676f00e07dcfb57 opencolorio_ver: v2.5.0 - openexr_ver: v3.4.3 + openexr_ver: v3.4.13 pybind11_ver: v3.0.2 python_ver: "3.12" simd: avx2,f16c @@ -320,7 +320,7 @@ jobs: LIBTIFF_VERSION=v4.7.1 OPENJPEG_VERSION=v2.5.4 PTEX_VERSION=v2.5.0 - PUGIXML_VERSION=v1.15 + PUGIXML_VERSION=v1.16 WEBP_VERSION=v1.6.0 FREETYPE_VERSION=VER-2-14-1 USE_OPENVDB=0 @@ -330,7 +330,7 @@ jobs: # Ensure we are testing all the deps we think we are. We would # like this test to have minimal missing dependencies. required_deps: all - optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;OpenVDB;R3DSDK' + optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;openjph;OpenVDB;R3DSDK' - desc: bleeding edge gcc16 C++26 py3.12 OCIO/libtiff/exr-main avx2 nametag: linux-bleeding-edge runner: ubuntu-24.04 @@ -372,6 +372,8 @@ jobs: cc_compiler: gcc-12 cxx_compiler: g++-12 cxx_std: 17 + fmt_ver: 12.1.0 + fmt_commit: 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f python_ver: "3.10" simd: avx2,f16c build_local_deps: all @@ -401,10 +403,10 @@ jobs: cc_compiler: gcc-14 cxx_compiler: g++-14 cxx_std: 20 - fmt_ver: 12.1.0 - fmt_commit: 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f + fmt_ver: 12.2.0 + fmt_commit: 1be298e1bd68957e4cd352e1f676f00e07dcfb57 opencolorio_ver: v2.5.0 - openexr_ver: v3.4.3 + openexr_ver: v3.4.13 pybind11_ver: v3.0.2 python_ver: "3.12" setenvs: export LIBJPEGTURBO_VERSION=3.1.2 @@ -413,7 +415,7 @@ jobs: LIBTIFF_VERSION=v4.7.1 OPENJPEG_VERSION=v2.5.4 PTEX_VERSION=v2.4.3 - PUGIXML_VERSION=v1.15 + PUGIXML_VERSION=v1.16 WEBP_VERSION=v1.6.0 FREETYPE_VERSION=VER-2-14-1 USE_OPENVDB=0 @@ -426,7 +428,7 @@ jobs: fmt_ver: 12.1.0 fmt_commit: 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f opencolorio_ver: v2.5.0 - openexr_ver: v3.4.3 + openexr_ver: v3.4.13 pybind11_ver: v3.0.2 python_ver: "3.12" setenvs: export LIBJPEGTURBO_VERSION=3.1.2 @@ -435,7 +437,7 @@ jobs: LIBTIFF_VERSION=v4.7.1 OPENJPEG_VERSION=v2.5.4 PTEX_VERSION=v2.4.3 - PUGIXML_VERSION=v1.15 + PUGIXML_VERSION=v1.16 WEBP_VERSION=v1.6.0 FREETYPE_VERSION=VER-2-14-1 USE_OPENVDB=0 diff --git a/INSTALL.md b/INSTALL.md index 68c1b4a6c4..944f22b157 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -29,7 +29,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * libjpeg >= 8 (tested through jpeg9e), or libjpeg-turbo >= 2.1 (tested through 3.1) * zlib >= 1.2.7 (tested through 1.3.2) - * **[fmtlib](https://github.com/fmtlib/fmt) >= 9.0** (tested through 12.1 and master). + * **[fmtlib](https://github.com/fmtlib/fmt) >= 9.0** (tested through 12.2 and master). If not found at build time, this will be automatically downloaded and built. * [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, @@ -88,7 +88,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. tree, but if you want to use an external, system-installed version (as may be required by some software distributions with policies against embedding other projects), then just build with `-DUSE_EXTERNAL_PUGIXML=1`. - Any PugiXML >= 1.8 should be fine (we have tested through 1.15). + Any PugiXML >= 1.8 should be fine (we have tested through 1.16). diff --git a/src/cmake/build_fmt.cmake b/src/cmake/build_fmt.cmake index eedf707e1a..5df8f6add3 100644 --- a/src/cmake/build_fmt.cmake +++ b/src/cmake/build_fmt.cmake @@ -20,7 +20,7 @@ build_dependency_with_cmake(fmt GIT_COMMIT ${fmt_GIT_COMMIT} CMAKE_ARGS # -D CMAKE_INSTALL_LIBDIR=lib - # Don't built unnecessary parts of fmt + # Don't build unnecessary parts of fmt -D FMT_DOC=OFF -D FMT_TEST=OFF )