From 2e7ace705ca4f36eb4a4a87d027cbe1d25b7a422 Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Tue, 22 Oct 2024 11:05:54 +0200
Subject: [PATCH] Upgrade to libvips v8.16.0-rc2 (#255)

* cargo-c: ensure deterministic build
---
 LIBVIPS_VERSION                        | 2 +-
 build/lin.sh                           | 2 +-
 platforms/linux-arm64v8/Dockerfile     | 2 +-
 platforms/linux-armv6/Dockerfile       | 2 +-
 platforms/linux-ppc64le/Dockerfile     | 2 +-
 platforms/linux-s390x/Dockerfile       | 2 +-
 platforms/linux-x64/Dockerfile         | 2 +-
 platforms/linuxmusl-arm64v8/Dockerfile | 2 +-
 platforms/linuxmusl-x64/Dockerfile     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/LIBVIPS_VERSION b/LIBVIPS_VERSION
index 87b632ce..a52f900f 100644
--- a/LIBVIPS_VERSION
+++ b/LIBVIPS_VERSION
@@ -1 +1 @@
-8.16.0-rc1
+8.16.0-rc2
diff --git a/build/lin.sh b/build/lin.sh
index ef44c9e5..75389bc4 100755
--- a/build/lin.sh
+++ b/build/lin.sh
@@ -187,7 +187,7 @@ if [ "$DARWIN" = true ]; then
   if [ "$DARWIN_ARM" = true ]; then
     ${CARGO_HOME}/bin/rustup target add aarch64-apple-darwin
   fi
-  CFLAGS= cargo install cargo-c
+  CFLAGS= cargo install cargo-c --locked
 fi
 
 if [ "${PLATFORM%-*}" == "linuxmusl" ] || [ "$DARWIN" = true ]; then
diff --git a/platforms/linux-arm64v8/Dockerfile b/platforms/linux-arm64v8/Dockerfile
index e034dd09..14a8e104 100644
--- a/platforms/linux-arm64v8/Dockerfile
+++ b/platforms/linux-arm64v8/Dockerfile
@@ -49,7 +49,7 @@ RUN \
     --profile minimal \
     --default-host aarch64-unknown-linux-gnu \
     && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   ln -s /usr/bin/cmake3 /usr/bin/cmake && \
   pip3 install meson ninja packaging tomli
 
diff --git a/platforms/linux-armv6/Dockerfile b/platforms/linux-armv6/Dockerfile
index 2ea91fec..6c1b7352 100644
--- a/platforms/linux-armv6/Dockerfile
+++ b/platforms/linux-armv6/Dockerfile
@@ -37,7 +37,7 @@ RUN \
     --profile minimal \
     && \
   rustup target add arm-unknown-linux-gnueabihf && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   pip3 install meson tomli
 
 # Compiler settings
diff --git a/platforms/linux-ppc64le/Dockerfile b/platforms/linux-ppc64le/Dockerfile
index f2a30955..35d69fde 100644
--- a/platforms/linux-ppc64le/Dockerfile
+++ b/platforms/linux-ppc64le/Dockerfile
@@ -35,7 +35,7 @@ RUN \
     --profile minimal \
     && \
   rustup target add powerpc64le-unknown-linux-gnu && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   pip3 install meson tomli
 
 # Handy for debugging the compiled targets in Highway (hwy_list_targets)
diff --git a/platforms/linux-s390x/Dockerfile b/platforms/linux-s390x/Dockerfile
index d88981d3..b5881100 100644
--- a/platforms/linux-s390x/Dockerfile
+++ b/platforms/linux-s390x/Dockerfile
@@ -36,7 +36,7 @@ RUN \
     --profile minimal \
     && \
   rustup target add s390x-unknown-linux-gnu && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   pip3 install meson tomli
 
 # Handy for debugging the compiled targets in Highway (hwy_list_targets)
diff --git a/platforms/linux-x64/Dockerfile b/platforms/linux-x64/Dockerfile
index 1743ce63..83e41cb7 100644
--- a/platforms/linux-x64/Dockerfile
+++ b/platforms/linux-x64/Dockerfile
@@ -48,7 +48,7 @@ RUN \
     --no-modify-path \
     --profile minimal \
     && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   ln -s /usr/bin/cmake3 /usr/bin/cmake && \
   pip3 install meson ninja packaging tomli
 
diff --git a/platforms/linuxmusl-arm64v8/Dockerfile b/platforms/linuxmusl-arm64v8/Dockerfile
index 7ccc15e2..9f7dda6b 100644
--- a/platforms/linuxmusl-arm64v8/Dockerfile
+++ b/platforms/linuxmusl-arm64v8/Dockerfile
@@ -46,7 +46,7 @@ RUN \
     --profile minimal \
     && \
   rustup target add aarch64-unknown-linux-musl && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   pip3 install meson
 
 # Compiler settings
diff --git a/platforms/linuxmusl-x64/Dockerfile b/platforms/linuxmusl-x64/Dockerfile
index 31940da0..3fa55eca 100644
--- a/platforms/linuxmusl-x64/Dockerfile
+++ b/platforms/linuxmusl-x64/Dockerfile
@@ -43,7 +43,7 @@ RUN \
     --no-modify-path \
     --profile minimal \
     && \
-  cargo install cargo-c && \
+  cargo install cargo-c --locked && \
   pip3 install meson
 
 # Compiler settings