summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2020-07-15 20:07:46 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2020-07-15 20:22:57 +0200
commit6bf26fe74a960273406b75c440e98e7c8e028cdd (patch)
tree6802b1635f631731692e52903d01917f29ee80f6
parent68dfa4db464b7a30807dcaf672442d665fc3ad27 (diff)
meson: allow empty values in disabler/bindings array
This is supposed to simplify things for distro packagers and is inspired by other projects doing this, e.g. Mesa. The idea here is that the provided lists can now begin with a comma, unlike before. This allows for things such as: evas_disablers="" if [ -z "$build_option_lottie" ]; then evas_disablers+=",json" fi if [ -z "$build_option_avif" ]; then evas_disablers+=",avif" fi ... configure_args+=" -Devas-loaders-disabler=$evas_disablers" Previously this would fail because meson would interpret the comma at the beginning as having an empty-string value in the array, and checking whether the string is already empty is too clunky.
-rw-r--r--meson_options.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt
index c891630f04..f5ffb0e134 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -189,14 +189,14 @@ option('unmount-path',
189option('evas-loaders-disabler', 189option('evas-loaders-disabler',
190 type : 'array', 190 type : 'array',
191 description : 'List of modular image/vector loaders to disable in efl', 191 description : 'List of modular image/vector loaders to disable in efl',
192 choices : ['gst', 'pdf', 'ps', 'raw', 'svg', 'rsvg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json', 'avif'], 192 choices : ['', 'gst', 'pdf', 'ps', 'raw', 'svg', 'rsvg', 'xcf', 'bmp', 'dds', 'eet', 'generic', 'gif', 'ico', 'jp2k', 'jpeg', 'pmaps', 'png', 'psd', 'tga', 'tgv', 'tiff', 'wbmp', 'webp', 'xpm', 'json', 'avif'],
193 value : ['json', 'avif'] 193 value : ['json', 'avif']
194) 194)
195 195
196option('ecore-imf-loaders-disabler', 196option('ecore-imf-loaders-disabler',
197 type : 'array', 197 type : 'array',
198 description : 'List of input methods to disable in efl', 198 description : 'List of input methods to disable in efl',
199 choices : ['xim', 'ibus', 'scim'], 199 choices : ['', 'xim', 'ibus', 'scim'],
200 value : ['ibus'] 200 value : ['ibus']
201) 201)
202 202
@@ -286,7 +286,7 @@ option('nls',
286 286
287option('bindings', 287option('bindings',
288 type : 'array', 288 type : 'array',
289 choices : ['lua', 'cxx', 'mono'], 289 choices : ['', 'lua', 'cxx', 'mono'],
290 value : ['cxx'], 290 value : ['cxx'],
291 description : 'Which auto-generated language bindings for efl to enable', 291 description : 'Which auto-generated language bindings for efl to enable',
292) 292)