From bac80d9bbe1812641cf8a264401e5346b97d6659 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Sun, 22 Sep 2024 11:43:52 -0700 Subject: [PATCH] ci: various minor bumps for the 'latest' dependencies (#4437) Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 6 +++--- INSTALL.md | 6 +++--- src/build-scripts/build_Freetype.bash | 2 +- src/build-scripts/build_OpenJPEG.bash | 2 +- src/build-scripts/build_libjpeg-turbo.bash | 2 +- src/build-scripts/build_libraw.bash | 2 +- src/build-scripts/build_libtiff.bash | 2 +- src/cmake/build_libjpeg-turbo.cmake | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f076d1b87d..1df8eedab9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -331,7 +331,7 @@ jobs: simd: avx2,f16c setenvs: export LIBJPEGTURBO_VERSION=3.0.3 LIBRAW_VERSION=0.21.2 - LIBTIFF_VERSION=v4.6.0 + LIBTIFF_VERSION=v4.7.0 OPENJPEG_VERSION=v2.5.2 PTEX_VERSION=v2.4.3 PUGIXML_VERSION=v1.14 @@ -377,8 +377,8 @@ jobs: python_ver: "3.10" simd: avx2,f16c setenvs: export OpenImageIO_BUILD_LOCAL_DEPS=all - LIBJPEGTURBO_VERSION=3.0.1 - LIBRAW_VERSION=0.21.2 + LIBJPEGTURBO_VERSION=3.0.4 + LIBRAW_VERSION=0.21.3 OPENJPEG_VERSION=v2.4.0 PTEX_VERSION=v2.4.2 PUGIXML_VERSION=v1.14 diff --git a/INSTALL.md b/INSTALL.md index a6577a7220..edd473a619 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -22,8 +22,8 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * **CMake >= 3.15** (tested through 3.29) * **Imath >= 3.1** (tested through 3.1.x and main) * **OpenEXR >= 3.1** (tested through 3.2 and main) - * **libTIFF >= 4.0** (tested through 4.6) - * **OpenColorIO >= 2.2** (tested through 2.3) + * **libTIFF >= 4.0** (tested through 4.7) + * **OpenColorIO >= 2.2** (tested through 2.3 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 10.2). @@ -42,7 +42,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. * If you want support for PNG files: * **libPNG >= 1.6.0** (tested though 1.6.43) * If you want support for camera "RAW" formats: - * **LibRaw >= 0.20** (tested though 0.21.2) + * **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) * If you want support for jpeg 2000 images: diff --git a/src/build-scripts/build_Freetype.bash b/src/build-scripts/build_Freetype.bash index f14c351051..0f2e485433 100755 --- a/src/build-scripts/build_Freetype.bash +++ b/src/build-scripts/build_Freetype.bash @@ -11,7 +11,7 @@ set -ex # Repo and branch/tag/commit of Freetype to download if we don't have it yet FREETYPE_REPO=${FREETYPE_REPO:=https://github.com/freetype/freetype.git} -FREETYPE_VERSION=${FREETYPE_VERSION:=VER-2-13-2} +FREETYPE_VERSION=${FREETYPE_VERSION:=VER-2-13-3} # Where to put Freetype repo source (default to the ext area) LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext} diff --git a/src/build-scripts/build_OpenJPEG.bash b/src/build-scripts/build_OpenJPEG.bash index ae2bd7e05b..2aa013374e 100755 --- a/src/build-scripts/build_OpenJPEG.bash +++ b/src/build-scripts/build_OpenJPEG.bash @@ -11,7 +11,7 @@ set -ex # Repo and branch/tag/commit of OpenJPEG to download if we don't have it yet OPENJPEG_REPO=${OPENJPEG_REPO:=https://github.com/uclouvain/openjpeg.git} -OPENJPEG_VERSION=${OPENJPEG_VERSION:=v2.4.0} +OPENJPEG_VERSION=${OPENJPEG_VERSION:=v2.5.2} # Where to put OpenJPEG repo source (default to the ext area) LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext} diff --git a/src/build-scripts/build_libjpeg-turbo.bash b/src/build-scripts/build_libjpeg-turbo.bash index 37046840cf..bfa829db58 100755 --- a/src/build-scripts/build_libjpeg-turbo.bash +++ b/src/build-scripts/build_libjpeg-turbo.bash @@ -11,7 +11,7 @@ set -ex # Repo and branch/tag/commit of libjpeg-turbo to download if we don't have it yet LIBJPEGTURBO_REPO=${LIBJPEGTURBO_REPO:=https://github.com/libjpeg-turbo/libjpeg-turbo.git} -LIBJPEGTURBO_VERSION=${LIBJPEGTURBO_VERSION:=3.0.0} +LIBJPEGTURBO_VERSION=${LIBJPEGTURBO_VERSION:=3.0.4} # Where to put libjpeg-turbo repo source (default to the ext area) LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext} diff --git a/src/build-scripts/build_libraw.bash b/src/build-scripts/build_libraw.bash index 38159f0b99..1e6ea024e7 100755 --- a/src/build-scripts/build_libraw.bash +++ b/src/build-scripts/build_libraw.bash @@ -11,7 +11,7 @@ set -ex # Which LibRaw to retrieve, how to build it LIBRAW_REPO=${LIBRAW_REPO:=https://github.com/LibRaw/LibRaw.git} -LIBRAW_VERSION=${LIBRAW_VERSION:=0.21.2} +LIBRAW_VERSION=${LIBRAW_VERSION:=0.21.3} # Where to install the final results LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext} diff --git a/src/build-scripts/build_libtiff.bash b/src/build-scripts/build_libtiff.bash index ac1724bc2c..763fb4bc75 100755 --- a/src/build-scripts/build_libtiff.bash +++ b/src/build-scripts/build_libtiff.bash @@ -13,7 +13,7 @@ LIBTIFF_REPO=${LIBTIFF_REPO:=https://gitlab.com/libtiff/libtiff.git} LOCAL_DEPS_DIR=${LOCAL_DEPS_DIR:=${PWD}/ext} LIBTIFF_BUILD_DIR=${LIBTIFF_BUILD_DIR:=${LOCAL_DEPS_DIR}/libtiff} LIBTIFF_INSTALL_DIR=${LIBTIFF_INSTALL_DIR:=${PWD}/ext/dist} -LIBTIFF_VERSION=${LIBTIFF_VERSION:=v4.3.0} +LIBTIFF_VERSION=${LIBTIFF_VERSION:=v4.6.0} LIBTIFF_BUILD_TYPE=${LIBTIFF_BUILD_TYPE:=Release} if [[ `uname` == "Linux" ]] ; then LIBTIFF_CXX_FLAGS=${LIBTIFF_CXX_FLAGS:="-O3 -Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"} diff --git a/src/cmake/build_libjpeg-turbo.cmake b/src/cmake/build_libjpeg-turbo.cmake index 1404c8935e..4b2fa31de8 100644 --- a/src/cmake/build_libjpeg-turbo.cmake +++ b/src/cmake/build_libjpeg-turbo.cmake @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 # https://github.com/Academ SoftwareFoundation/OpenImageIO -set_cache (libjpeg-turbo_BUILD_VERSION 3.0.3 "libjpeg-turbo version for local builds") +set_cache (libjpeg-turbo_BUILD_VERSION 3.0.4 "libjpeg-turbo version for local builds") set (libjpeg-turbo_GIT_REPOSITORY "https://github.com/libjpeg-turbo/libjpeg-turbo") set (libjpeg-turbo_GIT_TAG "${libjpeg-turbo_BUILD_VERSION}") set_cache (libjpeg-turbo_BUILD_SHARED_LIBS OFF #${LOCAL_BUILD_SHARED_LIBS_DEFAULT}