meson: Enable x11 modules, add x11 related dependencies

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
This commit is contained in:
Arnaud Rebillout 2018-09-20 18:35:53 +07:00 committed by Arun Raghavan
parent 90c6416b18
commit 6ee4f86fa4
3 changed files with 27 additions and 4 deletions

View file

@ -80,10 +80,6 @@ all_modules = [
[ 'module-virtual-surround-sink', 'module-virtual-surround-sink.c' ],
[ 'module-volume-restore', 'module-volume-restore.c' ],
# [ 'module-waveout', 'module-waveout.c' ],
# [ 'module-x11-bell', 'x11/module-x11-bell.c' ],
# [ 'module-x11-cork-request', 'x11/module-x11-cork-request.c' ],
# [ 'module-x11-publish', 'x11/module-x11-publish.c' ],
# [ 'module-x11-xsmp', 'x11/module-x11-xsmp.c' ],
# [ 'module-zeroconf-discover', 'module-zeroconf-discover.c' ],
# [ 'module-zeroconf-publish', 'module-zeroconf-publish.c' ],
]
@ -138,6 +134,23 @@ if udev_dep.found()
all_modules += [ [ 'module-udev-detect', 'module-udev-detect.c', [], [], [udev_dep] ] ]
endif
if x11_dep.found()
all_modules += [
[ 'module-x11-bell', 'x11/module-x11-bell.c', [], [], [x11_dep] ],
[ 'module-x11-publish', 'x11/module-x11-publish.c', [], [], [x11_dep], libprotocol_native ],
]
if xtst_dep.found()
all_modules += [
[ 'module-x11-cork-request', 'x11/module-x11-cork-request.c', [], [], [x11_dep, xtst_dep] ],
]
endif
if ice_dep.found() and sm_dep.found()
all_modules += [
[ 'module-x11-xsmp', 'x11/module-x11-xsmp.c', [], [], [x11_dep, ice_dep, sm_dep] ],
]
endif
endif
foreach m : all_modules
name = m[0]
sources = m[1]

View file

@ -126,6 +126,11 @@ if dbus_dep.found()
]
endif
if x11_dep.found()
libpulsecore_sources += ['x11wrap.c']
libpulsecore_headers += ['x11wrap.h']
endif
# FIXME: walk through dependencies and add files
# FIXME: SIMD support (ORC)