Merge pull request #367 from WebPlatformForEmbedded/main-update

Neeraj Deshpande · web-flow · commit 90e87fd06619 · 2021-11-17T19:47:10.000+05:30
Modified gst1-bcm package to use different repo for Arris platform.
diff --git a/package/cobalt/cobalt.mk b/package/cobalt/cobalt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COBALT_VERSION = 2a5904e00679b00c62cb9966b6f199a5be4983ed
+COBALT_VERSION = 24a9a00b2442c969b41ceeaa85380c390f8c34ea
 COBALT_SITE_METHOD = git
 COBALT_SITE = git@github.com:Metrological/cobalt
 COBALT_INSTALL_STAGING = YES
diff --git a/package/gstreamer1/gst1-bcm/gst1-bcm.mk b/package/gstreamer1/gst1-bcm/gst1-bcm.mk
@@ -5,8 +5,13 @@
 ################################################################################
 
 ifneq ($(filter y,$(BR2_PACKAGE_GST1_BCM_UNIFIED_VERSION)),)
+ifeq ($(BR2_PACKAGE_BCM_REFSW),y)
+GST1_BCM_SITE = git@github.com:Metrological/bcm-gstreamer.git
+GST1_BCM_VERSION = 4b45733aa25ae68f3fa7205c724f77c6a4e622c5
+else
 GST1_BCM_SITE = git@github.com:Metrological/bcm-collaboration
 GST1_BCM_VERSION = 0846f6294a8a7851e405d7f2c4e2d3af27ba3817
+endif
 else
 GST1_BCM_SITE = git@github.com:Metrological/gstreamer-plugins-soc.git
 
diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk
@@ -3,7 +3,7 @@
 # wpeframework-cdmi-clearkey
 #
 ################################################################################
-WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 216f15eea89adc777ceed2b702eeccb9ee02d1ee
+WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 84277d73751275a514976f9fcee0bfb8c6720dc1
 WPEFRAMEWORK_CDMI_CLEARKEY_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_CLEARKEY_SITE = git@github.com:rdkcentral/OCDM-Clearkey.git
 WPEFRAMEWORK_CDMI_CLEARKEY_INSTALL_STAGING = YES
diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 ifeq ($(BR2_PACKAGE_PLAYREADY4),y)
-WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 92bdcd9ce3636120610df195a93e3988d9e8b0fc
+WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = bf1d4afd0873ff5e38be303a1176d1a4ab3850a3
 else
 WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 59b3deba0710b9f372fd333fcc7aca2ebed483a6
 endif
diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk
@@ -3,7 +3,7 @@
 # wpeframework-cdmi-widevine
 #
 ################################################################################
-WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = c03425345a2ca92f13d4592b9e6e1e04ef342429
+WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 90befe56289c3192739c84257a05e70fe53c94d8
 WPEFRAMEWORK_CDMI_WIDEVINE_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_WIDEVINE_SITE = git@github.com:rdkcentral/OCDM-Widevine.git
 WPEFRAMEWORK_CDMI_WIDEVINE_INSTALL_STAGING = NO
diff --git a/package/wpe/wpeframework-clientlibraries/wpeframework-clientlibraries.mk b/package/wpe/wpeframework-clientlibraries/wpeframework-clientlibraries.mk
@@ -3,7 +3,7 @@
 # wpeframework-clientlibraries
 #
 ################################################################################
-WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = d0f8ef5eac4b2baa073bcbce32b979d40b427017
+WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 320301725af195d538363cd8eed59a98daf910b2
 WPEFRAMEWORK_CLIENTLIBRARIES_SITE = $(call github,rdkcentral,ThunderClientLibraries,$(WPEFRAMEWORK_CLIENTLIBRARIES_VERSION))
 WPEFRAMEWORK_CLIENTLIBRARIES_INSTALL_STAGING = YES
 WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES = wpeframework wpeframework-interfaces
diff --git a/package/wpe/wpeframework-interfaces/wpeframework-interfaces.mk b/package/wpe/wpeframework-interfaces/wpeframework-interfaces.mk
@@ -3,7 +3,7 @@
 # wpeframework-interfaces
 #
 ################################################################################
-WPEFRAMEWORK_INTERFACES_VERSION = 9aee40151fba9aef6c5f0e17bb149c4576ff29d6
+WPEFRAMEWORK_INTERFACES_VERSION = ea1517d4e6a1ec4cc9ce149657360c4dd8bc2d65
 WPEFRAMEWORK_INTERFACES_SITE = $(call github,rdkcentral,ThunderInterfaces,$(WPEFRAMEWORK_INTERFACES_VERSION))
 WPEFRAMEWORK_INTERFACES_INSTALL_STAGING = YES
 WPEFRAMEWORK_INTERFACES_DEPENDENCIES = wpeframework
diff --git a/package/wpe/wpeframework-plugins/Config.in b/package/wpe/wpeframework-plugins/Config.in
@@ -300,13 +300,37 @@ if BR2_PACKAGE_WESTON
 endif
 endif
 
-config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
     bool "DeviceInfo"
     default y
     help
       DeviceInfo Plugin
 
+if BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELNAME
+    string "modelname"
+    default "WPEFramework"
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELYEAR
+    string "modelyear"
+    default "2021"
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_FRIENDLYNAME
+    string "friendlyname"
+    default "WPE"
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_SYSTEMINTEGRATORNAME
+    string "systemintegratorname"
+    default "Metrological"
+
+config BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_PLATFORMNAME
+    string "platformname"
+    default "Linux"
+
+endif
+
 config BR2_PACKAGE_WPEFRAMEWORK_DEVICEIDENTIFICATION
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
     depends on BR2_PACKAGE_HAS_NEXUS
@@ -984,14 +1008,14 @@ menuconfig BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
 
 if BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
 
-menuconfig BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
-    bool "injectedbundle"
-    default y
-
 config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART
     bool "autostart"
     default y
 
+config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
+    bool "injectedbundle"
+    default y
+
 config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL
     string "start-url"
     default "about:blank"
diff --git a/package/wpe/wpeframework-plugins/wpeframework-plugins.mk b/package/wpe/wpeframework-plugins/wpeframework-plugins.mk
@@ -3,7 +3,7 @@
 # wpeframework-plugins
 #
 ################################################################################
-WPEFRAMEWORK_PLUGINS_VERSION = 12a65fa90c98c895757f32d762b2a1f09a184cfe
+WPEFRAMEWORK_PLUGINS_VERSION = d426ad0b36cd5b6b51fda55caf37013d2726f454
 WPEFRAMEWORK_PLUGINS_SITE = $(call github,rdkcentral,ThunderNanoServices,$(WPEFRAMEWORK_PLUGINS_VERSION))
 WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
 WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework wpeframework-interfaces wpeframework-clientlibraries libpng
diff --git a/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk b/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk
@@ -3,7 +3,7 @@
 # wpeframework-provisioning
 #
 ################################################################################
-WPEFRAMEWORK_PROVISIONING_VERSION = f81e2c36e546bf864647b6d11780a5f3d27e3a8f
+WPEFRAMEWORK_PROVISIONING_VERSION = 412b1b02a0da218df2cd59ebe4647088196c42b2
 WPEFRAMEWORK_PROVISIONING_SITE_METHOD = git
 WPEFRAMEWORK_PROVISIONING_SITE = git@github.com:WebPlatformForEmbedded/WPEPluginProvisioning.git
 WPEFRAMEWORK_PROVISIONING_INSTALL_STAGING = YES
diff --git a/package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk b/package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk
@@ -3,7 +3,7 @@
 # wpeframework-rdkservices
 #
 ################################################################################
-WPEFRAMEWORK_RDKSERVICES_VERSION = 01cf2faa3561ec0c8aad9f8032cc7a941da2cb62
+WPEFRAMEWORK_RDKSERVICES_VERSION = 307c59c69daaf862d26f72afd04921f12577e491
 WPEFRAMEWORK_RDKSERVICES_SITE_METHOD = git
 WPEFRAMEWORK_RDKSERVICES_SITE = git@github.com:WebPlatformForEmbedded/ThunderNanoServicesRDK.git
 WPEFRAMEWORK_RDKSERVICES_INSTALL_STAGING = YES
@@ -33,6 +33,27 @@ WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DCOMCAST_CONFIG=OFF
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO=ON
+
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELNAME),)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO_MODELNAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELNAME)
+endif
+
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELYEAR),)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO_MODELYEAR=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_MODELYEAR)
+endif
+
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_FRIENDLYNAME),)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO_FRIENDLYNAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_FRIENDLYNAME)
+endif
+
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_SYSTEMINTEGRATORNAME),)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO_SYSTEMINTEGRATORNAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_SYSTEMINTEGRATORNAME)
+endif
+
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_PLATFORMNAME),)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_DEVICEINFO_PLATFORMNAME=$(BR2_PACKAGE_WPEFRAMEWORK_DEVICEINFO_PLATFORMNAME)
+endif
+
 endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_MONITOR),y)
@@ -181,6 +202,11 @@ WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_AUTOSTART=true
 else
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_AUTOSTART=false
 endif
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES),y)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES=true
+else
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES=false
+endif
 ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL),)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WEBKITBROWSER_STARTURL=$(BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_STARTURL)
 else
diff --git a/package/wpe/wpeframework-tools/wpeframework-tools.mk b/package/wpe/wpeframework-tools/wpeframework-tools.mk
@@ -3,7 +3,7 @@
 # wpeframework-tools
 #
 ################################################################################
-WPEFRAMEWORK_TOOLS_VERSION = dc3e567e29fa77fd1b4eb5a395f5b8dd67e499a6
+WPEFRAMEWORK_TOOLS_VERSION = 14c858dda094aa76abfe2204ba4e85dc73150b4d
 HOST_WPEFRAMEWORK_TOOLS_SITE = $(call github,rdkcentral,Thunder,$(WPEFRAMEWORK_TOOLS_VERSION))
 HOST_WPEFRAMEWORK_TOOLS_INSTALL_STAGING = YES
 HOST_WPEFRAMEWORK_TOOLS_INSTALL_TARGET = NO
diff --git a/package/wpe/wpeframework/wpeframework.mk b/package/wpe/wpeframework/wpeframework.mk
@@ -3,7 +3,7 @@
 # wpeframework
 #
 ################################################################################
-WPEFRAMEWORK_VERSION = dc3e567e29fa77fd1b4eb5a395f5b8dd67e499a6
+WPEFRAMEWORK_VERSION = 14c858dda094aa76abfe2204ba4e85dc73150b4d
 WPEFRAMEWORK_SITE = $(call github,rdkcentral,Thunder,$(WPEFRAMEWORK_VERSION))
 WPEFRAMEWORK_INSTALL_STAGING = YES
 WPEFRAMEWORK_DEPENDENCIES = zlib $(call qstrip,$(BR2_PACKAGE_SDK_INSTALL)) host-wpeframework-tools

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-COBALT_VERSION = 2a5904e00679b00c62cb9966b6f199a5be4983ed`
	`7`	`+COBALT_VERSION = 24a9a00b2442c969b41ceeaa85380c390f8c34ea`
`8`	`8`	`COBALT_SITE_METHOD = git`
`9`	`9`	`COBALT_SITE = [email protected]:Metrological/cobalt`
`10`	`10`	`COBALT_INSTALL_STAGING = YES`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-cdmi-clearkey`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 216f15eea89adc777ceed2b702eeccb9ee02d1ee`
	`6`	`+WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 84277d73751275a514976f9fcee0bfb8c6720dc1`
`7`	`7`	`WPEFRAMEWORK_CDMI_CLEARKEY_SITE_METHOD = git`
`8`	`8`	`WPEFRAMEWORK_CDMI_CLEARKEY_SITE = [email protected]:rdkcentral/OCDM-Clearkey.git`
`9`	`9`	`WPEFRAMEWORK_CDMI_CLEARKEY_INSTALL_STAGING = YES`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-cdmi-widevine`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = c03425345a2ca92f13d4592b9e6e1e04ef342429`
	`6`	`+WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 90befe56289c3192739c84257a05e70fe53c94d8`
`7`	`7`	`WPEFRAMEWORK_CDMI_WIDEVINE_SITE_METHOD = git`
`8`	`8`	`WPEFRAMEWORK_CDMI_WIDEVINE_SITE = [email protected]:rdkcentral/OCDM-Widevine.git`
`9`	`9`	`WPEFRAMEWORK_CDMI_WIDEVINE_INSTALL_STAGING = NO`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-clientlibraries`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = d0f8ef5eac4b2baa073bcbce32b979d40b427017`
	`6`	`+WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 320301725af195d538363cd8eed59a98daf910b2`
`7`	`7`	`WPEFRAMEWORK_CLIENTLIBRARIES_SITE = $(call github,rdkcentral,ThunderClientLibraries,$(WPEFRAMEWORK_CLIENTLIBRARIES_VERSION))`
`8`	`8`	`WPEFRAMEWORK_CLIENTLIBRARIES_INSTALL_STAGING = YES`
`9`	`9`	`WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES = wpeframework wpeframework-interfaces`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-interfaces`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_INTERFACES_VERSION = 9aee40151fba9aef6c5f0e17bb149c4576ff29d6`
	`6`	`+WPEFRAMEWORK_INTERFACES_VERSION = ea1517d4e6a1ec4cc9ce149657360c4dd8bc2d65`
`7`	`7`	`WPEFRAMEWORK_INTERFACES_SITE = $(call github,rdkcentral,ThunderInterfaces,$(WPEFRAMEWORK_INTERFACES_VERSION))`
`8`	`8`	`WPEFRAMEWORK_INTERFACES_INSTALL_STAGING = YES`
`9`	`9`	`WPEFRAMEWORK_INTERFACES_DEPENDENCIES = wpeframework`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-plugins`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_PLUGINS_VERSION = 12a65fa90c98c895757f32d762b2a1f09a184cfe`
	`6`	`+WPEFRAMEWORK_PLUGINS_VERSION = d426ad0b36cd5b6b51fda55caf37013d2726f454`
`7`	`7`	`WPEFRAMEWORK_PLUGINS_SITE = $(call github,rdkcentral,ThunderNanoServices,$(WPEFRAMEWORK_PLUGINS_VERSION))`
`8`	`8`	`WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES`
`9`	`9`	`WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework wpeframework-interfaces wpeframework-clientlibraries libpng`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# wpeframework-provisioning`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`		`-WPEFRAMEWORK_PROVISIONING_VERSION = f81e2c36e546bf864647b6d11780a5f3d27e3a8f`
	`6`	`+WPEFRAMEWORK_PROVISIONING_VERSION = 412b1b02a0da218df2cd59ebe4647088196c42b2`
`7`	`7`	`WPEFRAMEWORK_PROVISIONING_SITE_METHOD = git`
`8`	`8`	`WPEFRAMEWORK_PROVISIONING_SITE = [email protected]:WebPlatformForEmbedded/WPEPluginProvisioning.git`
`9`	`9`	`WPEFRAMEWORK_PROVISIONING_INSTALL_STAGING = YES`