diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-04 12:58:50 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-04 12:58:50 +0000 |
commit | fe352f5c0056b4d21ae033ec49acc0bce9897e53 (patch) | |
tree | 5dabd93c86901bac296940d138ed7bb9b1b680df /meson.build | |
parent | cb90ecf9349198558569f6c86c4c27d215406095 (diff) | |
parent | ed8f3fe6898e0f3fea2ece7c87464a06098b2300 (diff) | |
download | qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.zip qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.tar.gz qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.tar.bz2 |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210304-pull-request' into staging
ui/console: message surface tweaks.
ui/cocoa: bugfixes and cleanups.
# gpg: Signature made Thu 04 Mar 2021 08:36:53 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20210304-pull-request:
virtio-gpu: Do not distinguish the primary console
ui/console: Pass placeholder surface to displays
ui/console: Add placeholder flag to message surface
ui/cocoa: Replace fprintf with error_report
configure: Improve OpenGL dependency detections
ui/cocoa: Fix stride resolution of pixman image
ui/gtk: vte: fix sending multiple characeters
ui/cocoa: Remove the uses of full screen APIs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 07bc231..81d760d 100644 --- a/meson.build +++ b/meson.build @@ -2657,7 +2657,7 @@ summary_info += {'U2F support': u2f.found()} summary_info += {'libusb': config_host.has_key('CONFIG_USB_LIBUSB')} summary_info += {'usb net redir': config_host.has_key('CONFIG_USB_REDIR')} summary_info += {'OpenGL support': config_host.has_key('CONFIG_OPENGL')} -summary_info += {'OpenGL dmabufs': config_host.has_key('CONFIG_OPENGL_DMABUF')} +summary_info += {'GBM': config_host.has_key('CONFIG_GBM')} summary_info += {'libiscsi support': libiscsi.found()} summary_info += {'libnfs support': libnfs.found()} if targetos == 'windows' |