summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-05-05 09:52:48 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2021-05-05 09:52:48 -0400
commit7305f1ee096f819b52118b179c06e3d868518689 (patch)
treeb92948f70dadceb69e3963b2bf708a7ee8b24609 /.gitlab-ci.yml
parent1bfbff2a7f36c92c156897db79109121f465bb7d (diff)
downloadgdk-pixbuf-7305f1ee096f819b52118b179c06e3d868518689.tar.gz
Meson: Change png/jpeg/tiff options from boolean to feature
png/jpeg are essential and have a fallback subproject so they are enabled by default. tiff is not required by GTK and does not have a subproject so it's set to 'auto' by default. This fixes the case where tiff option was set to true by default but meson setup was not aborting if the dependency was not found. Instead it was failing at build time.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7887596f0..17a9ba38e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ stages:
variables:
CCACHE_DIR: _ccache
COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false"
- LOADERS_FLAGS: "-Dpng=true -Djpeg=true -Dtiff=true"
+ LOADERS_FLAGS: "-Dpng=enabled -Djpeg=enabled -Dtiff=enabled"
MESON_TEST_TIMEOUT_MULTIPLIER: 3
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gdk-pixbuf/fedora:v3"