From d93b061d7592637edb6c20da7f4d5f1ee7a9f12d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 17 Nov 2014 13:00:11 +0200
Subject: [PATCH] Use QtGlesStream instead of Mesa
Build QtGlesStream dummy client and use the EGL headers from there,
instead of Mesa. The actual QtGlesStream module still needs to build
elsewhere.
Task-number: QTEE-557
Change-Id: I2d50522b920fb49eaf5086b105fc2e6e37eef686
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
conf/distro/include/emulator.conf | 5 +-
.../qtglesstream/qtglesstream-dummy-client.bb | 57 +++++++++++++++++++
2 files changed, 58 insertions(+), 4 deletions(-)
create mode 100644 recipes/qtglesstream/qtglesstream-dummy-client.bb
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index dee1df35..8684c28b 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,12 +32,9 @@ MACHINE_EXTRA_RRECOMMENDS += "\
kernel_autoload_snd-intel8x0 = "snd-intel8x0"
MACHINE_EXTRA_INSTALL = "\
- libegl-mesa \
- libgles2-mesa \
mount-vboxsf \
"
MACHINE_EXTRA_INSTALL_SDK = "\
- libegl-mesa-dev \
- libgles2-mesa-dev \
+ qtglesstream-dummy-client-dev \
"
diff --git a/recipes/qtglesstream/qtglesstream-dummy-client.bb b/recipes/qtglesstream/qtglesstream-dummy-client.bb
new file mode 100644
index 00000000..f4748050
--- /dev/null
+++ b/recipes/qtglesstream/qtglesstream-dummy-client.bb
@@ -0,0 +1,57 @@
+#############################################################################
+##
+## 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://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "QtGlesStream dummy client provides headers and a dummy library for EGL/GLES"
+SECTION = "devel"
+LICENSE = "CLOSED"
+
+SRCREV = "72b9fdd9373a383c8b94afdbeb8cfbbfcde95e6e"
+PV = "5.4.0+git${SRCREV}"
+
+PROVIDES = "virtual/libgles2 virtual/libgles3 virtual/egl"
+
+SRC_URI = "git://qt-gerrit.it.local/QtRD-15810/qtglesstream.git;protocol=ssh;branch=dev"
+
+S = "${WORKDIR}/git"
+
+ALLOW_EMPTY_${PN} = "1"
+
+do_compile() {
+ ${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared -Iheaders -o libQtGlesStreamClient.so src/client-dummy/*.cpp
+}
+
+do_install() {
+ install -m 0755 -d ${D}${includedir}/EGL
+ install -m 0755 ${WORKDIR}/git/headers/EGL/* ${D}${includedir}/EGL
+
+ install -m 0755 -d ${D}${includedir}/GLES2
+ install -m 0755 ${WORKDIR}/git/headers/GLES2/* ${D}${includedir}/GLES2
+
+ install -m 0755 -d ${D}${includedir}/GLES3
+ install -m 0755 ${WORKDIR}/git/headers/GLES3/* ${D}${includedir}/GLES3
+
+ install -m 0755 -d ${D}${includedir}/KHR
+ install -m 0755 ${WORKDIR}/git/headers/KHR/* ${D}${includedir}/KHR
+
+ install -m 0755 -d ${D}${libdir}
+ install -m 0755 ${WORKDIR}/git/libQtGlesStreamClient.so ${D}${libdir}
+}
--
GitLab