diff --git a/meson.build b/meson.build index 4a047051d..b49043fcd 100644 --- a/meson.build +++ b/meson.build @@ -228,6 +228,11 @@ cdata.set('DISABLE_ORC', 1) # Module dependencies +jack_dep = dependency('jack', version : '>= 0.117.0', required : false) +if jack_dep.found() + cdata.set('HAVE_JACK', 1) +endif + fftw_dep = dependency('fftw3f', required : false) if fftw_dep.found() cdata.set('HAVE_FFTW', 1) diff --git a/src/modules/meson.build b/src/modules/meson.build index 285667cd7..dab6d8207 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -37,9 +37,7 @@ all_modules = [ [ 'module-http-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_HTTP', '-DUSE_TCP_SOCKETS'], [], libprotocol_http ], [ 'module-http-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_HTTP', '-DUSE_UNIX_SOCKETS'], [], libprotocol_http ], [ 'module-intended-roles', 'module-intended-roles.c' ], -# [ 'module-jackdbus-detect', 'jack/module-jackdbus-detect.c' ], -# [ 'module-jack-sink', 'jack/module-jack-sink.c' ], -# [ 'module-jack-source', 'jack/module-jack-source.c' ], + [ 'module-jackdbus-detect', 'jack/module-jackdbus-detect.c', [], [], [dbus_dep] ], # [ 'module-ladspa-sink', 'module-ladspa-sink.c' ], # [ 'module-lirc', 'module-lirc.c' ], [ 'module-loopback', 'module-loopback.c' ], @@ -112,6 +110,13 @@ if fftw_dep.found() ] endif +if jack_dep.found() + all_modules += [ + [ 'module-jack-sink', 'jack/module-jack-sink.c', [], [], [jack_dep] ], + [ 'module-jack-source', 'jack/module-jack-source.c', [], [], [jack_dep] ], + ] +endif + if systemd_dep.found() all_modules += [ [ 'module-systemd-login', 'module-systemd-login.c', [], [], [systemd_dep] ],