summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-10-29 14:11:29 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-02 09:43:29 +0000
commit317b9e9c5fd4ba318658cce2bdef3ef82e1dd288 (patch)
tree9063161f48fe4082f6c73b591bb7aeabc2f90cc3 /configure
parentab1a5f10039429e9114cd905716b31bbec601d60 (diff)
Support for Wayland servers on i.MX6
A wayland compositor on i.MX6 needs to create the wl_display before creating the EGL display. This wl_display then needs to be exposed so that QWaylandCompositor can use it. Change-Id: Id60f6dd2fbba05140ca0671da6f17dbc2ecce3a3 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 10 insertions, 0 deletions
diff --git a/configure b/configure
index 16e8fb4402..f60802a9b5 100755
--- a/configure
+++ b/configure
@@ -681,6 +681,7 @@ CFG_EGLFS_BRCM=no
CFG_EGLFS_EGLDEVICE=no
CFG_EGLFS_MALI=no
CFG_EGLFS_VIV=no
+CFG_EGLFS_VIV_WL=no
CFG_DIRECTFB=auto
CFG_GBM=auto
CFG_LINUXFB=auto
@@ -5776,6 +5777,11 @@ if [ "$CFG_EGLFS" != "no" ]; then
else
CFG_EGLFS_VIV=no
fi
+ if [ "$CFG_EGLFS_VIV" = "yes" ] && compileTest qpa/wayland-server "wayland-server"; then
+ CFG_EGLFS_VIV_WL=yes
+ else
+ CFG_EGLFS_VIV_WL=no
+ fi
else
CFG_EGLFS="no"
fi
@@ -6222,6 +6228,9 @@ if [ "$CFG_EGLFS_MALI" = "yes" ]; then
fi
if [ "$CFG_EGLFS_VIV" = "yes" ]; then
QT_CONFIG="$QT_CONFIG eglfs_viv"
+ if [ "$CFG_EGLFS_VIV_WL" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG eglfs_viv_wl"
+ fi
fi
# enable openvg
@@ -7299,6 +7308,7 @@ report_support " QPA backends:"
report_support " DirectFB ............." "$CFG_DIRECTFB"
report_support " EGLFS ................" "$CFG_EGLFS"
report_support " EGLFS i.MX6 ........" "$CFG_EGLFS_VIV"
+report_support " EGLFS i.MX6 Wayland." "$CFG_EGLFS_VIV_WL"
report_support " EGLFS EGLDevice ...." "$CFG_EGLFS_EGLDEVICE"
report_support " EGLFS GBM .........." "$CFG_EGLFS_GBM"
report_support " EGLFS Mali ........." "$CFG_EGLFS_MALI"