Cherry-pick a jpegli fix for DHT marker
This commit is contained in:
@@ -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 \
|
RUN git clone -b v0.11.1 --depth=1 https://github.com/libjxl/libjxl.git \
|
||||||
&& cd libjxl \
|
&& cd libjxl \
|
||||||
&& git submodule update --init --recursive --depth=1 third_party/libjpeg-turbo \
|
&& 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 . \
|
&& cmake -B build . \
|
||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DBUILD_TESTING=OFF \
|
-DBUILD_TESTING=OFF \
|
||||||
|
|||||||
@@ -344,6 +344,9 @@ parts:
|
|||||||
- -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
|
- -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
|
||||||
- -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
|
- -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
|
||||||
- -DJPEGXL_FORCE_SYSTEM_HWY=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: |
|
override-build: |
|
||||||
craftctl default
|
craftctl default
|
||||||
cp lib/libjpegli-static.a "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
|
cp lib/libjpegli-static.a "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
|
||||||
|
|||||||
Reference in New Issue
Block a user