fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-07 13:18:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'meson-add-option-to-disable-xlib-xcb' into 'master'

Browse source 
meson: add xlib-xcb option and disable by default

Closes #438

See merge request cairo/cairo!132
This commit is contained in:
Uli Schlachter 2021-02-25 06:57:31 +00:00
commit 553c19df16
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -331,8 +331,7 @@ if xcb_dep.found() and xcb_render_dep.found()
endif endif
if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1
# FIXME: automagic x11xcb_dep = dependency('x11-xcb', required: get_option('xlib-xcb'))
x11xcb_dep = dependency('x11-xcb', required: false)
if x11xcb_dep.found() if x11xcb_dep.found()
deps += [x11xcb_dep] deps += [x11xcb_dep]
feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1) feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1)

1
meson_options.txt
View file

@ -18,6 +18,7 @@ option('qt', type : 'feature', value : 'disabled')
option('tee', type : 'feature', value : 'disabled') option('tee', type : 'feature', value : 'disabled')
option('xcb', type : 'feature', value : 'auto') option('xcb', type : 'feature', value : 'auto')
option('xlib', 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 option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces