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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 37 |
1 files changed, 15 insertions, 22 deletions
@@ -394,7 +394,6 @@ u2f="auto" libusb="$default_feature" usb_redir="$default_feature" opengl="$default_feature" -opengl_dmabuf="no" cpuid_h="no" avx2_opt="$default_feature" capstone="auto" @@ -3606,14 +3605,24 @@ if $pkg_config gbm; then fi if test "$opengl" != "no" ; then - opengl_pkgs="epoxy gbm" - if $pkg_config $opengl_pkgs; then - opengl_cflags="$($pkg_config --cflags $opengl_pkgs)" - opengl_libs="$($pkg_config --libs $opengl_pkgs)" + epoxy=no + if $pkg_config epoxy; then + cat > $TMPC << EOF +#include <epoxy/egl.h> +int main(void) { return 0; } +EOF + if compile_prog "" "" ; then + epoxy=yes + fi + fi + + if test "$epoxy" = "yes" ; then + opengl_cflags="$($pkg_config --cflags epoxy)" + opengl_libs="$($pkg_config --libs epoxy)" opengl=yes else if test "$opengl" = "yes" ; then - feature_not_found "opengl" "Please install opengl (mesa) devel pkgs: $opengl_pkgs" + feature_not_found "opengl" "Please install epoxy with EGL" fi opengl_cflags="" opengl_libs="" @@ -3621,19 +3630,6 @@ if test "$opengl" != "no" ; then fi fi -if test "$opengl" = "yes"; then - cat > $TMPC << EOF -#include <epoxy/egl.h> -#ifndef EGL_MESA_image_dma_buf_export -# error mesa/epoxy lacks support for dmabufs (mesa 10.6+) -#endif -int main(void) { return 0; } -EOF - if compile_prog "" "" ; then - opengl_dmabuf=yes - fi -fi - ########################################## # libxml2 probe if test "$libxml2" != "no" ; then @@ -5836,9 +5832,6 @@ if test "$opengl" = "yes" ; then echo "CONFIG_OPENGL=y" >> $config_host_mak echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak - if test "$opengl_dmabuf" = "yes" ; then - echo "CONFIG_OPENGL_DMABUF=y" >> $config_host_mak - fi fi if test "$gbm" = "yes" ; then |