meson: Enable x11 modules, add x11 related dependencies

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

diff --git a/meson.build b/meson.build
index c3fe18977bd1d55064c19abe58764fdf10b171a8..f948b257051c4d55734bc42391764ec766ad7eb6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -228,6 +228,11 @@ cdata.set('DISABLE_ORC', 1)
 
 # Module dependencies
 
+# X11 deps, we don't define any HAVE_XXX for these one
+ice_dep = dependency('ice', required : false)
+sm_dep = dependency('sm', required: false)
+xtst_dep = dependency('xtst', required: false)
+
 avahi_dep = dependency('avahi-client', version : '>= 0.6.0', required : false)
 if avahi_dep.found()
   cdata.set('HAVE_AVAHI', 1)

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 14f7f80f6008e6738a20d36525951574e6b7b2eb..1bfbb6886bb23fc3433c56c661010ff3f8bdcecf 100644 (file)
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -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]

diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
index 60b9b9aa86d135a763c7281ddbc53bf68355a44d..7057daf2eedf924bd4efebe8c7ccb6034cf3d1be 100644 (file)
--- a/src/pulsecore/meson.build
+++ b/src/pulsecore/meson.build
@@ -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)