From 124af2808a5405c7b941b08234d159bbce104b8d Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 1 Nov 2022 11:26:05 -0500
Subject: [PATCH] docker: upgrade libvips to 8.13.3.

Followup to f9b7811f8. Better fix for #5323. libvips-8.13.3 has been
released so we can use that instead of compiling from HEAD.
---
 config/docker/build-base-image.sh | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh
index 7f6383bc6..20ef18684 100755
--- a/config/docker/build-base-image.sh
+++ b/config/docker/build-base-image.sh
@@ -3,7 +3,7 @@
 set -xeuo pipefail
 
 RUBY_VERSION="${RUBY_VERSION:-3.1.2}"
-VIPS_VERSION="${VIPS_VERSION:-c76d74be6}"
+VIPS_VERSION="${VIPS_VERSION:-8.13.3}"
 FFMPEG_VERSION="${FFMPEG_VERSION:-5.1.2}"
 MOZJPEG_VERSION="${MOZJPEG_VERSION:-4.1.1}"
 EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.42}"
@@ -59,26 +59,26 @@ install_mozjpeg() {
 install_vips() {
   apt_install $VIPS_BUILD_DEPS
 
-  #VIPS_URL="https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz"
-  #curl -L "$VIPS_URL" | tar -C /usr/local/src -xzvf -
-  #cd /usr/local/src/vips-${VIPS_VERSION}
+  VIPS_URL="https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz"
+  curl -L "$VIPS_URL" | tar -C /usr/local/src -xzvf -
+  cd /usr/local/src/vips-${VIPS_VERSION}
 
-  #./configure --disable-static
-  #CFLAGS="-O2" make -j "$(nproc)"
-  #make install
-  #ldconfig
-
-  mkdir /usr/local/src/libvips
-  cd /usr/local/src/libvips
-  git clone https://github.com/libvips/libvips.git .
-  git checkout $VIPS_VERSION
-
-  meson build --prefix /usr/local --buildtype release
-  cd build
-  meson compile
-  meson install
+  ./configure --disable-static
+  CFLAGS="-O2" make -j "$(nproc)"
+  make install
   ldconfig
 
+  #mkdir /usr/local/src/libvips
+  #cd /usr/local/src/libvips
+  #git clone https://github.com/libvips/libvips.git .
+  #git checkout $VIPS_VERSION
+
+  #meson build --prefix /usr/local --buildtype release
+  #cd build
+  #meson compile
+  #meson install
+  #ldconfig
+
   vips --version
 }