From efc3de9ad64b322b1b4025d0a75150d2a3bf00ed Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 12 Sep 2019 13:30:23 -0400 Subject: Add agl-voiceagent-alexa feature Add feature and associated recipes and bbappends to enable building the Amazon Alexa voice agent for the speech framework using the Alexa Automotive SDK 2.0 release. A separate feature is used to accomodate potentially building with a different voiceagent provider. Some follow on development is required to add PipeWire support to the new gstreamer extension added in AAC 2.0, see SPEC-2767. Bug-AGL: SPEC-2765 Change-Id: Ie6e8f6a7965f8014ca2e64a2535faec073e320bc Signed-off-by: Scott Murray (cherry picked from commit e4a71cfe9b53795dd456cb8bd776c5196e924acf) --- .../0001-remove-library-dependency-copying.patch | 30 +++++++++++++++++ .../alexa-voiceagent-service_git.bb | 38 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch create mode 100644 meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb (limited to 'meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service') diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch new file mode 100644 index 00000000..7b0141c4 --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch @@ -0,0 +1,30 @@ +Remove copying of library dependencies + +Since we are targeting building into an image, the widget build does +not have to copy host library dependencies into the widget as it would +when being built standalone with the SDK. Remove the copying, as +runtime dependencies will be used to pull the libraries in. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Scott Murray + +diff --git a/platforms/agl/alexa-voiceagent-service/libs/CMakeLists.txt b/platforms/agl/alexa-voiceagent-service/libs/CMakeLists.txt +index 4732e7b..ffc149d 100644 +--- a/libs/CMakeLists.txt ++++ b/libs/CMakeLists.txt +@@ -70,14 +70,6 @@ add_avs_library(SpeechEncoder ${AAC_HOME}/lib/libSpeechEncoder.so) + add_avs_library(OpusEncoderContext ${AAC_HOME}/lib/libOpusEncoderContext.so) + add_avs_library(SpeechSynthesizer ${AAC_HOME}/lib/libSpeechSynthesizer.so) + add_avs_library(TemplateRuntime ${AAC_HOME}/lib/libTemplateRuntime.so) +-#add_avs_library(curl ${AAC_HOME}/lib/libcurl.so.4.5.0) +-add_avs_library(curl ${AAC_HOME}/lib/libcurl.so.4) +-#add_avs_library(nghttp2 ${AAC_HOME}/lib/libnghttp2.so.14.16) +-add_avs_library(nghttp2 ${AAC_HOME}/lib/libnghttp2.so.14) +-#add_avs_library(opus ${AAC_HOME}/lib/libopus.so.0.6.1) +-add_avs_library(opus ${AAC_HOME}/lib/libopus.so.0) +-#add_avs_library(sqlite3 ${AAC_HOME}/lib/libsqlite3.so.0.8.6) +-add_avs_library(sqlite3 ${AAC_HOME}/lib/libsqlite3.so.0) + add_avs_library(equalizer ${AAC_HOME}/lib/libEqualizer.so) + add_avs_library(EqualizerImplementations ${AAC_HOME}/lib/libEqualizerImplementations.so) + diff --git a/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb new file mode 100644 index 00000000..ec7a1e9d --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "Alexa voice agent binding" +DESCRIPTION = "alexa-voiceagent-service is an Alexa Auto SDK based voiceagent binding" +HOMEPAGE = "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-voice-high" +SECTION = "apps" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +DEPENDS = " \ + libafb-helpers \ + libappcontroller \ + avs-device-sdk \ + aac-module-core \ + aac-module-alexa \ + aac-module-cbl \ + aac-module-contact-uploader \ + aac-module-navigation \ + aac-module-phone-control \ + aac-module-gstreamer \ +" + +SRC_URI = "git://github.com/alexa/alexa-auto-sdk.git;protocol=https;branch=2.0 \ + file://0001-remove-library-dependency-copying.patch \ +" +SRCREV = "86916d2d8c1702a8be3c88a9012ca56583bcc0c8" + +PV = "2.0+git${SRCPV}" +S = "${WORKDIR}/git/platforms/agl/alexa-voiceagent-service" + +inherit cmake aglwgt + +EXTRA_OECMAKE += "-DAAC_HOME=${RECIPE_SYSROOT}/${AAC_PREFIX}" + +# NOTE: curl and opus are from the base SDK libraries, sqlite3 from the +# core module +RDEPENDS_${PN} += "libcurl libopus libsqlite3" + +RPROVIDES_${PN} += "virtual/voiceagent" -- cgit 1.2.3-korg