summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-05 15:09:14 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-09-10 08:01:59 +0000
commit122123bfa4a65b04884f1d930900cb342fb7741c (patch)
tree5cb6f70da082e332517b3b7195fe371edb14e536
parent341f6fe0bea24d7942d1d3e2c445d6ec4c0cb35e (diff)
Create feature wayland-shm-emulation-server-buffer
And make OpenGL a requirement, in order to make builds without OpenGL work again. Fixes: QTBUG-69779 Change-Id: Iff1153b0aaca8e115f47c59c2ceb028e638e3fe9 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-rw-r--r--src/client/configure.json8
-rw-r--r--src/compositor/configure.json5
-rw-r--r--src/plugins/hardwareintegration/client/client.pro6
-rw-r--r--src/plugins/hardwareintegration/compositor/compositor.pro6
4 files changed, 18 insertions, 7 deletions
diff --git a/src/client/configure.json b/src/client/configure.json
index 02c36de1..ef5e87bb 100644
--- a/src/client/configure.json
+++ b/src/client/configure.json
@@ -110,6 +110,11 @@
"label": "libhybris EGL",
"condition": "features.wayland-client && features.opengl && features.egl && tests.libhybris-egl-server",
"output": [ "privateFeature" ]
+ },
+ "wayland-shm-emulation-server-buffer": {
+ "label": "Shm emulation server buffer integration",
+ "condition": "features.wayland-client && features.opengl",
+ "output": [ "privateFeature" ]
}
},
@@ -131,7 +136,8 @@
"xcomposite-egl",
"xcomposite-glx",
"wayland-drm-egl-server-buffer",
- "wayland-libhybris-egl-server-buffer"
+ "wayland-libhybris-egl-server-buffer",
+ "wayland-shm-emulation-server-buffer"
]
},
"wayland-client"
diff --git a/src/compositor/configure.json b/src/compositor/configure.json
index 20b0e9ce..6864a94f 100644
--- a/src/compositor/configure.json
+++ b/src/compositor/configure.json
@@ -116,6 +116,11 @@
"condition": "features.wayland-server && features.opengl && features.egl && tests.libhybris-egl-server",
"output": [ "privateFeature" ]
},
+ "wayland-shm-emulation-server-buffer": {
+ "label": "Shm emulation server buffer",
+ "condition": "features.wayland-server && features.opengl",
+ "output": [ "privateFeature" ]
+ },
"wayland-layer-integration-vsp2": {
"label": "VSP2 hardware layer integration",
"condition": "features.wayland-server && features.eglfs_vsp2 && libs.wayland-kms",
diff --git a/src/plugins/hardwareintegration/client/client.pro b/src/plugins/hardwareintegration/client/client.pro
index 8001c9de..eab62f8d 100644
--- a/src/plugins/hardwareintegration/client/client.pro
+++ b/src/plugins/hardwareintegration/client/client.pro
@@ -9,10 +9,10 @@ qtConfig(xcomposite-egl): \
SUBDIRS += xcomposite-egl
qtConfig(xcomposite-glx): \
SUBDIRS += xcomposite-glx
+
qtConfig(wayland-drm-egl-server-buffer): \
SUBDIRS += drm-egl-server
qtConfig(wayland-libhybris-egl-server-buffer): \
SUBDIRS += libhybris-egl-server
-
-### TODO: make shm-emulation configurable
-SUBDIRS += shm-emulation-server
+qtConfig(wayland-shm-emulation-server-buffer): \
+ SUBDIRS += shm-emulation-server
diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro
index ba216b33..55bf1a7d 100644
--- a/src/plugins/hardwareintegration/compositor/compositor.pro
+++ b/src/plugins/hardwareintegration/compositor/compositor.pro
@@ -9,12 +9,12 @@ qtConfig(xcomposite-egl): \
SUBDIRS += xcomposite-egl
qtConfig(xcomposite-glx): \
SUBDIRS += xcomposite-glx
+
qtConfig(wayland-drm-egl-server-buffer): \
SUBDIRS += drm-egl-server
qtConfig(wayland-libhybris-egl-server-buffer): \
SUBDIRS += libhybris-egl-server
-
-### TODO: make shm-emulation configurable
-SUBDIRS += shm-emulation-server
+qtConfig(wayland-shm-emulation-server-buffer): \
+ SUBDIRS += shm-emulation-server
SUBDIRS += hardwarelayer