From ec98db4972328c8eb44d20f97402f95975c2a23b Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Mon, 21 Apr 2014 00:01:23 +1000 Subject: [PATCH] qtlocation: add packageconfig for geoclue and gypsy (From meta-qt5 rev: 12a40b841225b0d669b330dbdec1a01b0a99ddaa) Signed-off-by: Jonathan Liu Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtlocation.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/meta-qt5/recipes-qt/qt5/qtlocation.inc b/meta-qt5/recipes-qt/qt5/qtlocation.inc index 70a4375..41f2d19 100644 --- a/meta-qt5/recipes-qt/qt5/qtlocation.inc +++ b/meta-qt5/recipes-qt/qt5/qtlocation.inc @@ -2,3 +2,19 @@ require qt5.inc DEPENDS += "qtbase qt3d" # qtsystems qtmultimedia + +PACKAGECONFIG ??= "" +# older geoclue 0.x is needed +PACKAGECONFIG[geoclue] = "OE_GEOCLUE_ENABLED,,gconf geoclue" +PACKAGECONFIG[gypsy] = "OE_GYPSY_ENABLED,,gconf gypsy" + +do_configure_prepend() { + # disable geoclue tests if it isn't enabled by PACKAGECONFIG + sed -i -e 's/^\(qtCompileTest(geoclue)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro + sed -i -e 's/^\(qtCompileTest(geoclue-satellite)\)/OE_GEOCLUE_ENABLED:\1/' ${S}/qtlocation.pro + # disable gypsy test if it isn't enabled by PACKAGECONFIG + sed -i -e 's/^\(qtCompileTest(gypsy)\)/OE_GYPSY_ENABLED:\1/' ${S}/qtlocation.pro +} + +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" -- 2.7.4