Skip to content

Commit

Permalink
webos-sdk: add missing tools for qt5 sdk
Browse files Browse the repository at this point in the history
:Release Notes:
add missing tools for qt5 sdk

:Detailed Notes:
- add wayland-scanner
- add qtwaylandscanner
- add OE_QMAKE_WAYLAND_SCANNER environment variable
- make 'populate_sdk' include qt5

:Testing Performed:
Local Test OK, Build OK

:QA Notes:
None
  • Loading branch information
sparkleholic committed Oct 2, 2018
1 parent a306edd commit def410c
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 0 deletions.
2 changes: 2 additions & 0 deletions meta-webos/classes/webos_image.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,6 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only
inherit core-image
inherit webos_machine_impl_dep
inherit webos_filesystem_paths
QTSDKCLASS ?= '${@bb.utils.contains("SDK_OS", "linux", "populate_sdk_qt5", "", d)}'
inherit ${QTSDKCLASS}
do_rootfs[depends] += "libpbnjson-native:do_populate_sysroot"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ RDEPENDS_${PN} += " \
nativesdk-qttools-tools \
nativesdk-qtbase-tools \
nativesdk-perl-modules \
nativesdk-qtwayland \
nativesdk-wayland-dev \
"
32 changes: 32 additions & 0 deletions meta-webos/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Copyright (c) 2018 LG Electronics, Inc.

EXTENDPRAUTO_append = "webos2"

fakeroot do_generate_qt_environment_file() {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d/
script=${D}${SDKPATHNATIVE}/environment-setup.d/qt5.sh

echo 'export PATH=${OE_QMAKE_PATH_HOST_BINS}:$PATH' > $script
echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
echo 'export OE_QMAKE_CC=$CC' >> $script
echo 'export OE_QMAKE_CXX=$CXX' >> $script
echo 'export OE_QMAKE_LINK=$CXX' >> $script
echo 'export OE_QMAKE_AR=$AR' >> $script
echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=`qmake -query QT_INSTALL_LIBS`' >> $script
echo 'export OE_QMAKE_INCDIR_QT=`qmake -query QT_INSTALL_HEADERS`' >> $script
echo 'export OE_QMAKE_MOC=${OE_QMAKE_PATH_HOST_BINS}/moc' >> $script
echo 'export OE_QMAKE_UIC=${OE_QMAKE_PATH_HOST_BINS}/uic' >> $script
echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script
echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script
echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script
echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script
echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script
echo "export OE_QMAKE_WAYLAND_SCANNER=${OE_QMAKE_PATH_HOST_BINS}/wayland-scanner" >> $script

# Use relocable sysroot
sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script
}
30 changes: 30 additions & 0 deletions meta-webos/recipes-qt/qt5/nativesdk-qtwayland_git.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
require ${TOPDIR}/meta-qt5/recipes-qt/qt5/nativesdk-qt5.inc
require ${TOPDIR}/meta-qt5/recipes-qt/qt5/qt5-git.inc

# There are no LGPLv3-only licensed files in this component.
LICENSE = "BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"

DEPENDS = "nativesdk-qtbase nativesdk-wayland"

# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.6-native
# 5.6.meta-qt5-native.1
SRC_URI += " \
file://0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch \
"

do_configure() {
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}/src/qtwaylandscanner
}

do_install() {
oe_runmake install INSTALL_ROOT=${D}
}

SRCREV = "70575643cfece4f0aca4b40e77ac5d7c0e8042a2"
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit def410c

Please sign in to comment.