From 13564fbc1711d9cb41a5e0b9b2073a221e4215b3 Mon Sep 17 00:00:00 2001 From: Mert <101130780+mertalev@users.noreply.github.com> Date: Sat, 12 Aug 2023 22:02:33 -0400 Subject: [PATCH] fix(server): build sharp without tiff (#3655) --- server/Dockerfile | 6 +++--- server/bin/build-libvips.sh | 2 +- server/build-lock.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index e5c6ecc4eb..2146c7cc8d 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -5,8 +5,8 @@ WORKDIR /usr/src/app COPY bin/install-ffmpeg.sh build-lock.json ./ RUN sed -i -e's/ main/ main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -yqq build-essential ninja-build meson pkg-config jq zlib1g autoconf \ -libglib2.0-dev libexpat1-dev librsvg2-dev libexif-dev libwebp-dev liborc-0.4-dev libtiff5-dev \ -libjpeg62-turbo-dev libgsf-1-dev libspng-dev libjxl-dev libheif-dev \ +libglib2.0-dev libexpat1-dev librsvg2-dev libexif-dev libwebp-dev liborc-0.4-dev \ +libjpeg62-turbo-dev libgsf-1-dev libspng-dev libjxl-dev libheif-dev liblcms2-2 \ mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-media-va-driver-non-free"; fi) \ && ./install-ffmpeg.sh && apt-get autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* @@ -38,7 +38,7 @@ WORKDIR /usr/src/app COPY bin/install-ffmpeg.sh build-lock.json ./ RUN sed -i -e's/ main/ main contrib non-free non-free-firmware/g' /etc/apt/sources.list.d/debian.sources RUN apt-get update && apt-get install -yqq tini libheif1 libwebp7 libwebpdemux2 libwebpmux3 mesa-va-drivers \ -libjpeg62-turbo libexpat1 librsvg2-2 libjxl0.7 libtiff6 libspng0 libexif12 libgcc-s1 libglib2.0-0 \ +libjpeg62-turbo libexpat1 librsvg2-2 libjxl0.7 libspng0 libexif12 libgcc-s1 libglib2.0-0 \ libgsf-1-114 libopenjp2-7 liblcms2-2 liborc-0.4-0 libopenexr-3-1-30 liblqr-1-0 libltdl7 zlib1g libgomp1 \ mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-media-va-driver-non-free"; fi) jq wget \ && ./install-ffmpeg.sh && apt-get remove -yqq jq wget && apt-get autoremove -yqq && apt-get clean && rm -rf /var/lib/apt/lists/* \ diff --git a/server/bin/build-libvips.sh b/server/bin/build-libvips.sh index 15ffa819b1..12d372ae0c 100755 --- a/server/bin/build-libvips.sh +++ b/server/bin/build-libvips.sh @@ -14,7 +14,7 @@ tar -xvf vips-${LIBVIPS_VERSION}.tar.xz -C libvips --strip-components=1 rm vips-${LIBVIPS_VERSION}.tar.xz rm libvips.sha256 cd libvips -meson setup build --buildtype=release --libdir=lib -Dintrospection=false +meson setup build --buildtype=release --libdir=lib -Dintrospection=disabled -Dtiff=disabled cd build # ninja test # tests set concurrency too high for arm/v7 ninja install diff --git a/server/build-lock.json b/server/build-lock.json index 76cf5f67fc..c173314972 100644 --- a/server/build-lock.json +++ b/server/build-lock.json @@ -12,8 +12,8 @@ }, { "name": "libvips", - "version": "8.14.2", - "sha256": "27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce" + "version": "8.14.3", + "sha256": "f884d61a6b54c99cdae855001c8b9523e13b4982be7e76cac03faccb91be105c" }, { "name": "ffmpeg",