diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-06-22 19:49:18 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-07-08 11:03:36 +0200 |
| commit | d2bfbdf316b215ab94858738091cc93d46f27d8c (patch) | |
| tree | d3c09ad543afd1938e7f5efe4ca79b44d1698fd5 | |
| parent | 0e76929d6539a609a49bac09c27444ef576fa74a (diff) | |
| download | focaccia-qemu-d2bfbdf316b215ab94858738091cc93d46f27d8c.tar.gz focaccia-qemu-d2bfbdf316b215ab94858738091cc93d46f27d8c.zip | |
audio/dbus: fix building
Commit c9c847481 broken dbus audio module compilation with bad
'CONFIG_GIO' usage. Furthermore, it implied extra dependency on audio
module which aren't necessary.
The problem was that 'dbus_display' is not correctly automatically set
on MacOS, because opengl dependency wasn't taken into account.
Fixes: c9c847481 ("audio/dbus: Fix building with modules on macOS")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220622154918.560870-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | audio/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/audio/meson.build b/audio/meson.build index 94dab16891..3abee90860 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -28,7 +28,7 @@ endforeach if dbus_display module_ss = ss.source_set() - module_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], if_true: files('dbusaudio.c')) + module_ss.add(when: gio, if_true: files('dbusaudio.c')) audio_modules += {'dbus': module_ss} endif diff --git a/meson.build b/meson.build index 013c694a49..ad92d288a6 100644 --- a/meson.build +++ b/meson.build @@ -1672,6 +1672,8 @@ dbus_display = get_option('dbus_display') \ error_message: '-display dbus requires --enable-modules') \ .require(gdbus_codegen.found(), error_message: '-display dbus requires gdbus-codegen') \ + .require(opengl.found(), + error_message: '-display dbus requires epoxy/egl') \ .allowed() have_virtfs = get_option('virtfs') \ |