X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=blobdiff_plain;f=recipes-demo-hmi%2Fnavigation%2Fondemandnavi_git.bb;h=e15429b1a28d1b0ae050695f0cac84581d76a4af;hp=52fee09838cd3ca8ab8827b2b3c650a224fd62b7;hb=bd5678306c8049d7aec9dd5323e241d02bb1f05a;hpb=e2154b482e2cd93be209679bcd7bad7658839890

diff --git a/recipes-demo-hmi/navigation/ondemandnavi_git.bb b/recipes-demo-hmi/navigation/ondemandnavi_git.bb
old mode 100755
new mode 100644
index 52fee0983..e15429b1a
--- 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."
-DESCRIPTION = "This application provides the function of Navigation to AGL. "
-HOMEPAGE    = "https://github.com/YoshitoMomiyama/aglqtnavigation.git"
+DESCRIPTION = "Demo AGL navigation application based on QtLocation widget."
+HOMEPAGE    = "https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/ondemandnavi"
 SECTION     = "apps"
 
-LICENSE     = "Apache-2.0"
+LICENSE = "Apache-2.0"
 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/
 }
 
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+RDEPENDS_${PN} += "qtlocation \
+                   flite \
+                   openjtalk \
+                   gstreamer1.0 \
+                   ondemandnavi-config \
+"
+
+RPROVIDES_${PN} = "virtual/navigation"