From c57b68efde1811901d5d79da2b7cf841e846bb7d Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Tue, 9 Oct 2018 11:44:02 +0700 Subject: [PATCH] meson: Make x11 optional, bump meson requirement Signed-off-by: Arnaud Rebillout --- meson.build | 4 ++-- meson_options.txt | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 5c985c00a..62f5e01ce 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('pulseaudio', 'c', 'cpp', version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), - meson_version : '>= 0.44.0', + meson_version : '>= 0.47.0', default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] ) @@ -228,7 +228,7 @@ if dbus_dep.found() cdata.set('HAVE_DBUS', 1) endif -x11_dep = dependency('x11-xcb', required : false) +x11_dep = dependency('x11-xcb', required : get_option('x11')) if x11_dep.found() xcb_dep = dependency('xcb', required : true, version : '>= 1.6') ice_dep = dependency('ice', required : true) diff --git a/meson_options.txt b/meson_options.txt index f8462dd9c..3d8f653bf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -14,3 +14,6 @@ option('database', option('pulsedspdir', type : 'string', description : 'Specify location where OSS wrapper will be installed') +option('x11', + type : 'feature', value : 'auto', + description : 'Optional X11 support')