From 8bf3c50ab7eb48f8db63ea41d6a12e32f3633dee Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 8 Sep 2020 13:23:42 -0400 Subject: meta-speech-framework: Update Alexa Auto SDK to v2.3 Changes: - Mask out the duplicate libopus recipe, the same version is available from a recipe in meta-oe. - Update BBFILES addition for the audio module in the feature template to work with yet another new audio output backend. - Update the AlexaAutoCoreEngineConfig.json.in template based on the new sample JSON in 2.3. - Update alexa-voiceagent-config recipe to add new configuration variables ALEXA_LOCALE, ALEXA_TIMEZONE, ALEXA_MFG_NAME, and ALEXA_DESCRIPTION to match requirements of the updated configuration JSON. - Remove local alexa-voiceagent-service patches merged by Amazon, and update 0001-remove-library-dependency-copying.patch for 2.3. - Update SDK module DEPENDS for alexa-voiceagent-service recipe to match what seems required now with 2.3. - Remove avs-device-sdk patch for building with g++ 9.x, as it is no longer required. - Add avs-device-sdk patch to workaround hang seen on first connection. - Add bbappends for aac-module-car-control and aac-module-messaging recipes to fix their nlohmann-json DEPENDS to work with the recipe that is available in meta-oe. - Rework aac-module-system-audio.bbappend to enable the PipeWire support that has been merged into the module. Bug-AGL: SPEC-3783 Signed-off-by: Scott Murray Change-Id: I18c910f9cbf874fef85d1d84508f6666d53629ed (cherry picked from commit e0d5ad833e89f47c88601e15158015319e568af8) --- .../0001-enable-building-with-g++-9.patch | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch (limited to 'meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch') diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch deleted file mode 100644 index 0e4f14fd..00000000 --- a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch +++ /dev/null @@ -1,24 +0,0 @@ -Enable building with g++ 9.x - -Disable -Werror for new warning "deprecated-copy" to avoid build -failure in the packaged copy of googletest with g++ 9.x. This is -hopefully temporary until googletest is upgraded or it becomes -straightforward to build against an externally provided copy. - -Upstream-Status: pending - -Signed-off-by: Scott Murray - -diff --git a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake -index 777b91e..7832f20 100644 ---- a/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake -+++ b/ThirdParty/googletest-release-1.8.0/googletest/cmake/internal_utils.cmake -@@ -91,7 +91,7 @@ macro(config_compiler_and_linker) - set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0") - set(cxx_no_rtti_flags "-GR-") - elseif (CMAKE_COMPILER_IS_GNUCXX) -- set(cxx_base_flags "-Wall -Wshadow") -+ set(cxx_base_flags "-Wall -Wshadow -Wno-error=deprecated-copy") - set(cxx_exception_flags "-fexceptions") - set(cxx_no_exception_flags "-fno-exceptions") - # Until version 4.3.2, GCC doesn't define a macro to indicate -- cgit 1.2.3-korg