From 1be213052b1deedcc1a634a4b38fc4c35c570b03 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 18 Feb 2022 10:36:50 +0000 Subject: [PATCH] install our own meson --- .github/workflows/ci.yml | 7 ++++++- meson.build | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b7847532..ee133340 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: if: runner.os == 'Linux' run: sudo -E apt-get install --fix-missing -qq -o Acquire::Retries=3 - meson ninja-build + ninja-build gtk-doc-tools gobject-introspection python3-pip python3-setuptools python3-wheel libfftw3-dev libexif-dev libjpeg-turbo8-dev @@ -74,6 +74,11 @@ jobs: libopenslide-dev libffi-dev libopenjp2-7-dev libimagequant-dev libcgif-dev + - name: Install recent meson + if: runner.os == 'Linux' + run: + sudo -E pip3 install meson + - name: Install macOS dependencies if: runner.os == 'macOS' run: | diff --git a/meson.build b/meson.build index 4147156b..8aa35b9e 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('vips', 'c', 'cpp', version: '8.13.0', - meson_version: '>=0.53', + meson_version: '>=0.56', default_options: [ # this is what glib uses (one of our required deps), so we use it too 'c_std=gnu99'