From 7305f1ee096f819b52118b179c06e3d868518689 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 5 May 2021 09:52:48 -0400 Subject: 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. --- meson_options.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index 0ee6718bf..c12179c5e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,15 +1,15 @@ option('png', description: 'Enable PNG loader (requires libpng)', - type: 'boolean', - value: true) + type: 'feature', + value: 'enabled') option('tiff', description: 'Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto') option('jpeg', description: 'Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used', - type: 'boolean', - value: true) + type: 'feature', + value: 'enabled') option('builtin_loaders', description: 'Comma-separated list of loaders to build into gdk-pixbuf', type: 'array', -- cgit v1.2.1