Merge branch 'main' into development/bcm-refsw-20.2

Author: Neeraj Deshpande

board/explora/explora.txt

@@ -1,3 +1,6 @@
+libWPEFramework*
+libprime-video-device-layer.so
+libignition-device-layer.so
 WPENetworkProcess
 WPEWebProcess
 WPEDatabaseProcess
@@ -63,6 +66,7 @@ libgstrtsp-1.0.so
 libgstrtp-1.0.so
 libgsturidownloader-1.0.so
 libgstvideo-1.0.so
+libgstisoff-1.0.so
 libharfbuzz-icu.so
 libharfbuzz.so
 libhogweed.so
@@ -92,7 +96,7 @@ libwebsocket.so
 libWPE.so
 libWPE-platform.so
 libWPEWebInspectorResources.so
-libWPEWebKit-0.1.so
+libWPEWebKit-1.0.so
 libxkbcommon.so
 libxml2.so
 libxslt.so
@@ -125,7 +129,6 @@ libWPEFrameworkMarshallings.so
 libWPEFrameworkCore.so
 libWPEFrameworkCryptalgo.so
 libWPEFrameworkPlugins.so
-libWPEFrameworkProtocols.so
 libWPEFrameworkTracing.so
 libWPEFrameworkVirtualInput.so
 libWPEFrameworkTimeSync.so
@@ -138,7 +141,14 @@ libWPEFrameworkJSONRPCPlugin.so
 libWPEFrameworkPlayerInfo.so
 libWPEFrameworkWebServer.so
 libWPEFrameworkAmazonPrime.so
-libwpe-0.2.so
+libWPEFrameworkWebSocket.so
+libWPEFrameworkCOM.so
+libgiognutls.so
+libWPEInjectedBundle.so
+libWPEFrameworkWebKitBrowserImpl.so
+libdeviceinfo.so
+libignition.so
+libwpe-1.0.so
 libWPEBackend-rdk.so
 libWPEBackend-default.so
 libwebpdemux.so
@@ -175,3 +185,6 @@ libWPEFrameworkInputSwitch.so
 playready
 MeteringCertificate.bin
 cobalt.json
+libpsl.so
+*.pem
+*.crt

board/explora/wpeframework.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export SOURCE=/UserApps/metrological
-export LD_LIBRARY_PATH=$SOURCE/usr/share/ignition/lib:$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib:$SOURCE/usr/lib/wpeframework/plugins:$SOURCE/usr/lib/wpeframework/proxystubs
+export LD_LIBRARY_PATH=$SOURCE/usr/share/ignition/lib:$SOURCE/usr/lib:/lib:/usr/lib:$SOURCE/lib:$SOURCE/usr/lib/wpeframework/plugins:$SOURCE/usr/lib/wpeframework/proxystubs:$SOURCE/usr/libexec/wpe-webkit-1.0
 export PATH=$SOURCE/usr/bin:$PATH
 export GST_PLUGIN_SCANNER=$SOURCE/usr/libexec/gstreamer-1.0/gst-plugin-scanner
 export GST_PLUGIN_SYSTEM_PATH=$SOURCE/usr/lib/gstreamer-1.0
@@ -18,6 +18,10 @@ export NF_GST_AUDIO_PCM_TRANSPORT_UNIT_OVERRIDE=5
 export NF_GST_AUDIO_PCM_LATENCY_OVERRIDE=170
 export NF_SW_PLAYBACK_QUEUE_SIZE_OVERRIDE=32
 export GST_DEBUG=1
+export GST_VIDEO_WINDOW_BOX_MODE='y'
+export GST_VIRTUAL_DISP_WIDTH=1280
+export GST_VIRTUAL_DISP_HEIGHT=720
+export GST_ENABLE_SVP='y'
 
 #FIXME: Temporary solution for TCP receive buffer size
 sysctl net.core.rmem_max=262144 
@@ -78,7 +82,12 @@ case "$1" in
 	if [ ! -f $DRMSTORE ]; then
 		touch /tmp/drmstore
 	fi
-
+        if [ ! -f usr/libexec ]; then
+                ln -s $SOURCE/usr/libexec /usr/libexec
+        fi
+        if [ ! -f /etc/ssl/certs/ca-certificates.crt ]; then
+                ln -s /Systemapps/wpe/metrological/etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+        fi
 	grep -q "/usr/share ext4" /proc/mounts && echo "/usr/share is already mounted" || mount -t ext4 --bind $DESTINATION/share/ /usr/share/
 	grep -q "/etc ext4" /proc/mounts && echo "/etc is already mounted" || mount -t ext4 --bind $DESTINATION/etc/ /etc/
 	grep -q "/usr/lib ext4" /proc/mounts && echo "/usr/lib is already mounted" || mount -t ext4 --bind $DESTINATION/lib/ /usr/lib/

board/raspberrypi/rpi23-linux-5.10.config

@@ -330,7 +330,7 @@ CONFIG_BRCMFMAC_USB=y
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_MATRIX=m
@@ -598,16 +598,18 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
-CONFIG_SND=m
+CONFIG_SND=y
 # CONFIG_SND_PROC_FS is not set
 # CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=y
+CONFIG_SND_SOC=y
+CONFIG_SND_BCM2835_SOC_I2S=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
-# CONFIG_HID_GENERIC is not set
+CONFIG_HID_GENERIC=y
+CONFIG_USB_HID=y
 CONFIG_HID_PID=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
@@ -634,7 +636,7 @@ CONFIG_DMA_BCM2708=y
 # CONFIG_VHOST_MENU is not set
 CONFIG_STAGING=y
 CONFIG_BCM2835_VCHIQ=y
-CONFIG_SND_BCM2835=m
+CONFIG_SND_BCM2835=y
 CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_CODEC_BCM2835=m
 # CONFIG_CLK_BCM2711_DVP is not set

configs/explora_bcm7267_wpe_ml_defconfig

@@ -33,11 +33,12 @@ BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/UserApps/metrological/usr/share/WPEFramewor
 BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/UserApps/metrological/usr/lib/wpeframework/plugins"
 BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/UserApps/metrological/usr/lib/wpeframework/proxystubs"
 BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX="MCA"
+BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS=y
 # BR2_PACKAGE_WPEFRAMEWORK_CDMI_SOFTWARE_OVERRIDE is not set
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_MODULE=y
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_SECURE_STOP_METERING_CERTIFICATE="/UserApps/metrological/root/Netflix/artifacts/MeteringCertificate.bin"
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_MODULE=y
-BR2_PACKAGE_BCM_REFSW_SAGE_WIDEVINE_VERSION_16=y
+BR2_PACKAGE_WIDEVINE_VERSION_16=y
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_DEVICE_CERTIFICATE="/UserApps/metrological/root/OCDM/Widevine/cert.bin"
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_WIDEVINE_STORAGE_LOCATION="/UserApps/metrological/root/OCDM/Widevine"
 BR2_PACKAGE_WPEFRAMEWORK_COBALT=y
@@ -85,7 +86,6 @@ BR2_PACKAGE_WPEFRAMEWORK_PLUGIN_NETFLIX_VP9_HDR=y
 BR2_PACKAGE_WPEFRAMEWORK_PLUGIN_NETFLIX_DEFAULT_LAUGUAGE="en-ZA"
 BR2_PACKAGE_WPEFRAMEWORK_PLUGIN_NETFLIX_DEVICE_KEYS="/tmp/netflix.bin"
 BR2_PACKAGE_WPEFRAMEWORK_PROVISIONING=y
-BR2_PACKAGE_WPEFRAMEWORK_PROVISIONING_CLOUD=y
 BR2_PACKAGE_WPEFRAMEWORK_PROVISIONING_FILES=y
 BR2_PACKAGE_ORC=y
 BR2_PACKAGE_SHARED_MIME_INFO=y

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

@@ -14,6 +14,7 @@ menu "Audio and video applications"
 	source "package/aampabr/Config.in"
 	source "package/alsa-utils/Config.in"
 	source "package/atest/Config.in"
+	source "package/amazon-alexa/Config.in"
 	source "package/amazon-backend/Config.in"
 	source "package/amazon-ignition/Config.in"
 	source "package/aumix/Config.in"
@@ -1703,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"
@@ -1762,6 +1764,7 @@ menu "Other"
 	source "package/apr-util/Config.in"
 	source "package/argp-standalone/Config.in"
 	source "package/armadillo/Config.in"
+	source "package/asio/Config.in"
 	source "package/atf/Config.in"
 	source "package/avro-c/Config.in"
 	source "package/bctoolbox/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

@@ -0,0 +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"

package/amazon-alexa/alexa-pryon-kwd/Config.in

@@ -0,0 +1,13 @@
+menuconfig BR2_PACKAGE_ALEXA_PRYON_KWD
+    bool "alexa-pryon-kwd"
+    help
+        Pryon Key Word Engine for alexa-device-sdk and alexa-smart-screen
+
+if BR2_PACKAGE_ALEXA_PRYON_KWD
+    config BR2_PACKAGE_ALEXA_PRYON_KWD_PLATFORM
+        string "Pryon platform name"
+        default "rpi3"
+        help
+            Platform binaries to be used
+
+endif

package/amazon-alexa/alexa-pryon-kwd/alexa-pryon-kwd.mk

@@ -0,0 +1,23 @@
+################################################################################
+#
+# alexa-pryon-kwd
+#
+################################################################################
+ALEXA_PRYON_KWD_VERSION = 7327f5ed7fb9372c9ba70c2bf3257f8c68831575
+ALEXA_PRYON_KWD_SITE = [email protected]:Metrological/alexa-pryon-kwd.git
+ALEXA_PRYON_KWD_SITE_METHOD = git
+ALEXA_PRYON_KWD_LICENSE = Proprietary
+ALEXA_PRYON_KWD_LICENSE_FILES = LICENSE.txt
+ALEXA_PRYON_KWD_INSTALL_STAGING = YES
+# dependency to ensure that WPEFRAMEWORK_DATA_PATH is set
+ALEXA_PRYON_KWD_DEPENDENCIES = wpeframework
+
+ALEXA_PRYON_KWD_CONF_OPTS += -DALEXA_PRYON_KWD_AVS_DATAPATH="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH))/AVS/"
+ALEXA_PRYON_KWD_CONF_OPTS += -DALEXA_PRYON_KWD_PLATFORM=${BR2_PACKAGE_ALEXA_PRYON_KWD_PLATFORM}
+
+ALEXA_PRYON_KWD_POST_INSTALL_TARGET_HOOKS += REMOVE_HEADERS_FROM_TARGET
+define REMOVE_HEADERS_FROM_TARGET
+	rm -rf ${TARGET_DIR}/usr/include/pryon_lite
+endef
+
+$(eval $(cmake-package))