Update libjxl and libheif on Linux

This commit is contained in:
Daniel Novomeský 2024-12-13 22:12:42 +01:00 committed by John Preston
parent cb443d797d
commit ee6dbdced6
2 changed files with 3 additions and 7 deletions

View file

@ -226,7 +226,7 @@ RUN git clone -b v1.0.4 --depth=1 {{ GIT }}/AOMediaCodec/libavif.git \
FROM builder AS libheif
COPY --link --from=libde265 {{ LibrariesPath }}/libde265-cache /
RUN git clone -b v1.17.6 --depth=1 {{ GIT }}/strukturag/libheif.git \
RUN git clone -b v1.18.2 --depth=1 {{ GIT }}/strukturag/libheif.git \
&& cd libheif \
&& cmake -GNinja -B build . \
-DCMAKE_BUILD_TYPE=None \
@ -252,9 +252,8 @@ COPY --link --from=lcms2 {{ LibrariesPath }}/lcms2-cache /
COPY --link --from=brotli {{ LibrariesPath }}/brotli-cache /
COPY --link --from=highway {{ LibrariesPath }}/highway-cache /
RUN git clone -b v0.10.3 --depth=1 {{ GIT }}/libjxl/libjxl.git \
RUN git clone -b v0.11.1 --depth=1 {{ GIT }}/libjxl/libjxl.git \
&& cd libjxl \
&& git apply ../patches/libjxl.patch \
&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
&& cmake -GNinja -B build . \
-DCMAKE_BUILD_TYPE=None \

View file

@ -254,7 +254,7 @@ parts:
libjxl:
source: https://github.com/libjxl/libjxl.git
source-depth: 1
source-tag: v0.10.3
source-tag: v0.11.1
plugin: cmake
build-environment:
- LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
@ -274,9 +274,6 @@ parts:
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_OPENEXR=OFF
- -DJPEGXL_ENABLE_SKCMS=OFF
override-pull: |
craftctl default
git apply $CRAFT_STAGE/patches/libjxl.patch
stage:
- -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libbrotli*
prime: