navigation: fixing navigation packaging methods

With this fix, the navigation build method will be compatible with the SDK.
This patch contains the workaround of the problem discussed in SPEC-384.
This patch contains fix of problems that lose dependency.

Change-Id: Ibf02040f78a2f925a430a5844f735a00cd375d08
Bug-AGL: SPEC-384
Signed-off-by: Naoto Yamaguchi <i33399_YAMAGUCHI@aisin-aw.co.jp>

diff --git a/recipes-demo-hmi/navigation/navigation/0001-Makefile-compatible-aglwgt.patch b/recipes-demo-hmi/navigation/navigation/0001-Makefile-compatible-aglwgt.patch
deleted file mode 100644 (file)
index 5a5f299..0000000
--- a/recipes-demo-hmi/navigation/navigation/0001-Makefile-compatible-aglwgt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am      2017-05-13 12:44:00.955668657 +0000
-+++ b/Makefile.am      2017-05-13 12:46:26.500731324 +0000
-@@ -3,7 +3,7 @@
- DIST_SUBDIRS = src
- CLEANFILES = agl/navigation.wgt flite jtalk
- 
--bin_SCRIPTS = flite jtalk navigation.wgt
-+bin_SCRIPTS = flite jtalk package
- flite: flite.in
-       sed -e 's,[@]datadir[@],$(datadir),g' $(srcdir)/flite.in > flite
-       chmod +x flite
-@@ -12,7 +12,7 @@
-       sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]exec_prefix[@],$(exec_prefix),g' $(srcdir)/jtalk.in > jtalk
-       chmod +x jtalk
- 
--navigation.wgt:src/navi
-+package:src/navi
-       rm -f agl/navigation.wgt
-       mkdir -p agl
-       cp src/.libs/navi agl/

diff --git a/recipes-demo-hmi/navigation/navigation/flite.in b/recipes-demo-hmi/navigation/navigation/flite.in
deleted file mode 100755 (executable)
index 28b512c..0000000
--- a/recipes-demo-hmi/navigation/navigation/flite.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-TMP=/tmp/navi.wav
-echo "$1" | flite_hts_engine -m  @datadir@/Voice/us/cmu_us_arctic_slt.htsvoice -o $TMP
-paplay --property='media.role=Navi' $TMP
-rm -f $TMP
-

diff --git a/recipes-demo-hmi/navigation/navigation/jtalk.in b/recipes-demo-hmi/navigation/navigation/jtalk.in
deleted file mode 100755 (executable)
index 76900f4..0000000
--- a/recipes-demo-hmi/navigation/navigation/jtalk.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-TMP=/tmp/navi.wav
-echo "$1" | open_jtalk -ow $TMP -m @exec_prefix@/share/Voice/mei/mei_normal.htsvoice -x @exec_prefix@/share/dic/
-paplay --property='media.role=Navi' $TMP
-rm -f $TMP
-

diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb
old mode 100644 (file)
new mode 100755 (executable)
index bc62ef4..3351528
--- a/recipes-demo-hmi/navigation/navigation_git.bb
+++ b/recipes-demo-hmi/navigation/navigation_git.bb
@@ -15,13 +15,10 @@ DEPENDS = " \
 RDEPENDS_${PN} = " flite openjtalk glib-2.0 freetype sqlite3 wayland zlib expat openssl \
                    wayland libdbus-c++ af-main "
 
-SRCREV="c6403c1147fa53cd6a638f738d270c5d3bb214cf"
+SRCREV="acbb9ea0678bd2f21f268000332a4786e87fb3f6"
 SRC_URI="git://github.com/AGLExport/gpsnavi.git;branch=agl \
-         file://flite.in \
-         file://jtalk.in \
          file://download_mapdata_jp.sh \
          file://download_mapdata_uk.sh \
-         file://0001-Makefile-compatible-aglwgt.patch \
 "
 
 # To avoid C++ library link failure
@@ -32,32 +29,13 @@ inherit aglwgt
 
 S = "${WORKDIR}/git"
 
-do_compile_prepend() {
-   cp ${WORKDIR}/flite.in ${S}/
-   cp ${WORKDIR}/jtalk.in ${S}/
-}
-
 do_install_append() {
-   # Attention: BUG: app ships native lib as part of platform
-   # see SPEC-785 and SPEC-384
-   # /start FIXME __________________
-     cd ${B}
-     oe_runmake 'DESTDIR=${D}' install
-     rm ${D}/usr/bin/navi
-   # /end   FIXME ^^^^^^^^^^^^^^^^^^^
-
+# mapdata install scripts
    install -d ${D}/usr/AGL/apps
-   mkdir -p ${B}/package/
-   mv ${B}/navigation.wgt ${B}/package/
    install -m 0755 ${WORKDIR}/download_mapdata_jp.sh ${D}/usr/AGL/apps/
    install -m 0755 ${WORKDIR}/download_mapdata_uk.sh ${D}/usr/AGL/apps/
 
    install -d ${D}/var/mapdata
 }
-#it's Workaround
-EXTRA_WGT_POSTINSTALL = "\
-        cyad -s -k MANIFESTS -t allow -c User::App::navigation -u '*' -p 'http://tizen.org/privilege/internal/dbus';\
-        cyad -s -k MANIFESTS -t allow -c User::App::poi -u '*' -p 'http://tizen.org/privilege/internal/dbus';\
-"
 
 FILES_${PN} += " /usr/AGL/apps/*.sh /var/mapdata "