mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Make x11 optional, bump meson requirement

Browse source 
Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
This commit is contained in:
Arnaud Rebillout 2018-10-09 11:44:02 +07:00 • committed by Arun Raghavan
parent 6ff3420405
commit c57b68efde
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -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)

3
meson_options.txt
View file

@ -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')