From 8c13aef478448114a8fe0ac112e26b59d7ad03d4 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 6 Jul 2017 10:30:41 +0200 Subject: qtivi: Use the latest version from 'dev' This also introduces fetching the qface submodule and the new default PACKAGECONFIG for the ivigenerator. For the ivigenerator new native and nativesdk packages are needed, which have a dependency towards python3 and python3-virtualenv Task-number: QTAUTO-472 Change-Id: I4e86168f4249c53c521c60cc2e1d44e91e968f4d Reviewed-by: Gordan Markus --- recipes-qt/automotive/qtivi_git.bb | 40 +++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 103933f..3dbf07e 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -35,18 +35,48 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02" -DEPENDS = "qtbase qtdeclarative qtmultimedia" - -SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" +DEPENDS = "qtbase qtdeclarative qtmultimedia qtivi-native" +DEPENDS_class-native = "qtbase" +DEPENDS_class-nativesdk = "qtbase" inherit qt5-module +inherit python3native require recipes-qt/qt5/qt5-git.inc -PACKAGECONFIG ?= "taglib dlt" +QT_MODULE_BRANCH_QFACE = "upstream/develop" + +SRC_URI += " \ + ${QT_GIT}/qtivi-qface.git;name=qface;branch=${QT_MODULE_BRANCH_QFACE};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/qface \ +" + +SRCREV_qtivi = "3205b6e8f57273096ae60d8f6fcdbe597c350393" +SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc" +SRCREV = "${SRCREV_qtivi}" +SRCREV_FORMAT = "qtivi_qface" + +PACKAGECONFIG ?= "taglib dlt ivigenerator" PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib" PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon" PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" +# For cross-compiling tell qtivi to use the system-ivigenerator, which is installed by the native recipe" +PACKAGECONFIG[ivigenerator] = "QMAKE_EXTRA_ARGS+=-system-ivigenerator" +PACKAGECONFIG[ivigenerator-native] = "QMAKE_EXTRA_ARGS+=-qt-ivigenerator,,python3 python3-virtualenv" +PACKAGECONFIG[host-tools-only] = "QMAKE_EXTRA_ARGS+=-host-tools-only" + +PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native" +PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}" + +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}" -EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" +do_compile_prepend() { + # Otherwise pip might cache or reuse something from our home folder + export HOME="${STAGING_DATADIR_NATIVE}" + # This is needed as otherwise the virtualenv tries to use the libs from the host + export LD_LIBRARY_PATH="${STAGING_LIBDIR_NATIVE}" + # Let qtivi use the python3-native binaries + export PYTHON3_PATH="${STAGING_BINDIR_NATIVE}/python3-native" +} +BBCLASSEXTEND += "native nativesdk" +INSANE_SKIP_${PN}_class-native = "already-stripped" -- cgit v1.2.3-54-g00ecf