Merge pull request #367 from WebPlatformForEmbedded/main-update

Modified gst1-bcm package to use different repo for Arris platform.

Author: Neeraj Deshpande

package/cobalt/cobalt.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-COBALT_VERSION = 2a5904e00679b00c62cb9966b6f199a5be4983ed
+COBALT_VERSION = 24a9a00b2442c969b41ceeaa85380c390f8c34ea
 COBALT_SITE_METHOD = git
 COBALT_SITE = [email protected]:Metrological/cobalt
 COBALT_INSTALL_STAGING = YES

package/gstreamer1/gst1-bcm/gst1-bcm.mk

@@ -5,9 +5,13 @@
 ################################################################################
 
 ifneq ($(filter y,$(BR2_PACKAGE_GST1_BCM_UNIFIED_VERSION)),)
+ifeq ($(BR2_PACKAGE_BCM_REFSW),y)
+GST1_BCM_SITE = [email protected]:Metrological/bcm-gstreamer.git
+GST1_BCM_VERSION = 4b45733aa25ae68f3fa7205c724f77c6a4e622c5
+else
 GST1_BCM_SITE = [email protected]:Metrological/bcm-collaboration
 GST1_BCM_VERSION = 0846f6294a8a7851e405d7f2c4e2d3af27ba3817
-
+endif
 else
 GST1_BCM_SITE = [email protected]:Metrological/gstreamer-plugins-soc.git
 

package/wpe/wpeframework-plugins/Config.in

@@ -309,13 +309,37 @@ config BR2_PACKAGE_WPEFRAMEWORK_COMPOSITOR_HARDWAREREADY
 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
@@ -993,14 +1017,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"