Skip to content

Commit d0080d5

Browse files
modevecimodeveci
committed
[acn]: Bump the latest version of wpe and amazon related packages
1 parent 486c175 commit d0080d5

File tree

16 files changed

+93
-81
lines changed

16 files changed

+93
-81
lines changed

‎board/acn/acn.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ libgstmatroska.so
141141
libgstopus.so
142142
libopus.so
143143
libamazon*.so
144+
libgstreamerclient.so
144145
com.amazon.amazonite.platform.so
145146
libcom*
146147
CoreUnitTests

‎configs/acn2952_wpe_amz_dev_defconfig‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ BR2_ROOTFS_DEVICE_CREATION_STATIC=y
1818
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acn/acn.sh"
1919
BR2_PACKAGE_BUSYBOX_SMP=y
2020
BR2_PACKAGE_AMAZON=y
21-
BR2_PACKAGE_AMAZON_PLATFORM_FAMILY_NAME="kpn-metrological"
22-
BR2_PACKAGE_AMAZON_PLATFORM_NAME="HMB2260"
21+
BR2_PACKAGE_AMAZON_PLATFORM_FAMILY_NAME="wpeframework"
22+
BR2_PACKAGE_AMAZON_PLATFORM_NAME="generic"
2323
BR2_PACKAGE_AMAZON_NUMBER_OF_CONCURRENT_JOBS="64"
2424
BR2_PACKAGE_AMAZON_TAG="1.3.2"
2525
BR2_PACKAGE_AMAZON_IG_READ_WRITE_PATH="/hdd/metrological/"
@@ -61,6 +61,7 @@ BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
6161
BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
6262
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
6363
BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
64+
BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT=y
6465
BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS=y
6566
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
6667
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
@@ -70,6 +71,7 @@ BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_CUSTOM_VIRTUAL_MAP_FILE="IRKPNRemote.json
7071
BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
7172
BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
7273
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
74+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AMAZON_HAWAII=y
7375
# BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART is not set
7476
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)"
7577
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:30m,networkprocess:40m,webprocess:300m,rpcprocess:30m"

‎configs/acn2952_wpe_yt_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
5454
BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
5555
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
5656
BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
57+
BR2_PACKAGE_WPEFRAMEWORK_GSTREAMERCLIENT=y
5758
BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS=y
5859
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
5960
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
@@ -63,6 +64,7 @@ BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL_CUSTOM_VIRTUAL_MAP_FILE="IRKPNRemote.json
6364
BR2_PACKAGE_WPEFRAMEWORK_SNAPSHOT=y
6465
BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL=y
6566
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER=y
67+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AMAZON_HAWAII=y
6668
# BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_AUTOSTART is not set
6769
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)"
6870
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:30m,networkprocess:40m,webprocess:300m,rpcprocess:30m"

‎package/amazon-backend/amazon-backend.mk‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
#
55
################################################################################
66

7-
AMAZON_BACKEND_VERSION = 35ad8f8fb813748edc575549d296c7b9bb7e344a
7+
AMAZON_BACKEND_VERSION = e9c61bc404bc233136f6e77609b429a3bedea8cb
88
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
99
AMAZON_BACKEND_SITE_METHOD = git
1010
AMAZON_BACKEND_DEPENDENCIES =
1111
AMAZON_BACKEND_LICENSE = PROPRIETARY
1212
AMAZON_BACKEND_INSTALL_STAGING = YES
1313

14+
AMAZON_BACKEND_DEPENDENCIES += wpeframework
15+
1416
ifeq ($(BR2_PACKAGE_GSTREAMER1),y)
1517
AMAZON_BACKEND_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
1618
endif
1719

18-
NEXUS_CFLAGS=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_CFLAGS | cut -d' ' -f3- | awk -F "-std=c89" '{print $$1 $$2}')
19-
NEXUS_LDFLAGS=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_LDFLAGS | cut -d' ' -f3-)
20-
NEXUS_CLIENT_LD_LIBRARIES=$(shell cat ${STAGING_DIR}/usr/include/platform_app.inc | grep NEXUS_CLIENT_LD_LIBRARIES | cut -d' ' -f4-)
20+
ifeq ($(BR2_PACKAGE_BCM_REFSW),y)
21+
AMAZON_BACKEND_DEPENDENCIES += bcm-refsw
22+
endif
2123

22-
AMAZON_BACKEND_OPTIONS = \
23-
CXX="$(TARGET_CXX)" \
24-
LD="$(TARGET_LD)" \
25-
AR="$(TARGET_AR)" \
26-
AS="$(TARGET_AS)" \
27-
RANLIB="$(TARGET_RANLIB)" \
28-
TARGET_ROOT="$(STAGING_DIR)/usr" \
29-
NEXUS_CFLAGS="${NEXUS_CFLAGS}" \
30-
24+
ifeq ($(BR2_PACKAGE_AMAZON_BUILD_TYPE_TESTING),y)
25+
AMAZON_BACKEND_CONF_OPTS += -DAMAZON_BUILD_TYPE="testing"
26+
endif
27+
28+
ifeq ($(BR2_PACKAGE_VSS_SDK),y)
29+
AMAZON_BACKEND_CONF_OPTS += -DAMAZON_GST_LIBRARY_PREFIX="wpe"
30+
endif
3131

3232
$(eval $(cmake-package))
3333

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
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
2-
index 52793ff..5071a67 100644
3-
--- a/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
4-
+++ b/kpn-metrological/platform/ruby/amp-kpn-metrological/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
5-
@@ -153,6 +153,8 @@ extern "C"
6-
1+
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
2+
index 3170302..5071a67 100644
3+
--- a/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
4+
+++ b/wpeframework/platform/ruby/amp-wpeframework/libs/Hawaii/HawaiiBindings/src/hawaii/bindings/PosixBindings.cpp
5+
@@ -154,6 +154,7 @@ extern "C"
76
bool initBindings()
87
{
9-
+
8+
109
+#if 0 // FIXME: OZGUR: Should be re-enabled for deployment
1110
/*
1211
* IMPORTANT! This code must not be altered when porting. It is to
1312
* prevent the Amazon Video Player from being used in a process running
14-
@@ -162,7 +164,7 @@ extern "C"
13+
@@ -163,6 +164,7 @@ extern "C"
1514
uid_t userId = getuid();
1615
core::Log::write( core::Log::kInfo, "Initialising Bindings with User Id: %d\n", userId );
1716
AMP_VALIDATE( userId != 0, ::error::kError_InvalidUserPermissions );
18-
-
1917
+#endif
2018
if ( !posixBindings )
2119
{

‎package/amazon/amazon.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AMAZON_VERSION = 9c3b4d4cca5a0d11affefb450c497500b4d85827
7+
AMAZON_VERSION = f67706962f328e40ee91d558b74c1ebeaa3274ac
88
AMAZON_SITE_METHOD = git
99
AMAZON_SITE = [email protected]:Metrological/amazon.git
1010
AMAZON_INSTALL_STAGING = YES
@@ -139,7 +139,7 @@ endif
139139

140140
ifeq ($(BR2_PACKAGE_AMAZON_BACKEND_DRM),y)
141141
AMAZON_CXX_FLAGS += -DHAVE_PLAYREADY
142-
AMAZON_CXX_FLAGS += -DAMP_MEDIA_PIPELINE_USE_DECRYPTION_PIPELINE
142+
#AMAZON_CXX_FLAGS += -DAMP_MEDIA_PIPELINE_USE_DECRYPTION_PIPELINE
143143
endif
144144

145145
ifeq ($(BR2_PACKAGE_BCM_BME),y)

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--- a/gst/gstprotection.h 2019-10-26 13:10:20.974858321 +0200
2+
+++ b/gst/gstprotection.h 2019-10-26 13:11:14.790194670 +0200
3+
@@ -34,6 +34,24 @@
4+
*/
5+
#define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system"
6+
7+
+/**
8+
+ * GST_PROTECTION_UNSPECIFIED_SYSTEM_ID:
9+
+ *
10+
+ * The protection system value of the unspecified UUID.
11+
+ * In some cases the system protection ID is not present in the contents or in their
12+
+ * metadata, as encrypted WebM.
13+
+ * This define is used to set the value of the "system_id" field in GstProtectionEvent,
14+
+ * with this value, the application will use an external information to choose which
15+
+ * protection system to use.
16+
+ *
17+
+ * Example: The matroskademux uses this value in the case of encrypted WebM,
18+
+ * the application will choose the appropriate protection system based on the information
19+
+ * received through EME API.
20+
+ *
21+
+ * Since: 1.16
22+
+ */
23+
+#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified-system-id"
24+
+
25+
typedef struct _GstProtectionMeta GstProtectionMeta;
26+
/**
27+
* GstProtectionMeta:

‎package/libamazon/libamazon.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
LIBAMAZON_VERSION = ab22d1a5262223b562fc72d4c6f645712c8f87d2
7+
LIBAMAZON_VERSION = df95747c059a83b08b2c05e7572c05d5a939e113
88
LIBAMAZON_SITE_METHOD = git
99
LIBAMAZON_SITE = [email protected]:Metrological/libamazon.git
1010
LIBAMAZON_LICENSE = PROPRIETARY

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
WPEBACKEND_RDK_VERSION = e3f442523072444c0202b508f3688d9026f9c41f
7+
WPEBACKEND_RDK_VERSION = e0b491a9e30a05a094069a5d5037884703870e4a
88
WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,$(WPEBACKEND_RDK_VERSION))
99
WPEBACKEND_RDK_INSTALL_STAGING = YES
1010
WPEBACKEND_RDK_DEPENDENCIES = wpebackend libglib2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 7c3a2fe8a458e0472405b50ada2cd66433042e52
7+
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 1ac9cb38a9518c032cce34b04de40b8e7e2f06e6
88
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE_METHOD = git
99
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE = [email protected]:WebPlatformForEmbedded/OCDM-Playready-Nexus.git
1010
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_INSTALL_STAGING = YES

0 commit comments

Comments
 (0)