mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
audio/dbus: fix building
Commitc9c847481
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>
This commit is contained in:
parent
0e76929d65
commit
d2bfbdf316
|
@ -28,7 +28,7 @@ endforeach
|
||||||
|
|
||||||
if dbus_display
|
if dbus_display
|
||||||
module_ss = ss.source_set()
|
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}
|
audio_modules += {'dbus': module_ss}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1672,6 +1672,8 @@ dbus_display = get_option('dbus_display') \
|
||||||
error_message: '-display dbus requires --enable-modules') \
|
error_message: '-display dbus requires --enable-modules') \
|
||||||
.require(gdbus_codegen.found(),
|
.require(gdbus_codegen.found(),
|
||||||
error_message: '-display dbus requires gdbus-codegen') \
|
error_message: '-display dbus requires gdbus-codegen') \
|
||||||
|
.require(opengl.found(),
|
||||||
|
error_message: '-display dbus requires epoxy/egl') \
|
||||||
.allowed()
|
.allowed()
|
||||||
|
|
||||||
have_virtfs = get_option('virtfs') \
|
have_virtfs = get_option('virtfs') \
|
||||||
|
|
Loading…
Reference in a new issue