From d8b22f3d4ad6e15ab666b714fa0911a1bc289434 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 22 Feb 2014 17:27:23 +0100 Subject: qtwayland: Fix xcomposite-glx and examples build * egl was building fine, but glx was failing to find qwaylandintegration.h * one example cannot be built without gles2, so make it conditional Signed-off-by: Martin Jansa --- ...o-include-server-buffer-only-when-buildin.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch (limited to 'recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch') diff --git a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch new file mode 100644 index 00000000..998f8b67 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch @@ -0,0 +1,31 @@ +From 201b36614907584a0d446975bddbb11a495540ed Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 22 Feb 2014 17:47:44 +0100 +Subject: [PATCH] examples.pro: include server-buffer only when building with + opengles2 + +* it's using glBindBuffer in + server-buffer/client/serverbufferrenderer.cpp + +Signed-off-by: Martin Jansa +Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +--- + examples/examples.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/examples.pro b/examples/examples.pro +index 2d4cd1b..fb2497e 100644 +--- a/examples/examples.pro ++++ b/examples/examples.pro +@@ -13,5 +13,7 @@ contains(CONFIG, wayland-compositor) { + SUBDIRS += qml-compositor + } + +- SUBDIRS += server-buffer ++ contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++ } + } +-- +1.8.5.3 + -- cgit v1.2.3-54-g00ecf