Merge pull request #32 from easolhq/vips-v8.13.0

libvips v8.13.0
Newlywords · Jun 7, 2023 · 5b7a5d4 · 5b7a5d4
2 parents e0a1b60 + 819b08d
commit 5b7a5d4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/build/configurations/heroku-18.config.log b/build/configurations/heroku-18.config.log
@@ -1,5 +1,5 @@
 $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+libvips 8.13.0-Thu Jul 21 13:59:28 UTC 2022
 
 $ vips --vips-config
 enable debug: no
@@ -22,7 +22,7 @@ JXL load/save with libjxl: no (dynamic module: no)
 JPEG2000 load/save with libopenjp2: no
 PNG load with libspng: no
 PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
+selected quantisation package: 
 TIFF load/save with libtiff: yes (pkg-config libtiff-4)
 image pyramid save: yes
 HEIC/AVIF load/save with libheif: yes (dynamic module: no)

diff --git a/build/configurations/heroku-20.config.log b/build/configurations/heroku-20.config.log
@@ -1,5 +1,5 @@
 $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+libvips 8.13.0-Thu Jul 21 13:59:28 UTC 2022
 
 $ vips --vips-config
 enable debug: no
@@ -22,7 +22,7 @@ JXL load/save with libjxl: no (dynamic module: no)
 JPEG2000 load/save with libopenjp2: no
 PNG load with libspng: no
 PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
+selected quantisation package: 
 TIFF load/save with libtiff: yes (pkg-config libtiff-4)
 image pyramid save: yes
 HEIC/AVIF load/save with libheif: yes (dynamic module: no)

diff --git a/build/configurations/heroku-22.config.log b/build/configurations/heroku-22.config.log
@@ -1,5 +1,5 @@
 $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+libvips 8.13.0-Thu Jul 21 13:59:28 UTC 2022
 
 $ vips --vips-config
 enable debug: no
@@ -22,7 +22,7 @@ JXL load/save with libjxl: no (dynamic module: no)
 JPEG2000 load/save with libopenjp2: yes
 PNG load with libspng: no
 PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
+selected quantisation package: 
 TIFF load/save with libtiff: yes (pkg-config libtiff-4)
 image pyramid save: yes
 HEIC/AVIF load/save with libheif: yes (dynamic module: no)

diff --git a/build/heroku-18.tar.gz b/build/heroku-18.tar.gz
diff --git a/build/heroku-20.tar.gz b/build/heroku-20.tar.gz
diff --git a/build/heroku-22.tar.gz b/build/heroku-22.tar.gz
diff --git a/container/Dockerfile b/container/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \
   libtool \
   intltool \
   gtk-doc-tools \
+  meson \
   unzip \
   wget \
   git \
@@ -38,7 +39,13 @@ RUN apt-get update && apt-get install -y \
   libpoppler-glib-dev \
   libwebp-dev \
   libmagickcore-dev \
-  libpango1.0-dev
+  libpango1.0-dev \
+  python-gi-dev \
+  libgirepository1.0-dev
+
+# Used by the libvips test suite
+RUN apt-get update && apt-get install -y \
+  bc
 
 # build our stack to this prefix
 ARG VIPS_PREFIX=/usr/local/vips
@@ -102,15 +109,17 @@ RUN wget ${HEIF_URL}/v${HEIF_VERSION}/libheif-${HEIF_VERSION}.tar.gz \
   && make V=0 \
   && make install
 
-ARG VIPS_VERSION=8.10.5
+ARG VIPS_VERSION=8.13.0
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 
 RUN wget ${VIPS_URL}/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.gz \
   && tar xzf vips-${VIPS_VERSION}.tar.gz \
   && cd vips-${VIPS_VERSION} \
-  && ./configure --prefix=$VIPS_PREFIX \
-  && make V=0 \
-  && make install
+  && meson setup build-dir --buildtype=release --prefix=$VIPS_PREFIX \
+  && cd build-dir \
+  && meson compile \
+  && meson test \
+  && meson install
 
 # clean the build area ready for packaging
 RUN cd $VIPS_PREFIX \