diff --git a/server/Dockerfile b/server/Dockerfile index 2146c7cc8d..4199cc89a7 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -13,7 +13,7 @@ mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-med # debian build for imagemagick has broken RAW support, so build manually ENV LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH ENV LD_RUN_PATH=/usr/local/lib:$LD_RUN_PATH -COPY bin/build-libraw.sh bin/build-imagemagick.sh bin/build-libvips.sh ./ +COPY bin/build-libraw.sh bin/build-imagemagick.sh bin/build-libvips.sh bin/use-camera-wb.patch ./ RUN ./build-libraw.sh RUN ./build-imagemagick.sh RUN ./build-libvips.sh diff --git a/server/bin/build-imagemagick.sh b/server/bin/build-imagemagick.sh index fea655ac49..e4a57a2118 100755 --- a/server/bin/build-imagemagick.sh +++ b/server/bin/build-imagemagick.sh @@ -13,6 +13,7 @@ sha256sum -c imagemagick.sha256 tar -xvf ${IMAGEMAGICK_VERSION}.tar.gz -C ImageMagick --strip-components=1 rm ${IMAGEMAGICK_VERSION}.tar.gz rm imagemagick.sha256 +patch -u ImageMagick/coders/dng.c -i use-camera-wb.patch cd ImageMagick ./configure --with-modules make -j$(nproc) diff --git a/server/bin/use-camera-wb.patch b/server/bin/use-camera-wb.patch new file mode 100755 index 0000000000..507afeb3e6 --- /dev/null +++ b/server/bin/use-camera-wb.patch @@ -0,0 +1,9 @@ +@@ -339,6 +339,8 @@ + option=GetImageOption(image_info,"dng:use_camera_wb"); + if (option != (const char *) NULL) + raw_info->params.use_camera_wb=IsStringTrue(option); ++ else ++ raw_info->params.use_camera_wb=MagickTrue; + option=GetImageOption(image_info,"dng:use-auto-wb"); + if (option == (const char *) NULL) + option=GetImageOption(image_info,"dng:use_auto_wb");