From dc4297c38da6bfabd9e6eb92d81a8b58893a42ca Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Wed, 26 May 2021 22:37:43 +0200 Subject: [PATCH] libvips: remove libjxl patch merged upstream (#5847) + update libjxl's git location. --- projects/libvips/Dockerfile | 2 +- projects/libvips/build.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/projects/libvips/Dockerfile b/projects/libvips/Dockerfile index b27ee898c..79c46e8b1 100644 --- a/projects/libvips/Dockerfile +++ b/projects/libvips/Dockerfile @@ -40,7 +40,7 @@ RUN git clone --depth 1 https://chromium.googlesource.com/webm/libwebp RUN git clone --depth 1 https://gitlab.com/libtiff/libtiff RUN git clone --depth 1 https://aomedia.googlesource.com/aom RUN git clone --depth 1 https://github.com/strukturag/libheif -RUN git clone --depth 1 --recursive https://gitlab.com/wg1/jpeg-xl.git +RUN git clone --depth 1 --recursive https://github.com/libjxl/libjxl.git WORKDIR libvips COPY build.sh $SRC/ diff --git a/projects/libvips/build.sh b/projects/libvips/build.sh index b03ea198d..031182733 100755 --- a/projects/libvips/build.sh +++ b/projects/libvips/build.sh @@ -145,13 +145,10 @@ make install popd # jpeg-xl (libjxl) -pushd $SRC/jpeg-xl +pushd $SRC/libjxl sed -i'.bak' "/add_subdirectory(tools)/d" CMakeLists.txt # Don't overwrite our linker flags sed -i'.bak' "/set(CMAKE_EXE_LINKER_FLAGS/{N;d;}" CMakeLists.txt -# Ensure pkg-config file is installed when -DJPEGXL_STATIC=1, see: -# https://gitlab.com/wg1/jpeg-xl/-/issues/224 -curl -Ls https://gist.github.com/kleisauke/d54b5e62367d20e66dd58ca19a2234c9/raw/1dfd4398de87e1997f21a216a1c28de730deb2d9/jpeg-xl-pkg-config.patch | patch -p1 || true cmake -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=$CC \