Cherry-pick a jpegli fix for DHT marker

This commit is contained in:
Ilya Fedin
2025-12-22 14:50:33 +04:00
committed by John Preston
parent 632a14e65a
commit 6de7e7f4a8
2 changed files with 4 additions and 0 deletions

View File

@@ -294,6 +294,7 @@ COPY --link --from=highway /usr/src/highway-cache /
RUN git clone -b v0.11.1 --depth=1 https://github.com/libjxl/libjxl.git \
&& cd libjxl \
&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
&& curl -sSL https://github.com/libjxl/libjxl/commit/ee3955b1553bcc10304d45b85dfef9afa9349d72.patch | sed 's/offset + t/offset + i/' | git apply \
&& cmake -B build . \
-DBUILD_SHARED_LIBS=OFF \
-DBUILD_TESTING=OFF \

View File

@@ -344,6 +344,9 @@ parts:
- -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
- -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
- -DJPEGXL_FORCE_SYSTEM_HWY=ON
override-pull: |
craftctl default
curl -sSL https://github.com/libjxl/libjxl/commit/ee3955b1553bcc10304d45b85dfef9afa9349d72.patch | sed 's/offset + t/offset + i/' | git apply
override-build: |
craftctl default
cp lib/libjpegli-static.a "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a