[cairo-commit] 2 commits - meson.build meson_options.txt

[GitLab Mirror]

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

New commits:
commit 4d680596561bde4b797c7c44484c9036e81b6258
Merge: bdb4d0586 627aa6567
Author: Emmanuele Bassi <ebassi at gmail.com>
Date:   Wed Feb 16 17:04:37 2022 +0000

    Merge branch 'meson-xml-option' into 'master'
    
    meson: Add xml option and disable by default
    
    See merge request cairo/cairo!275

commit 627aa6567428cb4c15d482df1cdc8152c65e08d2
Author: David King <amigadave at amigadave.com>
Date:   Tue Feb 15 13:31:48 2022 +0000

    meson: Add xml option and disable by default
    
    Just like autotools does.

diff --git a/meson.build b/meson.build
index 5999e586f..1c1c06748 100644
--- a/meson.build
+++ b/meson.build
@@ -756,8 +756,7 @@ if zlib_dep.found()
   conf.set('CAIRO_HAS_INTERPRETER', 1)
 endif
 
-# TODO: add xml option and disable by default
-if zlib_dep.found() and png_dep.found()
+if zlib_dep.found() and png_dep.found() and get_option('xml').enabled()
   feature_conf.set('CAIRO_HAS_XML_SURFACE', 1)
   built_features += [{
     'name': 'cairo-xml',
diff --git a/meson_options.txt b/meson_options.txt
index b96369fb5..a2279388e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,7 +19,7 @@ option('tee', type : 'feature', value : 'disabled')
 option('xcb', type : 'feature', value : 'auto')
 option('xlib', type : 'feature', value : 'auto')
 option('xlib-xcb', type : 'feature', value : 'disabled')
-#option('xml', type : 'feature', value : 'disabled')
+option('xml', type : 'feature', value : 'disabled')
 option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces
 
 # Tests