diff options
Diffstat (limited to 'meta/recipes-qt/qt5/qtlocation_git.bb')
| -rw-r--r-- | meta/recipes-qt/qt5/qtlocation_git.bb | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/meta/recipes-qt/qt5/qtlocation_git.bb b/meta/recipes-qt/qt5/qtlocation_git.bb index 03f3aca097..b1ce1f3654 100644 --- a/meta/recipes-qt/qt5/qtlocation_git.bb +++ b/meta/recipes-qt/qt5/qtlocation_git.bb @@ -1,37 +1,32 @@ require qt5.inc require qt5-git.inc -LICENSE = "Apache-2.0 & MIT & openssl & BSL-1.0 & GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://src/3rdparty/mapbox-gl-native/LICENSE.md;md5=0ab9025299bcee16858021d557f09449 \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" PACKAGECONFIG ??= "" -# older geoclue 0.12.99 is needed -PACKAGECONFIG[geoclue] = ",,geoclue" -PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" -PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" - -EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" - -# The same issue as in qtbase: -# http://errors.yoctoproject.org/Errors/Details/152640/ -LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -SRC_URI += " \ - ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ -" - -SRCREV_qtlocation = "ec00ff89bee900a1b8925e227a892bc57839cd60" -SRCREV_qtlocation-mapboxgl = "8c1be4ec01ef46bf453856531ebf53b48ce3dbe7" - -SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" +# 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 += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" +EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" + +SRCREV = "35348e80145305778a89923d3bfe50d7baba7690" |