diff options
Diffstat (limited to '_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service')
3 files changed, 333 insertions, 0 deletions
diff --git a/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch b/_to_remove/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..ee61ac20 --- /dev/null +++ b/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0001-remove-library-dependency-copying.patch @@ -0,0 +1,33 @@ +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 <scott.murray@konsulko.com> + +diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt +index 8a955feb..5b097877 100644 +--- a/libs/CMakeLists.txt ++++ b/libs/CMakeLists.txt +@@ -92,16 +92,11 @@ add_avs_library(SQLiteStorage ${AAC_HOME}/lib/libSQLiteStorage.so) + add_avs_library(SystemSoundPlayer ${AAC_HOME}/lib/libSystemSoundPlayer.so) + add_avs_library(TemplateRuntime ${AAC_HOME}/lib/libTemplateRuntime.so) + add_avs_library(ToggleController ${AAC_HOME}/lib/libToggleController.so) +-add_avs_library(curl ${AAC_HOME}/lib/libcurl.so.4) +-add_avs_library(nghttp2 ${AAC_HOME}/lib/libnghttp2.so.14) +-add_avs_library(opus ${AAC_HOME}/lib/libopus.so.0) +-add_avs_library(sqlite3 ${AAC_HOME}/lib/libsqlite3.so.0) + +-if(EXISTS ${AAC_HOME}/lib/libpryon_lite.so.1.13) ++if(EXISTS ${AAC_HOME}/lib/libAACEAmazonLiteEngine.so) + add_aace_library(AACEAmazonLiteEngine) + add_avs_library(AMAZONLITE ${AAC_HOME}/lib/libAMAZONLITE.so) + add_avs_library(KeywordDetectorProvider ${AAC_HOME}/lib/libKeywordDetectorProvider.so) +- add_avs_library(pryon_lite ${AAC_HOME}/lib/libpryon_lite.so.1.13) + endif() + + if(EXISTS ${AAC_HOME}/share/cmake/AACESystemAudio.cmake) diff --git a/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch b/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch new file mode 100644 index 00000000..5886709b --- /dev/null +++ b/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/0007-add-autobuild-scripts.patch @@ -0,0 +1,286 @@ +Add autobuild scripts + +Add autobuild scripts and update .gitignore to not ignore them. +The autobuild/agl/autobuild script will be required for building widgets +in AGL, add the latest version to the voiceagent source tree. + +Upstream-Status: Pending + +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +diff --git a/.gitignore b/.gitignore +index b3c1108..edbf1b5 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,3 +1,2 @@ +-autobuild/ + build/ + alexa-voiceagent-apidef.h +diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild +new file mode 100755 +index 0000000..16181b8 +--- /dev/null ++++ b/autobuild/agl/autobuild +@@ -0,0 +1,128 @@ ++#!/usr/bin/make -f ++# Copyright (C) 2015 - 2018 "IoT.bzh" ++# Copyright (C) 2020 Konsulko Group ++# Author "Romain Forlot" <romain.forlot@iot.bzh> ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++THISFILE := $(lastword $(MAKEFILE_LIST)) ++ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) ++ ++# Build directories ++# Note that the debug/test/coverage directories are defined in relation ++# to the release directory (BUILD_DIR), this needs to be kept in mind ++# if over-riding it and building those widget types, the specific widget ++# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified ++# to yield the desired output hierarchy. ++BUILD_DIR = $(ROOT_DIR)/build ++BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) ++BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test) ++BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage) ++ ++# Output directory variable for use in pattern rules. ++# This is intended for internal use only, hence the explicit override ++# definition. ++override OUTPUT_DIR = $(BUILD_DIR) ++ ++# Final install directory for widgets ++DEST = $(OUTPUT_DIR) ++ ++# Default build type for release/test builds ++BUILD_TYPE = RELEASE ++ ++.PHONY: all help update install distclean ++.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all ++.PHONY: configure configure-release configure-debug configure-test configure-coverage ++.PHONY: build build-release build-debug build-test build-coverage build-all ++.PHONY: package package-release package-debug package-test package-coverage package-all ++ ++help: ++ @echo "List of targets available:" ++ @echo "" ++ @echo "- all" ++ @echo "- help" ++ @echo "- clean" ++ @echo "- distclean" ++ @echo "- configure" ++ @echo "- build: compilation, link and prepare files for package into a widget" ++ @echo "- package: output a widget file '*.wgt'" ++ @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory" ++ @echo "" ++ @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt" ++ @echo "Don't use your build dir as DEST as wgt file is generated at this location" ++ ++all: package-all ++ ++# Target specific variable over-rides so static pattern rules can be ++# used for the various type-specific targets. ++ ++configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST) ++ ++configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE) ++configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE ++ ++configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) ++configure-debug build-debug package-debug: BUILD_TYPE = DEBUG ++ ++clean-release clean-test clean-debug clean-coverage: ++ @if [ -d $(OUTPUT_DIR) ]; then \ ++ $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ ++ else \ ++ echo Nothing to clean; \ ++ fi ++ ++clean: clean-release ++ ++clean-all: clean-release clean-test clean-debug clean-coverage ++ ++distclean: clean-all ++ ++configure-release configure-test configure-debug configure-coverage: ++ @mkdir -p $(OUTPUT_DIR) ++ @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ ++ (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \ ++ fi ++ ++configure: configure-release ++ ++build-release build-debug build-coverage: build-%: configure-% ++ @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all ++ ++# Kept for consistency, empty to avoid building everything for test widget ++build-test: configure-test ++ ++build: build-release ++ ++build-all: build-release build-debug build-test build-coverage ++ ++package-release package-debug package-coverage: package-%: build-% ++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget ++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ ++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ ++ fi ++ ++package-test: build-test ++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget ++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ ++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ ++ fi ++ ++package: package-release ++ ++package-all: package-release package-test package-coverage package-debug ++ ++update: configure ++ @cmake --build $(BUILD_DIR) --target autobuild ++ ++install: build ++ @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install +diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild +new file mode 100755 +index 0000000..16181b8 +--- /dev/null ++++ b/autobuild/linux/autobuild +@@ -0,0 +1,128 @@ ++#!/usr/bin/make -f ++# Copyright (C) 2015 - 2018 "IoT.bzh" ++# Copyright (C) 2020 Konsulko Group ++# Author "Romain Forlot" <romain.forlot@iot.bzh> ++# ++# Licensed under the Apache License, Version 2.0 (the "License"); ++# you may not use this file except in compliance with the License. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++THISFILE := $(lastword $(MAKEFILE_LIST)) ++ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) ++ ++# Build directories ++# Note that the debug/test/coverage directories are defined in relation ++# to the release directory (BUILD_DIR), this needs to be kept in mind ++# if over-riding it and building those widget types, the specific widget ++# type variable (e.g. BUILD_DIR_DEBUG) may also need to be specified ++# to yield the desired output hierarchy. ++BUILD_DIR = $(ROOT_DIR)/build ++BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) ++BUILD_DIR_TEST = $(abspath $(BUILD_DIR)/../build-test) ++BUILD_DIR_COVERAGE = $(abspath $(BUILD_DIR)/../build-coverage) ++ ++# Output directory variable for use in pattern rules. ++# This is intended for internal use only, hence the explicit override ++# definition. ++override OUTPUT_DIR = $(BUILD_DIR) ++ ++# Final install directory for widgets ++DEST = $(OUTPUT_DIR) ++ ++# Default build type for release/test builds ++BUILD_TYPE = RELEASE ++ ++.PHONY: all help update install distclean ++.PHONY: clean clean-release clean-debug clean-test clean-coverage clean-all ++.PHONY: configure configure-release configure-debug configure-test configure-coverage ++.PHONY: build build-release build-debug build-test build-coverage build-all ++.PHONY: package package-release package-debug package-test package-coverage package-all ++ ++help: ++ @echo "List of targets available:" ++ @echo "" ++ @echo "- all" ++ @echo "- help" ++ @echo "- clean" ++ @echo "- distclean" ++ @echo "- configure" ++ @echo "- build: compilation, link and prepare files for package into a widget" ++ @echo "- package: output a widget file '*.wgt'" ++ @echo "- install: install in your $(CMAKE_INSTALL_DIR) directory" ++ @echo "" ++ @echo "Usage: ./autobuild/agl/autobuild package DEST=${HOME}/opt" ++ @echo "Don't use your build dir as DEST as wgt file is generated at this location" ++ ++all: package-all ++ ++# Target specific variable over-rides so static pattern rules can be ++# used for the various type-specific targets. ++ ++configure-test build-test package-test clean-test: OUTPUT_DIR = $(BUILD_DIR_TEST) ++ ++configure-coverage build-coverage package-coverage clean-coverage: OUTPUT_DIR = $(BUILD_DIR_COVERAGE) ++configure-coverage build-coverage package-coverage: BUILD_TYPE = COVERAGE ++ ++configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) ++configure-debug build-debug package-debug: BUILD_TYPE = DEBUG ++ ++clean-release clean-test clean-debug clean-coverage: ++ @if [ -d $(OUTPUT_DIR) ]; then \ ++ $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ ++ else \ ++ echo Nothing to clean; \ ++ fi ++ ++clean: clean-release ++ ++clean-all: clean-release clean-test clean-debug clean-coverage ++ ++distclean: clean-all ++ ++configure-release configure-test configure-debug configure-coverage: ++ @mkdir -p $(OUTPUT_DIR) ++ @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ ++ (cd $(OUTPUT_DIR) && cmake -S $(ROOT_DIR) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) $(CONFIGURE_ARGS)); \ ++ fi ++ ++configure: configure-release ++ ++build-release build-debug build-coverage: build-%: configure-% ++ @cmake --build $(OUTPUT_DIR) $(BUILD_ARGS) --target all ++ ++# Kept for consistency, empty to avoid building everything for test widget ++build-test: configure-test ++ ++build: build-release ++ ++build-all: build-release build-debug build-test build-coverage ++ ++package-release package-debug package-coverage: package-%: build-% ++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target widget ++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ ++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ ++ fi ++ ++package-test: build-test ++ @cmake --build $(OUTPUT_DIR) $(PACKAGE_ARGS) --target test_widget ++ @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ ++ mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ ++ fi ++ ++package: package-release ++ ++package-all: package-release package-test package-coverage package-debug ++ ++update: configure ++ @cmake --build $(BUILD_DIR) --target autobuild ++ ++install: build ++ @cmake --build $(BUILD_DIR) $(INSTALL_ARGS) --target install diff --git a/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/alexa.json b/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/alexa.json new file mode 100644 index 00000000..48918015 --- /dev/null +++ b/_to_remove/meta-speech-framework/meta-aac/recipes-apis/alexa-voiceagent-service/alexa-voiceagent-service/alexa.json @@ -0,0 +1,14 @@ +{ + "id": "VA-001", + "active": true, + "name": "Alexa", + "api": "alexa-voiceagent", + "wakewords": [ + "alexa", + "computer", + "echo" + ], + "activewakeword": "alexa", + "description": "Alexa voice assistant by Amazon.", + "vendor": "Amazon.com Services Inc" +} |