diff options
Diffstat (limited to 'meta-speech-framework')
4 files changed, 33 insertions, 1 deletions
diff --git a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc index 10df0926..21da324e 100644 --- a/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc +++ b/meta-speech-framework/conf/include/agl-voiceagent-alexa.inc @@ -2,6 +2,11 @@ # from meta-aac to avoid triggering rebuilds of all curl dependencies when # agl-voiceagent-alexa is configured. BBMASK += "meta-aac/recipes-support/curl/curl_%.bbappend" +# Mask out the nghttp2 recipe in meta-aac as well, since the same version +# is available in meta-networking, and due to meta-aac having a higher +# layer priority, rebuilds will be triggered when the voiceagent feature +# is configured and the layer is added. +BBMASK += "meta-aac/recipes-connectivity/nghttp2" PREFERRED_RPROVIDER_virtual/voice-high-config = "alexa-voice-high-config" diff --git a/meta-speech-framework/conf/layer.conf b/meta-speech-framework/conf/layer.conf index ce97b9e0..804eae66 100644 --- a/meta-speech-framework/conf/layer.conf +++ b/meta-speech-framework/conf/layer.conf @@ -24,4 +24,4 @@ BBFILE_COLLECTIONS += "speech-framework" BBFILE_PATTERN_speech-framework = "^${LAYERDIR}/" BBFILE_PRIORITY_speech-framework = "8" -LAYERSERIES_COMPAT_speech-framework = "thud" +LAYERSERIES_COMPAT_speech-framework = "zeus" 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 new file mode 100644 index 00000000..0e4f14fd --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-enable-building-with-g++-9.patch @@ -0,0 +1,24 @@ +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 <scott.murray@konsulko.com> + +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 diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend new file mode 100644 index 00000000..8afb91a9 --- /dev/null +++ b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.13.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://0001-enable-building-with-g++-9.patch" |