[acn]: Bump the latest version of wpe and amazon related packages

board/acn/acn.txt

@@ -141,6 +141,7 @@ libgstmatroska.so
 libgstopus.so
 libopus.so
 libamazon*.so
+libgstreamerclient.so
 com.amazon.amazonite.platform.so
 libcom*
 CoreUnitTests

configs/acn2952_wpe_amz_dev_defconfig

@@ -18,8 +18,8 @@ BR2_ROOTFS_DEVICE_CREATION_STATIC=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acn/acn.sh"
 BR2_PACKAGE_BUSYBOX_SMP=y
 BR2_PACKAGE_AMAZON=y
-BR2_PACKAGE_AMAZON_PLATFORM_FAMILY_NAME="kpn-metrological"
-BR2_PACKAGE_AMAZON_PLATFORM_NAME="HMB2260"
+BR2_PACKAGE_AMAZON_PLATFORM_FAMILY_NAME="wpeframework"
+BR2_PACKAGE_AMAZON_PLATFORM_NAME="generic"
 BR2_PACKAGE_AMAZON_NUMBER_OF_CONCURRENT_JOBS="64"
 BR2_PACKAGE_AMAZON_TAG="1.3.2"
 BR2_PACKAGE_AMAZON_IG_READ_WRITE_PATH="/hdd/metrological/"
@@ -61,6 +61,7 @@ BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
 BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
 BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
 BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
+BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT=y
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS=y
 BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
 BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
@@ -70,6 +71,7 @@ BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_CUSTOM_VIRTUAL_MAP_FILE="IRKPNRemote.json
 BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
 BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AMAZON_HAWAII=y
 # BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART is not set
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_USERAGENT="Mozilla/5.0 (Macintosh, Intel Mac OS X 10_11_4) AppleWebKit/602.1.28+ (KHTML, like Gecko) Version/9.1 Safari/601.5.17, KPN_STB_BCM7241/7.3.31.5002 (Arcadyan, HMB2260, Wired)"
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:30m,networkprocess:40m,webprocess:300m,rpcprocess:30m"

configs/acn2952_wpe_yt_defconfig

@@ -54,6 +54,7 @@ BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
 BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
 BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
 BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
+BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT=y
 BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS=y
 BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
 BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
@@ -63,6 +64,7 @@ BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_CUSTOM_VIRTUAL_MAP_FILE="IRKPNRemote.json
 BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
 BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
+BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AMAZON_HAWAII=y
 # BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART is not set
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_USERAGENT="Mozilla/5.0 (Macintosh, Intel Mac OS X 10_11_4) AppleWebKit/602.1.28+ (KHTML, like Gecko) Version/9.1 Safari/601.5.17, KPN_STB_BCM7241/7.3.31.5002 (Arcadyan, HMB2260, Wired)"
 BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:30m,networkprocess:40m,webprocess:300m,rpcprocess:30m"

package/amazon-backend/amazon-backend.mk

@@ -4,30 +4,30 @@
 #
 ################################################################################
 
-AMAZON_BACKEND_VERSION = 35ad8f8fb813748edc575549d296c7b9bb7e344a
+AMAZON_BACKEND_VERSION = e9c61bc404bc233136f6e77609b429a3bedea8cb
 AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
 AMAZON_BACKEND_SITE_METHOD = git
 AMAZON_BACKEND_DEPENDENCIES = 
 AMAZON_BACKEND_LICENSE = PROPRIETARY
 AMAZON_BACKEND_INSTALL_STAGING = YES
 
+AMAZON_BACKEND_DEPENDENCIES += wpeframework
+
 ifeq ($(BR2_PACKAGE_GSTREAMER1),y)
 AMAZON_BACKEND_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
 endif
 
-NEXUS_CFLAGS=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_CFLAGS | cut -d' ' -f3- | awk -F "-std=c89" '{print $$1 $$2}')
-NEXUS_LDFLAGS=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_LDFLAGS | cut -d' ' -f3-)
-NEXUS_CLIENT_LD_LIBRARIES=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_CLIENT_LD_LIBRARIES | cut -d' ' -f4-)
+ifeq ($(BR2_PACKAGE_BCM_REFSW),y)
+AMAZON_BACKEND_DEPENDENCIES += bcm-refsw
+endif
 
-AMAZON_BACKEND_OPTIONS = \
-	CXX="$(TARGET_CXX)" \
-	LD="$(TARGET_LD)" \
-	AR="$(TARGET_AR)" \
-	AS="$(TARGET_AS)" \
-	RANLIB="$(TARGET_RANLIB)" \
-	TARGET_ROOT="$(STAGING_DIR)/usr" \
-	NEXUS_CFLAGS="${NEXUS_CFLAGS}" \
-
+ifeq  ($(BR2_PACKAGE_AMAZON_BUILD_TYPE_TESTING),y)
+AMAZON_BACKEND_CONF_OPTS += -DAMAZON_BUILD_TYPE="testing"
+endif
+
+ifeq  ($(BR2_PACKAGE_VSS_SDK),y)
+AMAZON_BACKEND_CONF_OPTS += -DAMAZON_GST_LIBRARY_PREFIX="wpe"
+endif
 
 $(eval $(cmake-package))
 

package/amazon/0001-disable-root-user-check.patch

@@ -1,21 +1,19 @@
-diff --git a/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp b/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
-index 52793ff..5071a67 100644
---- a/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
-+++ b/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
-@@ -153,6 +153,8 @@ extern "C"
-
+diff --git a/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp b/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
+index 3170302..5071a67 100644
+--- a/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
++++ b/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
+@@ -154,6 +154,7 @@ extern "C"
  	bool initBindings()
  	{
-+        
+         
 +#if 0 // FIXME: OZGUR: Should be re-enabled for deployment
  		/*
  		 * IMPORTANT! This code must not be altered when porting. It is to
  		 * prevent the Amazon Video Player from being used in a process running
-@@ -162,7 +164,7 @@ extern "C"
+@@ -163,6 +164,7 @@ extern "C"
  		uid_t userId = getuid();
  		core::Log::write( core::Log::kInfo, "Initialising Bindings with User Id: %d\n", userId );
  		AMP_VALIDATE( userId != 0, ::error::kError_InvalidUserPermissions );
--
 +#endif
  		if ( !posixBindings )
  		{

package/amazon/amazon.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-AMAZON_VERSION = 9c3b4d4cca5a0d11affefb450c497500b4d85827
+AMAZON_VERSION = f67706962f328e40ee91d558b74c1ebeaa3274ac
 AMAZON_SITE_METHOD = git
 AMAZON_SITE = [email protected]:Metrological/amazon.git
 AMAZON_INSTALL_STAGING = YES
@@ -139,7 +139,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_AMAZON_BACKEND_DRM),y)
  AMAZON_CXX_FLAGS += -DHAVE_PLAYREADY
- AMAZON_CXX_FLAGS += -DAMP_MEDIA_PIPELINE_USE_DECRYPTION_PIPELINE
+#AMAZON_CXX_FLAGS += -DAMP_MEDIA_PIPELINE_USE_DECRYPTION_PIPELINE
 endif
 
 ifeq ($(BR2_PACKAGE_BCM_BME),y)

package/gstreamer1/gstreamer1/1.10.4/0004-protection-Fix-the-string-to-define-unspecified-syst.patch

@@ -0,0 +1,27 @@
+--- a/gst/gstprotection.h	2019-10-26 13:10:20.974858321 +0200
++++ b/gst/gstprotection.h	2019-10-26 13:11:14.790194670 +0200
+@@ -34,6 +34,24 @@
+  */
+ #define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system"
+
++/**
++ * GST_PROTECTION_UNSPECIFIED_SYSTEM_ID:
++ *
++ * The protection system value of the unspecified UUID.
++ * In some cases the system protection ID is not present in the contents or in their
++ * metadata, as encrypted WebM.
++ * This define is used to set the value of the "system_id" field in GstProtectionEvent,
++ * with this value, the application will use an external information to choose which
++ * protection system to use.
++ *
++ * Example: The matroskademux uses this value in the case of encrypted WebM,
++ * the application will choose the appropriate protection system based on the information
++ * received through EME API.
++ *
++ * Since: 1.16
++ */
++#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified-system-id"
++
+ typedef struct _GstProtectionMeta GstProtectionMeta;
+ /**
+  * GstProtectionMeta:

package/libamazon/libamazon.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBAMAZON_VERSION = ab22d1a5262223b562fc72d4c6f645712c8f87d2
+LIBAMAZON_VERSION = df95747c059a83b08b2c05e7572c05d5a939e113
 LIBAMAZON_SITE_METHOD = git
 LIBAMAZON_SITE = [email protected]:Metrological/libamazon.git
 LIBAMAZON_LICENSE = PROPRIETARY

package/wpe/wpebackend-rdk/wpebackend-rdk.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEBACKEND_RDK_VERSION = e3f442523072444c0202b508f3688d9026f9c41f
+WPEBACKEND_RDK_VERSION = e0b491a9e30a05a094069a5d5037884703870e4a
 WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,$(WPEBACKEND_RDK_VERSION))
 WPEBACKEND_RDK_INSTALL_STAGING = YES
 WPEBACKEND_RDK_DEPENDENCIES = wpebackend libglib2

package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus/wpeframework-cdmi-playready-nexus.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 7c3a2fe8a458e0472405b50ada2cd66433042e52
+WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 1ac9cb38a9518c032cce34b04de40b8e7e2f06e6
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE = [email protected]:WebPlatformForEmbedded/OCDM-Playready-Nexus.git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_INSTALL_STAGING = YES

package/wpe/wpeframework-plugins/Config.in

@@ -623,6 +623,18 @@ menuconfig BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
 
 if BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
 
+menuconfig BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
+    bool "injectedbundle"
+    default y
+
+if BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_INJECTEDBUNDLE_INTERFACES
+
+config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AMAZON_HAWAII
+    bool "amazon hawaii interface"
+    default n
+
+endif
+
 config BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART
     bool "autostart"
     default y

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

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PLUGINS_VERSION = b2b7b86bb05b09be3e0bc1e02a851b99ca5c8a89
+WPEFRAMEWORK_PLUGINS_VERSION = defef4e17da73a63e670e4896f5ee0f300d70870
 WPEFRAMEWORK_PLUGINS_SITE = $(call github,WebPlatformForEmbedded,WPEFrameworkPlugins,$(WPEFRAMEWORK_PLUGINS_VERSION))
 WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
 WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework libpng

package/wpe/wpeframework/Config.in

@@ -103,6 +103,13 @@ config BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT
 	  If the dynamic uinput system can not be used for security reasons, this
 	  allows for relaying keys to plugins
 
+config BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT
+        bool "GstreamerClient"
+        default n
+        help
+          Gstreamer client provides custom APIs to manipulate underneath stream sinks which links with existent pipeline.
+          This implementation will vary based on custom platforms and sink backends.
+
 config BR2_PACKAGE_WPEFRAMEWORK_CDM
 	bool "CDM"
 	help

package/wpe/wpeframework/wpeframework.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_VERSION = ad5828a273b8432d7f07f42a80bc6bacdd28816f
+WPEFRAMEWORK_VERSION = a03193a5ded68e731a63b1f12e95a3bae6ea6d18
 WPEFRAMEWORK_SITE = $(call github,WebPlatformForEmbedded,WPEFramework,$(WPEFRAMEWORK_VERSION))
 WPEFRAMEWORK_INSTALL_STAGING = YES
 WPEFRAMEWORK_DEPENDENCIES = zlib $(call qstrip,$(BR2_PACKAGE_SDK_INSTALL))
@@ -70,9 +70,20 @@ endif
 WPEFRAMEWORK_DEPENDENCIES += gstreamer1
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT),y)
+WPEFRAMEWORK_CONF_OPTS += -DGSTREAMERCLIENT=ON
+ifeq ($(BR2_PACKAGE_HAS_NEXUS),y)
+WPEFRAMEWORK_CONF_OPTS += -DGSTREAMER_CLIENT_IMPLEMENTATION=Nexus
+else ifeq  ($(BR2_PACKAGE_RPI_FIRMWARE),y)
+WPEFRAMEWORK_CONF_OPTS += -DGSTREAMER_CLIENT_IMPLEMENTATION=RPI
+else
+$(error Missing a gstreamer client implementation, please provide one)
+endif
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_PROVISIONPROXY),y)
 WPEFRAMEWORK_CONF_OPTS += -DPROVISIONPROXY=ON
-WPEFRAMEWORK_DEPENDENCIES = libprovision
+WPEFRAMEWORK_DEPENDENCIES += libprovision
 endif
 
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_PROVISIONING),y)		

package/wpe/wpewebkit/wpewebkit.mk

@@ -8,7 +8,7 @@
 ifeq ($(BR2_PACKAGE_WPEWEBKIT_BUILD_DEVELOPMENT_VERSION),y)
 WPEWEBKIT_VERSION_VALUE = d87dd8efb1ac316d270d8bc2076c800106f9507f
 else
-WPEWEBKIT_VERSION_VALUE = 181f7d83dbdb35a654220da5ba0e84a7301476b7
+WPEWEBKIT_VERSION_VALUE = 5f899bc2e0e3736908d46ddf473dc4fe5c7f5c95
 endif
 
 WPEWEBKIT_VERSION = $(WPEWEBKIT_VERSION_VALUE)