Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mertalev committed Oct 7, 2024
1 parent ac51462 commit 710090d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 5 additions & 3 deletions server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ RUN ./configure-apt.sh && \

COPY bin/* ./

RUN ./build-libjxl.sh
RUN ./build-libheif.sh
RUN ./build-libraw.sh
RUN ./build-libjxl.sh
RUN ./build-imagemagick.sh
RUN ./build-libvips.sh
RUN ./install-ffmpeg.sh
Expand Down Expand Up @@ -73,6 +73,7 @@ RUN ./configure-apt.sh && \
libglib2.0-0 \
libgomp1 \
libgsf-1-114 \
# libjpeg62-turbo-dev is just for building libvips; the final image uses jpegli (/usr/local/lib/libjpeg.so.62) built alongside libjxl
libjpeg62-turbo \
liblcms2-2 \
liblqr-1-0 \
Expand All @@ -94,8 +95,8 @@ RUN ./configure-apt.sh && \
apt-get install -t testing --no-install-recommends -yqq \
libio-compress-brotli-perl \
libwebp7 \
libwebpdemux2 \
libwebpmux3 && \
libwebpmux3 \
libhwy1t64 && \
if [ $(arch) = "x86_64" ]; then \
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17193.4/intel-igc-core_1.0.17193.4_amd64.deb && \
wget https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.17193.4/intel-igc-opencl_1.0.17193.4_amd64.deb && \
Expand All @@ -107,6 +108,7 @@ RUN ./configure-apt.sh && \
apt-get remove -yqq jq wget ca-certificates && \
apt-get autoremove -yqq && \
apt-get clean && \
dpkg -r --force-depends libjpeg62-turbo && \
rm -rf \
configure-apt.sh \
install-ffmpeg.sh \
Expand Down
6 changes: 5 additions & 1 deletion server/bin/build-libjxl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ cmake \
-DJPEGXL_ENABLE_EXAMPLES=OFF \
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
-DJPEGXL_FORCE_SYSTEM_HWY=ON \
-DJPEGXL_ENABLE_JPEGLI=ON \
-DJPEGXL_ENABLE_JPEGLI=ON \
-DJPEGXL_ENABLE_JPEGLI_LIBJPEG=ON \
-DJPEGXL_INSTALL_JPEGLI_LIBJPEG=ON \
-DJPEGXL_ENABLE_AVX512=ON \
-DJPEGXL_ENABLE_AVX512_ZEN4=ON \
-DJPEGXL_ENABLE_PLUGINS=ON \
..
cmake --build . -- -j$(nproc)
Expand Down

0 comments on commit 710090d

Please sign in to comment.