mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio/dbus: fix building

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2022-06-22 19:49:18 +04:00 committed by Paolo Bonzini
parent 0e76929d65
commit d2bfbdf316
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/meson.build
View File

@ -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

2
meson.build
View File

@ -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') \