meson: Make x11 optional, bump meson requirement

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/meson.build b/meson.build
index 5c985c00a0a80670de5ca08d926808ec2cfa3b71..62f5e01ced4eb683f78855d8676808982a206046 100644 (file)
--- 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 f8462dd9c4a1b36102dbcd4a8cbd9577974fbb46..3d8f653bfc9308beea753778a2683546aaba2499 100644 (file)
--- 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')