[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/14] audio/dbus: fix building
From: |
Paolo Bonzini |
Subject: |
[PULL 12/14] audio/dbus: fix building |
Date: |
Fri, 24 Jun 2022 10:27:28 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
audio/meson.build | 2 +-
meson.build | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
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 1b255f91ef..4b2a0b35cb 100644
--- a/meson.build
+++ b/meson.build
@@ -1653,6 +1653,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') \
--
2.36.1
- [PULL 00/14] (Mostly) build system changes for 2022-06-24, Paolo Bonzini, 2022/06/24
- [PULL 00/14] (Mostly) build system changes for 2022-06-24, Paolo Bonzini, 2022/06/24
- [PULL 02/14] pc-bios/optionrom: use -m16 unconditionally, Paolo Bonzini, 2022/06/24
- [PULL 01/14] tests/vm: do not specify -bios option, Paolo Bonzini, 2022/06/24
- [PULL 03/14] configure, pc-bios/optionrom: pass cross CFLAGS correctly, Paolo Bonzini, 2022/06/24
- [PULL 04/14] configure, pc-bios/s390-ccw: pass cross CFLAGS correctly, Paolo Bonzini, 2022/06/24
- [PULL 05/14] configure, pc-bios/vof: pass cross CFLAGS correctly, Paolo Bonzini, 2022/06/24
- [PULL 07/14] configure: write EXTRA_CFLAGS for all sub-Makefiles, Paolo Bonzini, 2022/06/24
- [PULL 12/14] audio/dbus: fix building,
Paolo Bonzini <=
- [PULL 11/14] fuzz: only use generic-fuzz targets on oss-fuzz, Paolo Bonzini, 2022/06/24
- [PULL 09/14] build: try both native and cross compilers for linux-user tests, Paolo Bonzini, 2022/06/24
- [PULL 13/14] meson.build: Require a recent version of libpng, Paolo Bonzini, 2022/06/24
- [PULL 14/14] accel: kvm: Fix memory leak in find_stats_descriptors, Paolo Bonzini, 2022/06/24
- [PULL 08/14] tests/tcg: compile system emulation tests as freestanding, Paolo Bonzini, 2022/06/24
- [PULL 06/14] configure: allow more host/target combos to use the host compiler, Paolo Bonzini, 2022/06/24
- [PULL 10/14] build: improve -fsanitize-coverage-allowlist check, Paolo Bonzini, 2022/06/24
- Re: [PULL 00/14] (Mostly) build system changes for 2022-06-24, Richard Henderson, 2022/06/24