diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtwayland')
3 files changed, 57 insertions, 68 deletions
diff --git a/meta/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/meta/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch new file mode 100644 index 0000000000..078f2ac4a6 --- /dev/null +++ b/meta/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -0,0 +1,29 @@ +From 07ec1f1728be3dff2f93f939065b7fb58f1df434 Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 19 Jul 2013 13:35:14 +0000 +Subject: [PATCH] Install the qtwaylandscanner tool to the native side + +Upstream-Status: Inappropiate [configuration] + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro +index ac2d07b..7a46a24 100644 +--- a/src/qtwaylandscanner/qtwaylandscanner.pro ++++ b/src/qtwaylandscanner/qtwaylandscanner.pro +@@ -1,6 +1,10 @@ + option(host_build) + +-SOURCES += qtwaylandscanner.cpp ++TARGET = qtwaylandscanner$$qtPlatformTargetSuffix() ++CONFIG += console warn_off ++QT = core + +-load(qt_tool) ++SOURCES += qtwaylandscanner.cpp + ++target.path = $$[QT_HOST_BINS] ++INSTALLS += target diff --git a/meta/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/meta/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch new file mode 100644 index 0000000000..5ea0bdafa5 --- /dev/null +++ b/meta/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -0,0 +1,28 @@ +From a714384fa9bba88d2536d644121587ca06fc010c Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 22 Feb 2014 17:47:44 +0100 +Subject: [PATCH] examples/wayland: include server-buffer only when building + with opengles2 + +* it's using glBindBuffer in + server-buffer/client/serverbufferrenderer.cpp + +Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + examples/wayland/wayland.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro +index d633fb9..643c7cd 100644 +--- a/examples/wayland/wayland.pro ++++ b/examples/wayland/wayland.pro +@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { + SUBDIRS += qml-compositor + } + +- SUBDIRS += server-buffer ++ contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++ } + } diff --git a/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch deleted file mode 100644 index 04ae7e0e87..0000000000 --- a/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e41bc392aa79073926aba917796e836f5b0d9f32 Mon Sep 17 00:00:00 2001 -From: Raphael Freudiger <laser_b@gmx.ch> -Date: Tue, 10 Jan 2017 15:49:55 +0100 -Subject: [PATCH] fix build without xkbcommon-evdev -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe -Signed-off-by: Raphael Freudiger <laser_b@gmx.ch> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/client/client.pro | 2 ++ - src/compositor/compositor.pro | 2 ++ - src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/client/client.pro b/src/client/client.pro -index eae7ad5..0bb7b18 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ - wayland-decoration-client \ - wayland-shell-integration - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d..4eebfd6 100644 ---- a/src/compositor/compositor.pro -+++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b1..e6f1a0b 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard.cpp -+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) - xkb_state = xkb_state_new(keymap); - } - --uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) --{ -- const uint offset = 8; -- Q_ASSERT(nativeScanCode >= offset); -- return nativeScanCode - offset; --} - - void QWaylandKeyboardPrivate::createXKBKeymap() - { -@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() - } - #endif - -+uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) -+{ -+ const uint offset = 8; -+ Q_ASSERT(nativeScanCode >= offset); -+ return nativeScanCode - offset; -+} -+ - void QWaylandKeyboardPrivate::sendRepeatInfo() - { - Q_FOREACH (Resource *resource, resourceMap()) { |