diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md index d274d1e3..2ea3f4cf 100644 --- a/THIRD-PARTY-NOTICES.md +++ b/THIRD-PARTY-NOTICES.md @@ -25,6 +25,7 @@ used under the terms of the following licences: | libpng | [libpng License](https://github.com/pnggroup/libpng/blob/master/LICENSE) | | librsvg | LGPLv3 | | libtiff | [libtiff License](https://gitlab.com/libtiff/libtiff/blob/master/LICENSE.md) (BSD-like) | +| libultrahdr | Apache-2.0 License | | libvips | LGPLv3 | | libwebp | New BSD License | | libxml2 | MIT Licence | diff --git a/build/posix.sh b/build/posix.sh index 8e29732b..c9ef01f8 100755 --- a/build/posix.sh +++ b/build/posix.sh @@ -356,6 +356,22 @@ CFLAGS="${CFLAGS} -O3" meson setup _build --default-library=static --buildtype=r -Dexamples=false -Dtests=false meson install -C _build --tag devel +mkdir ${DEPS}/uhdr +$CURL https://github.com/google/libultrahdr/archive/v${VERSION_UHDR}.tar.gz | tar xzC ${DEPS}/uhdr --strip-components=1 +cd ${DEPS}/uhdr +# [PATCH] improper use of clamp macro +$CURL https://github.com/google/libultrahdr/commit/5ed39d67cd31d254e84ebf76b03d4b7bcc12e2f7.patch | patch -p1 +# [PATCH] Add ppc64le and s390x to recognized architectures +$CURL https://github.com/google/libultrahdr/pull/376.patch | patch -p1 +# Avoid architecture-specific compile flags +sed -i'.bak' '/add_compile_options(-[mf]/d' CMakeLists.txt +# Ensure install targets are enabled when cross-compiling +sed -i'.bak' 's/CMAKE_CROSSCOMPILING AND UHDR_ENABLE_INSTALL/FALSE/' CMakeLists.txt +CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" cmake -G"Unix Makefiles" \ + -DCMAKE_TOOLCHAIN_FILE=${ROOT}/Toolchain.cmake -DCMAKE_INSTALL_PREFIX=${TARGET} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=FALSE -DUHDR_BUILD_EXAMPLES=FALSE -DUHDR_MAX_DIMENSION=65500 ${WITHOUT_NEON:+-DUHDR_ENABLE_INTRINSICS=FALSE} +make install/strip + mkdir ${DEPS}/vips $CURL https://github.com/libvips/libvips/releases/download/v${VERSION_VIPS}/vips-${VERSION_VIPS}.tar.xz | tar xJC ${DEPS}/vips --strip-components=1 cd ${DEPS}/vips @@ -460,6 +476,7 @@ printf "{\n\ \"proxy-libintl\": \"${VERSION_PROXY_LIBINTL}\",\n\ \"rsvg\": \"${VERSION_RSVG}\",\n\ \"tiff\": \"${VERSION_TIFF}\",\n\ + \"uhdr\": \"${VERSION_UHDR}\",\n\ \"vips\": \"${VERSION_VIPS}\",\n\ \"webp\": \"${VERSION_WEBP}\",\n\ \"xml2\": \"${VERSION_XML2}\",\n\ diff --git a/check-latest-versions.sh b/check-latest-versions.sh index 0096fb4f..5f7504ca 100755 --- a/check-latest-versions.sh +++ b/check-latest-versions.sh @@ -48,6 +48,7 @@ version_latest "png" "$VERSION_PNG" "1705" version_latest "proxy-libintl" "$VERSION_PROXY_LIBINTL" "frida/proxy-libintl" version_latest "rsvg" "$VERSION_RSVG" "5420" "unstable" version_latest "tiff" "$VERSION_TIFF" "1738" +version_latest "uhdr" "$VERSION_UHDR" "375187" #version_latest "vips" "$VERSION_VIPS" "5097" # Temporarily disabled to allow version 8.18.0 to roll in version_latest "webp" "$VERSION_WEBP" "1761" version_latest "xml2" "$VERSION_XML2" "1783" diff --git a/versions.properties b/versions.properties index 6f10143c..8b68bb4c 100644 --- a/versions.properties +++ b/versions.properties @@ -21,6 +21,7 @@ VERSION_PNG=1.6.53 VERSION_PROXY_LIBINTL=0.5 VERSION_RSVG=2.61.3 VERSION_TIFF=4.7.1 +VERSION_UHDR=1.4.0 VERSION_VIPS=8.17.3 VERSION_WEBP=1.6.0 VERSION_XML2=2.15.1