Merge branch 'main' into R3

Author: Divya-563

board/raspberrypi/rpi23-linux-5.10.config

@@ -41,6 +41,7 @@ CONFIG_VMSPLIT_2G=y
 # CONFIG_CPU_SW_DOMAIN_PAN is not set
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_ATAGS is not set
+# CONFIG_STACKPROTECTOR_PER_TASK is not set
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y

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/Config.in

@@ -212,6 +212,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

package/wpe/wpewebkit/wpewebkit.mk

@@ -114,6 +114,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)