From 0bdc2f4c3c1396cf70f0874cd54735ecce507e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Novomesk=C3=BD?= <52529860+novomesk@users.noreply.github.com> Date: Thu, 8 Sep 2022 23:19:08 +0200 Subject: [PATCH] kimageformats: upgrade libjxl (#8446) libjxl 0.6.x is becoming obsolete. libjxl 0.7.x has new API and it is going to replace the previous version soon. The JXL plug-in in kimageformats can be built against old or new libjxl. It would be good to start testing with the new one. --- projects/kimageformats/Dockerfile | 2 +- projects/kimageformats/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/kimageformats/Dockerfile b/projects/kimageformats/Dockerfile index f78b649c9..b160092c9 100644 --- a/projects/kimageformats/Dockerfile +++ b/projects/kimageformats/Dockerfile @@ -26,7 +26,7 @@ RUN git clone --depth 1 -b v3.4.0 https://aomedia.googlesource.com/aom RUN git clone --depth 1 -b v0.10.1 https://github.com/AOMediaCodec/libavif.git RUN git clone --depth 1 https://github.com/strukturag/libde265.git RUN git clone --depth 1 https://github.com/strukturag/libheif.git -RUN git clone --depth=1 --branch v0.6.x --recursive https://github.com/libjxl/libjxl.git +RUN git clone --depth=1 --branch v0.7.x --recursive https://github.com/libjxl/libjxl.git COPY build.sh $SRC COPY kimgio_fuzzer.cc $SRC WORKDIR kimageformats diff --git a/projects/kimageformats/build.sh b/projects/kimageformats/build.sh index 39b8f891a..73caa1d43 100644 --- a/projects/kimageformats/build.sh +++ b/projects/kimageformats/build.sh @@ -87,7 +87,7 @@ cd $SRC cd libjxl mkdir build cd build -CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR" cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DJPEGXL_BUNDLE_SKCMS=ON -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_OPENEXR=OFF -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_SKCMS=ON -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TOOLS=OFF .. +CXXFLAGS="$CXXFLAGS -DHWY_COMPILE_ONLY_SCALAR" cmake -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DJPEGXL_BUNDLE_SKCMS=ON -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_OPENEXR=OFF -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_ENABLE_SKCMS=ON -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_TOOLS=OFF .. make -j$(nproc) jxl-static jxl_threads-static cd $SRC