agl-basesystem 0.1sandbox/ToshikazuOhiwa/master

1 files changed, 22 insertions, 3 deletions

diff --git a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
index 296cf2d2..f0211552 100644
--- a/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
+++ b/meta-agl-devel/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb
@@ -17,13 +17,17 @@ DEPENDS = " \
 	aac-module-navigation \
 	aac-module-phone-control \
 	aac-module-gstreamer \
+	${@bb.utils.contains("ALEXA_WAKEWORD", "true", "aac-module-amazonlite pryon-lite", "", d)} \
 "
 
 SRC_URI = "git://github.com/alexa/alexa-auto-sdk.git;protocol=https;branch=2.0 \
+           file://alexa.json \
            file://0001-remove-library-dependency-copying.patch \
            file://0002-update-config.xml.in.patch \
            file://0003-update-audio-device-configuration.patch \
            file://0004-update-config-and-database-paths.patch \
+           file://0005-fix-segmentation-fault-for-release-build-mode.patch \
+           file://0006-fix-event-argument-json.patch \
 "
 SRCREV = "86916d2d8c1702a8be3c88a9012ca56583bcc0c8"
 
@@ -34,8 +38,23 @@ inherit cmake aglwgt
 
 EXTRA_OECMAKE += "-DAAC_HOME=${RECIPE_SYSROOT}/${AAC_PREFIX}"
 
+ALEXA_WAKEWORD ??= "false"
+
+do_install_append() {
+    install -D -m 0644 ${WORKDIR}/alexa.json ${D}${sysconfdir}/xdg/AGL/voiceagents/alexa.json
+}
+
+PACKAGES =+ "${PN}-conf"
+
+FILES_${PN}-conf = "${sysconfdir}/xdg/AGL/voiceagents/*"
+
 # NOTE: curl and opus are from the base SDK libraries, sqlite3 from the
 #       core module
-RDEPENDS_${PN} += "libcurl libopus libsqlite3"
-
-RPROVIDES_${PN} += "virtual/voiceagent"
+RDEPENDS_${PN} += " \
+	libcurl \
+	libopus \
+	libsqlite3 \
+	${PN}-conf \
+	${@bb.utils.contains("ALEXA_WAKEWORD", "true", "pryon-lite", "", d)} \
+	gstreamer1.0-plugins-bad-hls \
+"