[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] ui: dbus-display requires CONFIG_GBM
From: |
Paolo Bonzini |
Subject: |
[PULL 1/6] ui: dbus-display requires CONFIG_GBM |
Date: |
Fri, 29 Jul 2022 17:04:33 +0200 |
Without CONFIG_GBM, compiling dbus-display fails with
../ui/dbus.c: In function ‘dbus_create_context’:
../ui/dbus.c:47:20: error: ‘qemu_egl_rn_ctx’ undeclared (first use in this
function); did you mean ‘qemu_egl_init_ctx’?
47 | qemu_egl_rn_ctx);
| ^~~~~~~~~~~~~~~
| qemu_egl_init_ctx
../ui/dbus.c:47:20: note: each undeclared identifier is reported only once for
each function it appears in
and many other similar errors, because include/ui/egl-helpers.h only has
these declaration if gbm is found on the system.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1108
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 4 ++--
ui/meson.build | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 75aaca8462..294e9a8f32 100644
--- a/meson.build
+++ b/meson.build
@@ -1677,8 +1677,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') \
+ .require(opengl.found() and gbm.found(),
+ error_message: '-display dbus requires epoxy/egl and gbm') \
.allowed()
have_virtfs = get_option('virtfs') \
diff --git a/ui/meson.build b/ui/meson.build
index e9f48c5315..ec13949776 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -81,7 +81,7 @@ if dbus_display
'--interface-prefix', 'org.qemu.',
'--c-namespace', 'QemuDBus',
'--generate-c-code', '@BASENAME@'])
- dbus_ss.add(when: [gio, pixman, opengl],
+ dbus_ss.add(when: [gio, pixman, opengl, gbm],
if_true: [files(
'dbus-chardev.c',
'dbus-clipboard.c',
--
2.36.1
- [PULL 0/6] Fixes for QEMU 7.1-rc1, Paolo Bonzini, 2022/07/29
- [PULL 1/6] ui: dbus-display requires CONFIG_GBM,
Paolo Bonzini <=
- [PULL 2/6] vga: fix incorrect line height in 640x200x2 mode, Paolo Bonzini, 2022/07/29
- [PULL 4/6] configure: Fix ppc container_cross_cc substitution, Paolo Bonzini, 2022/07/29
- [PULL 6/6] configure: pass correct cflags to container-based cross compilers, Paolo Bonzini, 2022/07/29
- [PULL 5/6] kvm: don't use perror() without useful errno, Paolo Bonzini, 2022/07/29
- [PULL 3/6] stubs: update replay-tools to match replay.h types, Paolo Bonzini, 2022/07/29
- Re: [PULL 0/6] Fixes for QEMU 7.1-rc1, Richard Henderson, 2022/07/29