Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump libvips to 8.15.2 #55

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,26 @@ rm -rf ./build/*.tar.gz
mkdir -p ./build/configurations
rm -rf ./build/configurations/*.log

STACK_VERSIONS=(20 22)
STACK_VERSIONS=(22)

for stack_version in "${STACK_VERSIONS[@]}"; do
image_name=libvips-heroku-$stack_version:$VIPS_VERSION

echo "Building ${image_name}"

docker build \
--build-arg VIPS_VERSION=${VIPS_VERSION} \
--build-arg STACK_VERSION=${stack_version} \
-t $image_name \
--build-arg "VIPS_VERSION=${VIPS_VERSION}" \
--build-arg "STACK_VERSION=${stack_version}" \
--platform linux/amd64 \
-t "${image_name}" \
-f "container/Dockerfile.heroku-$stack_version" \
container

mkdir -p build

docker run --rm -t -v $PWD/build:/build $image_name sh -c 'cp -f /usr/local/build/*.tar.gz /build && cp -f /usr/local/build/*.config.log /build/configurations'
docker run \
--rm -t \
--platform linux/amd64 \
-v "${PWD}/build:/build" "${image_name}" \
sh -c 'cp -f /usr/local/build/*.tar.gz /build && cp -f /usr/local/build/*.config.log /build/configurations'
done
42 changes: 0 additions & 42 deletions build/configurations/heroku-20.config.log

This file was deleted.

5 changes: 3 additions & 2 deletions build/configurations/heroku-22.config.log
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$ vips --vips-version
libvips 8.14.5
libvips 8.15.2

$ vips --vips-config
enable debug: false
Expand All @@ -11,6 +11,7 @@ enable Analyze7 load/save: false
enable PPM load/save: true
enable GIF load: true
use fftw for FFTs: true
SIMD support with highway: false
accelerate loops with ORC: true
ICC profile support with lcms: true
zlib: true
Expand All @@ -24,7 +25,7 @@ PNG load/save with libspng: true
PNG load/save with libpng: false
selected quantisation package: imagequant
TIFF load/save with libtiff: true
image pyramid save with libgsf: true
image pyramid save with libarchive: false
HEIC/AVIF load/save with libheif: true (dynamic module: false)
WebP load/save with libwebp: true
PDF load with PDFium: false
Expand Down
Binary file removed build/heroku-20.tar.gz
Binary file not shown.
Binary file modified build/heroku-22.tar.gz
Binary file not shown.
146 changes: 0 additions & 146 deletions container/Dockerfile.heroku-20

This file was deleted.

16 changes: 8 additions & 8 deletions container/Dockerfile.heroku-22
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG STACK_VERSION
FROM heroku/heroku:$STACK_VERSION
FROM heroku/heroku:${STACK_VERSION:-22}

ENV DEBIAN_FRONTEND noninteractive
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update \
&& apt-get install -y \
Expand All @@ -10,7 +10,7 @@ RUN apt-get update \
wget \
python3-pip \
ninja-build \
pkg-config
pkg-config

RUN pip3 install meson

Expand All @@ -19,7 +19,7 @@ RUN pip3 install meson
# see https://devcenter.heroku.com/articles/stack-packages
#
# libgsf needs libxml2
#
#
# this should only pull in header files and should not create any extra run
# time dependencies
RUN apt-get install -y \
Expand All @@ -46,8 +46,8 @@ RUN apt-get install -y \

WORKDIR /usr/local/src

# build to this prefix
# - heroku has /usr/local/lib on the default ld.so.conf search path, so
# build to this prefix
# - heroku has /usr/local/lib on the default ld.so.conf search path, so
# this is convenient
# - heroku has a basic dir structure in /usr/local, but no files
ARG PREFIX=/usr/local
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN wget ${VIPS_URL}/v${VIPS_VERSION}/v${VIPS_VERSION}.tar.gz \
# modules cause issues with loading heif files in ruby-vips \
-Dmodules=disabled \
# allows omitting gobject-introspection library \
-Dintrospection=false \
-Dintrospection=disabled \
&& cd build \
&& meson compile \
&& meson install
Expand Down Expand Up @@ -112,7 +112,7 @@ RUN cd $PREFIX \
&& vips --vips-config >> "build/heroku-$STACK_VERSION.config.log"

# install and test ruby-vips to confirm we can pick up the libraries
# correctly
# correctly
# we need ruby-dev to install ruby-ffi
RUN apt-get install -y ruby-dev
RUN gem install ruby-vips
Expand Down