From 5a98998f7a98111ab1963ba4be26a974ea608929 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Thu, 26 Nov 2015 08:58:23 +0200
Subject: Use wip-compositor-api branch for Qt Wayland

Use WIP branch of Qt Wayland for the B2Qt image, while the automotive
image will still the official version from 5.6 branch. This is done by
temporarily using a 'b2qt-auto' distro that differs only by the version
of qtwayland module.

Change-Id: I9bb377bfd6b92241eea2848b3b88249763e3f347
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 conf/distro/b2qt-auto.conf                 | 26 ++++++++++++++++++++++++++
 recipes-qt/qt5/qtwayland-native_5.7-wip.bb | 29 +++++++++++++++++++++++++++++
 recipes-qt/qt5/qtwayland_5.7-wip.bb        | 29 +++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 conf/distro/b2qt-auto.conf
 create mode 100644 recipes-qt/qt5/qtwayland-native_5.7-wip.bb
 create mode 100644 recipes-qt/qt5/qtwayland_5.7-wip.bb

diff --git a/conf/distro/b2qt-auto.conf b/conf/distro/b2qt-auto.conf
new file mode 100644
index 0000000..6ac10cb
--- /dev/null
+++ b/conf/distro/b2qt-auto.conf
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+include conf/distro/b2qt.conf
+
+PREFERRED_VERSION_qtwayland = "5.5%"
+PREFERRED_VERSION_qtwayland-native = "5.5%"
diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
new file mode 100644
index 0000000..b1d03c2
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+require recipes-qt/qt5/qtwayland-native_git.bb
+
+FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:"
+
+SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21"
+PV = "5.7-wip+git${SRCPV}"
+QT_MODULE_BRANCH = "wip-compositor-api"
diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb
new file mode 100644
index 0000000..6a97e19
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+require recipes-qt/qt5/qtwayland_git.bb
+
+SRCREV = "22caa63a70245087e0fca51f2186597c232e2d21"
+PV = "5.7-wip+git${SRCPV}"
+QT_MODULE_BRANCH = "wip-compositor-api"
+
+SRC_URI_remove = "file://0001-examples-wayland-include-server-buffer-only-when-bui.patch"
-- 
cgit v1.2.3-54-g00ecf