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

Author: Neeraj Deshpande

package/wpe/wpeframework-clientlibraries/wpeframework-clientlibraries.mk

@@ -117,6 +117,11 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCRYPTOGRAPHY=ON
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCRYPTOGRAPHY_IMPLEMENTATION=Nexus
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS_COMMAND_BASED),y)
+WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DUSE_BROADCOM_SAGE_DRM_API=OFF
+else
+WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DUSE_BROADCOM_SAGE_DRM_API=ON
+endif
 else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_OPENSSL),y)
 WPEFRAMEWORK_CLIENTLIBRARIES_CONF_OPTS += -DCRYPTOGRAPHY_IMPLEMENTATION=OpenSSL
 else ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_THUNDER),y)

package/wpe/wpeframework-plugins/Config.in

@@ -403,13 +403,23 @@ config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_PLATFORMNAME
 
 endif
 
-config BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
-    depends on BR2_PACKAGE_HAS_NEXUS
     bool "DeviceIdentification"
     default y
     help
-      DeviceIdentification Plugin (Nexus OTP)
+      DeviceIdentification Plugin
+
+if BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION_INTERFACE_NAME
+    string "InterfaceName"
+    default "eth0"
+    help
+      Name of interface, which has to be used for the device id generation
+      in case of generic implementation
+
+endif
 
 config BR2_PACKAGE_WPEFRAMEWORK_DISPLAYINFO
     select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
@@ -504,6 +514,19 @@ config BR2_PACKAGE_WPEFRAMEWORK_DICTIONARY
     help
       Dictionary Plugin.
 
+config BR2_PACKAGE_WPEFRAMEWORK_FILETRANSFER
+    select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
+    bool "FileTransfer"
+    help
+      FileTransfer Plugin
+
+config BR2_PACKAGE_WPEFRAMEWORK_FIRMWARECONTROL
+    select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
+    select BR2_PACKAGE_MFR_LIBRARY
+    bool "FirmwareControl"
+    help
+      FirmwareControl Plugin
+
 config BR2_PACKAGE_WPEFRAMEWORK_FRONTPANEL
     select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
     bool "FrontPanel"
@@ -978,19 +1001,6 @@ config BR2_PACKAGE_WPEFRAMEWORK_SYSTEMCOMMANDS
     help
       SystemCommands Plugin
 
-config BR2_PACKAGE_WPEFRAMEWORK_FILETRANSFER
-    select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
-    bool "FileTransfer"
-    help
-      FileTransfer Plugin
-
-config BR2_PACKAGE_WPEFRAMEWORK_FIRMWARECONTROL
-    select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
-    select BR2_PACKAGE_MFR_LIBRARY
-    bool "FirmwareControl"
-    help
-      FirmwareControl Plugin
-
 config BR2_PACKAGE_WPEFRAMEWORK_SECURITYAGENT
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
     select BR2_PACKAGE_WPEFRAMEWORK_SECURITYAGENT_ACCESSOR
@@ -1013,6 +1023,39 @@ config BR2_PACKAGE_WPEFRAMEWORK_SPARK_AUTOSTART
     default n
 endif
 
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD
+    bool "SwitchBoard"
+    help
+      SwitchBoard plugin
+
+if BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD
+
+config BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD_DEFAULT
+    string "Default Callsign"
+    help
+      Callsign of the plugin to be activated in case nothing is active
+
+config BR2_PACKAGE_WPEFRAMEWORK_SWITCH_AMAZON
+    depends on BR2_PACKAGE_WPEFRAMEWORK_AMAZON
+    bool "Amazon"
+    default y
+
+config BR2_PACKAGE_WPEFRAMEWORK_SWITCH_COBALT
+    depends on BR2_PACKAGE_WPEFRAMEWORK_COBALT
+    bool "Cobalt"
+    default y
+
+config BR2_PACKAGE_WPEFRAMEWORK_SWITCH_NETFLIX
+    depends on BR2_PACKAGE_WPEFRAMEWORK_NETFLIX
+    bool "Netflix"
+    default y
+
+config BR2_PACKAGE_WPEFRAMEWORK_SWITCH_WEBKITBROWSER
+    depends on BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
+    bool "WebKitBrowser"
+    default y
+endif
+
 config BR2_PACKAGE_WPEFRAMEWORK_TESTCONTROLLER
     select BR2_PACKAGE_WPEFRAMEWORK_PLUGINS
     bool "TestController"
@@ -1088,6 +1131,10 @@ config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
     bool "injectedbundle"
     default y
 
+config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROW_EXTENSION_DIRECTORY
+    string "extension directory name"
+    default "Extension"
+
 config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL
     string "start-url"
     default "about:blank"

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

@@ -262,6 +262,24 @@ WPEFRAMEWORK_PLUGINS_DEPENDENCIES += libpng
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SNAPSHOT=ON
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += [email protected]:WebPlatformForEmbedded/Snapshot-brcm.git
 endif
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD),y)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCHBOARD=ON
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD_DEFAULT),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCHBOARD_DEFAULT=$(BR2_PACKAGE_WPEFRAMEWORK_SWITCHBOARD_DEFAULT)
+endif
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCH_AMAZON),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCH_AMAZON=ON
+endif
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCH_COBALT),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCH_COBALT=ON
+endif
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCH_NETFLIX),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCH_NETFLIX=ON
+endif
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SWITCH_WEBKITBROWSER),)
+WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SWITCH_WEBKITBROWSER=ON
+endif
+endif
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_SYSTEMCOMMANDS),y)
 WPEFRAMEWORK_PLUGINS_CONF_OPTS += -DPLUGIN_SYSTEMCOMMANDS=ON
 endif

package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk

@@ -174,6 +174,7 @@ endif
 ifeq  ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEIDENTIFICATION=ON
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += [email protected]:WebPlatformForEmbedded/DeviceIdentification-brcm.git
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEIDENTIFICATION_INTERFACE_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION_INTERFACE_NAME)
 endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER),y)
@@ -182,6 +183,7 @@ WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER=ON
 ifneq ($(BR2_PACKAGE_WPEWEBKIT_ALTERNATIVE_EXEC_PATH),"")
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_ALTERNATIVE_EXEC_PATH="$(call qstrip,$(BR2_PACKAGE_WPEWEBKIT_ALTERNATIVE_EXEC_PATH))"
 endif
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_EXTENSION_DIRECTORY=$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROW_EXTENSION_DIRECTORY)
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TAB),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_AMAZON_HYBRID=ON
 endif

package/wpe/wpeframework-switchboard/Config.in

@@ -60,6 +60,10 @@ config BR2_PACKAGE_WPEFRAMEWORK_INTERFACE
     string "interface"
     default ""
 
+config BR2_PACKAGE_WPEFRAMEWORK_ETHERNETCARD_NAME
+    string "ethernet card name"
+    default "eth0"
+
 config BR2_PACKAGE_WPEFRAMEWORK_IDLE_TIME
     string "idle-time"
     default "180"
@@ -212,6 +216,28 @@ config BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS
 	help
 	  Use Nexus as cryptography backend.
 endchoice
+
+if BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS
+menu "Nexus Implemention Options"
+choice BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_NEXUS_IMPLEMENTATION
+	prompt "Implementation"
+	default BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS_DRM_BASED
+	help
+	  Choose Nexus implementation type
+
+config BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS_DRM_BASED
+	bool "DRM based"
+	help
+	  Use DRM based implementation.
+
+config BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS_COMMAND_BASED
+	config BR2_PACKAGE_WPEFRAMEWORK_CRYPTOGRAPHY_IMPLEMENTATION_NEXUS_COMMAND_BASED
+	bool "TEE Command based"
+	help
+	  Use TEE Command based implementation
+endchoice
+endmenu
+endif
 endif
 
 config BR2_PACKAGE_WPEFRAMEWORK_WARNING_REPORTING
@@ -311,7 +337,6 @@ source "package/wpe/wpeframework-netflix/Config.in"
 source "package/wpe/wpeframework-playgiga/Config.in"
 source "package/wpe/wpeframework-provisioning/Config.in"
 source "package/wpe/wpeframework-spotify/Config.in"
-source "package/wpe/wpeframework-switchboard/Config.in"
 source "package/wpe/wpeframework-ui/Config.in"
 endmenu
 

package/wpe/wpeframework-switchboard/wpeframework-switchboard.mk

@@ -18,6 +18,7 @@ WPEFRAMEWORK_CONF_OPTS += -DDATA_PATH=$(BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH)
 WPEFRAMEWORK_CONF_OPTS += -DSYSTEM_PATH=$(BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH)
 WPEFRAMEWORK_CONF_OPTS += -DPROXYSTUB_PATH=$(BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH)
 WPEFRAMEWORK_CONF_OPTS += -DOOMADJUST=$(BR2_PACKAGE_WPEFRAMEWORK_OOM_ADJUST)
+WPEFRAMEWORK_CONF_OPTS += -DETHERNETCARD_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_ETHERNETCARD_NAME)
 
 # WPEFRAMEWORK_CONF_OPTS += -DWEBSERVER_PATH=
 # WPEFRAMEWORK_CONF_OPTS += -DWEBSERVER_PORT=
@@ -124,6 +125,10 @@ WPEFRAMEWORK_EXTERN_EVENTS += Platform
 WPEFRAMEWORK_EXTERN_EVENTS += Graphics
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION),y)
+WPEFRAMEWORK_EXTERN_EVENTS += Identifier
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_NETWORKCONTROL),y)
 WPEFRAMEWORK_EXTERN_EVENTS += Network
 endif

package/wpe/wpeframework/Config.in

@@ -123,6 +123,7 @@ WPEWEBKIT_FLAGS = \
 	-DENABLE_MINIBROWSER=OFF \
 	-DSILENCE_CROSS_COMPILATION_NOTICES=ON \
 	-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
+	-DENABLE_ACCELERATED_2D_CANVAS=ON \
 	-DUSE_WOFF2=OFF
 
 ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y)