Code Review
/
AGL
/
meta-agl-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ondemandnavi: use OSM tiles by default
[AGL/meta-agl-demo.git]
/
recipes-demo-hmi
/
navigation
/
ondemandnavi_git.bb
diff --git
a/recipes-demo-hmi/navigation/ondemandnavi_git.bb
b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
old mode 100755
(executable)
new mode 100644
(file)
index
52fee09
..
e15429b
--- a/
recipes-demo-hmi/navigation/ondemandnavi_git.bb
+++ b/
recipes-demo-hmi/navigation/ondemandnavi_git.bb
@@
-1,36
+1,44
@@
SUMMARY = "AGL Reference On Demand Navigation application."
SUMMARY = "AGL Reference On Demand Navigation application."
-DESCRIPTION = "
This application provides the function of Navigation to AGL.
"
-HOMEPAGE = "https://g
ithub.com/YoshitoMomiyama/aglqtnavigation.git
"
+DESCRIPTION = "
Demo AGL navigation application based on QtLocation widget.
"
+HOMEPAGE = "https://g
errit.automotivelinux.org/gerrit/#/admin/projects/apps/ondemandnavi
"
SECTION = "apps"
SECTION = "apps"
-LICENSE
= "Apache-2.0"
+LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984"
-inherit qmake5 aglwgt pkgconfig
+DEPENDS += "qtquickcontrols2 \
+ qlibhomescreen \
+ qlibwindowmanager \
+ qtlocation \
+ qtaglextras \
+"
-SRC_URI = "git://github.com/YoshitoMomiyama/aglqtnavigation.git;branch=master \
- file://org.agl.naviapi.conf \
- "
-SRCREV = "a6930c2dff988e45e18f91a2368d829c08942b30"
+PV = "1.0+git${SRCPV}"
-DEPENDS += " qtbase qtquickcontrols2 \
- qlibhomescreen \
- qlibwindowmanager \
- qtlocation qtaglextras \
- "
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=https;branch=${AGL_BRANCH} \
+ file://org.agl.naviapi.conf \
+"
+SRCREV = "${AGL_APP_REVISION}"
-RDEPENDS_${PN} += " qtlocation \
- flite openjtalk \
- "
+S = "${WORKDIR}/git"
-RPROVIDES_${PN} = "virtual/navigation"
+# Use OSM tiles by default.
+# For mapbox tiles, just comment this out and set an api key.
+EXTRA_QMAKEVARS_CONFIGURE += "ENABLE_OSM=1"
-S = "${WORKDIR}/git"
+inherit qmake5 aglwgt pkgconfig
do_install_append() {
install -d ${D}/etc/dbus-1/session.d/
install -m 0644 ${WORKDIR}/org.agl.naviapi.conf ${D}/etc/dbus-1/session.d/
}
do_install_append() {
install -d ${D}/etc/dbus-1/session.d/
install -m 0644 ${WORKDIR}/org.agl.naviapi.conf ${D}/etc/dbus-1/session.d/
}
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+RDEPENDS_${PN} += "qtlocation \
+ flite \
+ openjtalk \
+ gstreamer1.0 \
+ ondemandnavi-config \
+"
+
+RPROVIDES_${PN} = "virtual/navigation"