[EGIT] [core/efl] master 01/01: meson: allow empty values in disabler/bindings array

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6bf26fe74a960273406b75c440e98e7c8e028cdd

commit 6bf26fe74a960273406b75c440e98e7c8e028cdd
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Wed Jul 15 20:07:46 2020 +0200

    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.
---
 meson_options.txt | 6 +++---
 1 file 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',
 option('evas-loaders-disabler',
   type : 'array',
   description : 'List of modular image/vector loaders to disable in efl',
-  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'],
+  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'],
   value : ['json', 'avif']
 )
 
 option('ecore-imf-loaders-disabler',
   type : 'array',
   description : 'List of input methods to disable in efl',
-  choices : ['xim', 'ibus', 'scim'],
+  choices : ['', 'xim', 'ibus', 'scim'],
   value : ['ibus']
 )
 
@@ -286,7 +286,7 @@ option('nls',
 
 option('bindings',
   type : 'array',
-  choices : ['lua', 'cxx', 'mono'],
+  choices : ['', 'lua', 'cxx', 'mono'],
   value : ['cxx'],
   description : 'Which auto-generated language bindings for efl to enable',
 )

--