Merge remote-tracking branch 'upstream/main' into main

Author: pwielders

configs/raspberrypi3_wpe_ml_defconfig

@@ -56,6 +56,7 @@ BR2_PACKAGE_MPG123=y
 BR2_PACKAGE_NETFLIX52=y
 BR2_PACKAGE_NETFLIX52_AUDIO_MIXER=y
 BR2_PACKAGE_BITSTREAM_VERA=y
+BR2_PACKAGE_RPI_BT_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y

package/Config.in

@@ -1704,6 +1704,7 @@ menu "Networking"
 	source "package/libpagekite/Config.in"
 	source "package/libpcap/Config.in"
 	source "package/libpjsip/Config.in"
+	source "package/libpsl/Config.in"
 	source "package/librsync/Config.in"
 	source "package/libshairplay/Config.in"
 	source "package/libshout/Config.in"

package/Config.in.host

@@ -46,6 +46,7 @@ menu "Host utilities"
 	source "package/mtd/Config.in.host"
 	source "package/mtools/Config.in.host"
 	source "package/mxsldr/Config.in.host"
+	source "package/nodejs/Config.in.host"
 	source "package/omap-u-boot-utils/Config.in.host"
 	source "package/openocd/Config.in.host"
 	source "package/opkg-utils/Config.in.host"

package/amazon-alexa/Config.in

@@ -1,4 +1,5 @@
 source "package/amazon-alexa/alexa-pryon-kwd/Config.in"
 source "package/amazon-alexa/alexa-smart-screen-sdk/Config.in"
+source "package/amazon-alexa/apl-client-library/Config.in"
 source "package/amazon-alexa/apl-core-library/Config.in"
 source "package/amazon-alexa/avs-device-sdk/Config.in"

…en-sdk/0005-Allow-in-source-builds.patch …en-sdk/0001-Allow-in-source-builds.patchpackage/amazon-alexa/alexa-smart-screen-sdk/0005-Allow-in-source-builds.patch renamed to package/amazon-alexa/alexa-smart-screen-sdk/0001-Allow-in-source-builds.patch package/amazon-alexa/alexa-smart-screen-sdk/0005-Allow-in-source-builds.patch renamed to package/amazon-alexa/alexa-smart-screen-sdk/0001-Allow-in-source-builds.patch

@@ -1,13 +1,13 @@
 diff --git a/modules/Alexa/build/BuildDefaults.cmake b/modules/Alexa/build/BuildDefaults.cmake
-index cc0f1f9..93e3e80 100644
+index 251b66e..9bdec43 100644
 --- a/modules/Alexa/build/BuildDefaults.cmake
 +++ b/modules/Alexa/build/BuildDefaults.cmake
-@@ -4,7 +4,7 @@
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
+@@ -23,7 +23,7 @@ macro(include_once module)
+ endmacro()
 
  # Disallow out-of-source-builds.
--include(DisallowOutOfSourceBuilds)
-+#include(DisallowOutOfSourceBuilds)
+-include_once(DisallowOutOfSourceBuilds)
++#include_once(DisallowOutOfSourceBuilds)
 
  # Setup default build options, like compiler flags and build type.
- include(BuildOptions)
+ include_once(BuildOptions)

package/amazon-alexa/alexa-smart-screen-sdk/0001-Remove_additional_linking.patch

@@ -0,0 +1,13 @@
+diff --git a/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h b/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
+index df998ac..6e430f9 100644
+--- a/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
++++ b/modules/Alexa/SampleApp/include/SampleApp/SampleApplication.h
+@@ -154,7 +154,7 @@ public:
+             alexaClientSDK::avsCommon::sdkInterfaces::ChannelVolumeInterface::Type speakerType);
+     };
+ 
+-private:
++protected:
+     /**
+      * Initialize a SampleApplication.
+      *

package/amazon-alexa/alexa-smart-screen-sdk/0002-Allow_disabling_GUIClient_and_set_install_path.patch

@@ -0,0 +1,35 @@
+diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
+index 45145b6..8bfaed4 100644
+--- a/modules/CMakeLists.txt
++++ b/modules/CMakeLists.txt
+@@ -6,5 +6,8 @@ project(modules LANGUAGES CXX)
+ add_subdirectory("Alexa")
+ if (NOT MSVC)
+ 	# For UWP, build the GUIClient on UWP branch on a different platform
+-	add_subdirectory("GUI")
+-endif()
+\ No newline at end of file
++    set(JS_GUICLIENT_ENABLE OFF CACHE BOOL "Build the JS GUI Client")
++    if(${JS_GUICLIENT_ENABLE})
++        add_subdirectory("GUI")
++    endif()
++endif()
+diff --git a/modules/GUI/CMakeLists.txt b/modules/GUI/CMakeLists.txt
+index 4094546..feadbf3 100644
+--- a/modules/GUI/CMakeLists.txt
++++ b/modules/GUI/CMakeLists.txt
+@@ -21,12 +21,13 @@ else()
+     set(RTCSC_JS_PATH_VALUE "${CMAKE_CURRENT_SOURCE_DIR}/js/src/lib/liveView/RTCSC_Adapter_Stub")
+ endif()
+ 
++set(JS_GUICLIENT_INSTALL_PATH "" CACHE STRING "The install path")
+ add_custom_target(GUIClient ALL
+         COMMAND "npm" "install"
+         COMMAND "npm" "install" "${APL_CLIENT_JS_PATH}"
+         COMMAND "npm" "install" "${RTCSC_JS_PATH_VALUE}"
+         COMMAND "npm" "run" "build" "--"
+-            "--output-path" "${CMAKE_CURRENT_BINARY_DIR}"
++            "--output-path" "${JS_GUICLIENT_INSTALL_PATH}"
+             "--env" "DISABLE_WEBSOCKET_SSL=${DISABLE_WEBSOCKET_SSL_VALUE}"
+             "--env" "USE_UWP_CLIENT=${USE_UWP_CLIENT_VALUE}"
+             "--env" "RTCSC_ENABLED=${RTCSC_ENABLED_VALUE}"