From 7e1225197fa42165fd231aa5d5047801adda96c1 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Fri, 12 Aug 2022 18:38:58 -0700 Subject: [PATCH 1110/1110] ui dbus display requires CONFIG_GBM --- meson.build | 4 ++-- ui/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/qemu-xen/meson.build b/tools/qemu-xen/meson.build index f554c64f6b..62024788aa 100644 --- a/tools/qemu-xen/meson.build +++ b/tools/qemu-xen/meson.build @@ -1501,8 +1501,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/tools/qemu-xen/ui/meson.build b/tools/qemu-xen/ui/meson.build index eba93b41e3..cd2b162d98 100644 --- a/tools/qemu-xen/ui/meson.build +++ b/tools/qemu-xen/ui/meson.build @@ -80,7 +80,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.37.1