xf86-video-intel: meson_options.txt src/meson.build

[GitLab Mirror]

 meson_options.txt |    2 +-
 src/meson.build   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74e1c0135133a515e016e63c46c2552bfa3126a8
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date:   Mon Oct 22 16:43:57 2018 +0300

    meson: s/debug/internal-debug/
    
    'debug' is a reserved option name since meson 0.48. So we
    must rename our own debug option to something else. Let's
    go with 'internal-debug'.
    
    Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/meson_options.txt b/meson_options.txt
index 99312740..e99a8f42 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -36,7 +36,7 @@ option('use-create2', type : 'boolean', value : false,
        description : 'Enable use of create2 ioctl (experimental)')
 option('async-swap', type : 'boolean', value : false,
        description : 'Enable use of asynchronous swaps (experimental)')
-option('debug', type : 'combo', value : 'no', choices : [ 'no', 'sync', 'memory', 'pixmap', 'full' ],
+option('internal-debug', type : 'combo', value : 'no', choices : [ 'no', 'sync', 'memory', 'pixmap', 'full' ],
        description : 'Enable internal debugging')
 option('xorg-module-dir', type : 'string', value : '@libdir@/xorg/modules',
        description : 'Default xorg module directory')
diff --git a/src/meson.build b/src/meson.build
index c038ba3e..0a46e233 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -68,7 +68,7 @@ if with_backlight_helper
   config.set('USE_BACKLIGHT_HELPER', 1)
 endif
 
-debug = get_option('debug')
+debug = get_option('internal-debug')
 if debug == 'sync'
   config.set('DEBUG_SYNC', 1)
 endif