Skip to content

Commit c3b22cc

Browse files
modevecimodeveci
committed
Add amazon integration changes
1 parent ec3bcea commit c3b22cc

File tree

13 files changed

+204
-57
lines changed

13 files changed

+204
-57
lines changed

‎board/acn/acn.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ libWPEFrameworkVirtualInput.so
123123
libWPEFrameworkTimeSync.so
124124
libWPEFrameworkWebShell.so
125125
libWPEFrameworkOCDM.so
126+
libWPEFrameworkDefinitions.so
126127
libnxclient.so
127128
libwpe-0.2.so
128129
libWPEBackend-rdk.so
@@ -139,3 +140,16 @@ libbrcmvidfilter.so
139140
libgstmatroska.so
140141
libgstopus.so
141142
libopus.so
143+
libamazon*.so
144+
com.amazon.amazonite.platform.so
145+
libcom*
146+
CoreUnitTests
147+
HawaiiUnitTests
148+
VideoPlayerFrontendUnitTests
149+
VideoPlayerUnitTests
150+
CryptoUnitTests
151+
NetworkUnitTests
152+
VideoPlayerMediaPipelineBackendUnitTests
153+
XmlUnitTests
154+
com.amazon.amazonite.devicepropertiesprovider.tests
155+
com.amazon.amazonite.deviceproperties.tests

‎board/acn/wpeframework.sh‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ metrological)
5050
grep -q "/usr/lib ext4" /proc/mounts && echo "/usr/lib is already mounted" || mount -t ext4 --bind $DESTINATION/lib/ /usr/lib/
5151
grep -q "/usr/bin ext4" /proc/mounts && echo "/usr/bin is already mounted" || mount -t ext4 --bind $DESTINATION/bin /usr/bin/
5252

53-
#launch rpcbind to create channel between framework and webkit
54-
ext=`pidof rpcbind`
55-
if [ ! $ext ]; then
56-
echo "Launching rpcbind ..."
57-
rpcbind
58-
else
59-
echo "rpcbind is already launched..."
60-
fi
61-
6253
#work around for playready
6354
cd /usr/bin/netflix
6455

‎configs/acn2952_wpe_yt_defconfig‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ BR2_TARGET_GENERIC_CABUNDLE=y
1717
BR2_ROOTFS_DEVICE_CREATION_STATIC=y
1818
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/acn/acn.sh"
1919
BR2_PACKAGE_BUSYBOX_SMP=y
20+
BR2_PACKAGE_AMAZON=y
21+
BR2_PACKAGE_AMAZON_PLATFORM_FAMILY_NAME="kpn-metrological"
22+
BR2_PACKAGE_AMAZON_PLATFORM_NAME="HMB2260"
23+
BR2_PACKAGE_AMAZON_NUMBER_OF_CONCURRENT_JOBS="64"
24+
BR2_PACKAGE_AMAZON_TAG="1.3.2"
25+
BR2_PACKAGE_AMAZON_BUILD_TYPE_TESTING=y
26+
BR2_PACKAGE_AMAZON_IG_READ_WRITE_PATH="/hdd/metrological/"
27+
BR2_PACKAGE_AMAZON_DTID="A3T3XXY42KZQNP"
28+
BR2_PACKAGE_AMAZON_BACKEND=y
2029
BR2_PACKAGE_GSTREAMER1=y
2130
BR2_PACKAGE_GST1_BCM=y
2231
BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP=y
@@ -48,13 +57,11 @@ BR2_PACKAGE_OPENSSL=y
4857
BR2_PACKAGE_JPEG_TURBO=y
4958
BR2_PACKAGE_LIBMNG=y
5059
BR2_PACKAGE_WEBP=y
51-
BR2_PACKAGE_WPEFRAMEWORK=y
5260
BR2_PACKAGE_WPEFRAMEWORK_PORT="8081"
5361
BR2_PACKAGE_WPEFRAMEWORK_PERSISTENT_PATH="/hdd/metrological/persistent"
5462
BR2_PACKAGE_WPEFRAMEWORK_DATA_PATH="/hdd/metrological/usr/share/WPEFramework"
5563
BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PATH="/hdd/metrological/usr/lib/wpeframework/plugins"
5664
BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH="/hdd/metrological/usr/lib/wpeframework/proxystubs"
57-
BR2_PACKAGE_WPEFRAMEWORK_VIRTUALINPUT=y
5865
BR2_PACKAGE_WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS=y
5966
BR2_PACKAGE_WPEFRAMEWORK_MONITOR=y
6067
BR2_PACKAGE_WPEFRAMEWORK_REMOTECONTROL=y
@@ -69,11 +76,12 @@ BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_USERAGENT="Mozilla/5.0 (Macintosh, Intel
6976
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_MEMORYPRESSURE="databaseprocess:30m,networkprocess:40m,webprocess:150m,rpcprocess:30m"
7077
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_WINDOWCLOSE=y
7178
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_DISABLE_WEBGL=y
72-
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_CLIENTIDENTIFIER="300"
79+
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TAB=y
80+
BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TRANSPARENT=y
81+
BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER_CLIENTIDENTIFIER="2"
7382
BR2_PACKAGE_WPEWEBKIT=y
7483
BR2_PACKAGE_WPEWEBKIT_ENABLE_NATIVE_AUDIO=y
7584
BR2_PACKAGE_C_ARES=y
76-
BR2_PACKAGE_LIBCURL=y
7785
BR2_PACKAGE_ORC=y
7886
BR2_PACKAGE_ICU_USE_ICUDATA=y
7987
BR2_PACKAGE_SHARED_MIME_INFO=y

‎package/Config.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ menu "Audio and video applications"
88
source "package/aampabr/Config.in"
99
source "package/alsa-utils/Config.in"
1010
source "package/amazon/Config.in"
11+
source "package/amazon-backend/Config.in"
1112
source "package/aumix/Config.in"
1213
source "package/bcm-bme/Config.in"`
1314
source "package/bellagio/Config.in"

‎package/amazon-backend/Config.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
config BR2_PACKAGE_AMAZON_BACKEND
2+
bool "amazon backend"
3+
help
4+
amazon backend for bme player
5+

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
################################################################################
2+
#
3+
# amazon-backend
4+
#
5+
################################################################################
6+
7+
AMAZON_BACKEND_VERSION = 4b1709ced98f500474f9b501bc297661b5bf1184
8+
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
9+
AMAZON_BACKEND_SITE_METHOD = git
10+
AMAZON_BACKEND_DEPENDENCIES =
11+
AMAZON_BACKEND_LICENSE = PROPRIETARY
12+
AMAZON_BACKEND_INSTALL_STAGING = YES
13+
14+
ifeq ($(BR2_PACKAGE_GSTREAMER1),y)
15+
AMAZON_BACKEND_DEPENDENCIES += gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
16+
endif
17+
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-)
21+
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+
31+
32+
$(eval $(cmake-package))
33+

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
7+
bool initBindings()
8+
{
9+
+
10+
+#if 0 // FIXME: OZGUR: Should be re-enabled for deployment
11+
/*
12+
* IMPORTANT! This code must not be altered when porting. It is to
13+
* prevent the Amazon Video Player from being used in a process running
14+
@@ -162,7 +164,7 @@ extern "C"
15+
uid_t userId = getuid();
16+
core::Log::write( core::Log::kInfo, "Initialising Bindings with User Id: %d\n", userId );
17+
AMP_VALIDATE( userId != 0, ::error::kError_InvalidUserPermissions );
18+
-
19+
+#endif
20+
if ( !posixBindings )
21+
{
22+
posixBindings = new hawaii::bindings::PosixBindings();

‎package/amazon/amazon.mk‎

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

7-
AMAZON_VERSION = edad2389a62a2bc31b05e1e06d5b2554341f1778
7+
AMAZON_VERSION = 3acae756c905a36cef1e2376c7e50ad502c07d8e
88
AMAZON_SITE_METHOD = git
99
AMAZON_SITE = [email protected]:Metrological/amazon.git
1010
AMAZON_INSTALL_STAGING = YES
@@ -58,7 +58,10 @@ endef
5858

5959
ifeq ($(BR2_PACKAGE_AMAZON),y)
6060
ifeq ($(BR2_PACKAGE_AMAZON_BACKEND_DRM),y)
61-
AMAZON_DEPENDENCIES += libgles libegl gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad playready
61+
AMAZON_DEPENDENCIES += libgles libegl gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
62+
ifneq ($(BR2_PACKAGE_HAS_PLAYREADY),y)
63+
AMAZON_DEPENDENCIES += playready
64+
endif
6265
AMAZON_BACKEND = mpb-drm
6366
else ifeq ($(BR2_PACKAGE_AMAZON_BACKEND_NO_DRM),y)
6467
AMAZON_DEPENDENCIES += libgles libegl gstreamer1 gst1-plugins-base gst1-plugins-good gst1-plugins-bad
@@ -134,12 +137,22 @@ ifeq ($(BR2_PACKAGE_ACN_SDK),y)
134137
AMAZON_CXX_FLAGS += -DUSE_ANCIENT_PTHREAD_LIB=1
135138
endif
136139

140+
ifeq ($(BR2_PACKAGE_AMAZON_BACKEND_DRM),y)
141+
AMAZON_CXX_FLAGS += -DHAVE_PLAYREADY
142+
AMAZON_CXX_FLAGS += -DAMP_MEDIA_PIPELINE_USE_DECRYPTION_PIPELINE
143+
endif
144+
137145
ifeq ($(BR2_PACKAGE_BCM_BME),y)
138146
HAWAII_BINDINGS_LIBS += -lbroadcom-backend -ldl
139147
AMAZON_CXX_FLAGS += -lbroadcom-backend -ldl
140148
SDK_INCLUDE_DIRECTORIES += ${STAGING_DIR}/usr/include/bme ${STAGING_DIR}/usr/include/refsw
141149
endif
142150

151+
ifeq ($(BR2_PACKAGE_AMAZON_BACKEND),y)
152+
HAWAII_BINDINGS_LIBS += -lamazon-backend -ldl
153+
AMAZON_CXX_FLAGS += -lamazon-backend -ldl
154+
SDK_INCLUDE_DIRECTORIES += ${STAGING_DIR}/usr/include/refsw
155+
endif
143156
################################################################################
144157
# DCP/DPP
145158
################################################################################
@@ -148,6 +161,21 @@ define AMAZON_BUILD_DPC_DPP
148161
$(call AMAZON_MAKE, dpc, BUILD_TYPE=$(AMAZON_BUILD_TYPE))
149162
endef
150163

164+
ifeq ($(AMAZON_BUILD_TYPE),testing)
165+
define AMAZON_INSTALL_TESTS
166+
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
167+
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.so $(1)/usr/lib
168+
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiesprovider/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
169+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CoreUnitTests/CoreUnitTests $(1)/usr/bin
170+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CryptoUnitTests/CryptoUnitTests $(1)/usr/bin
171+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/HawaiiUnitTests/HawaiiUnitTests $(1)/usr/bin
172+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/NetworkUnitTests/NetworkUnitTests $(1)/usr/bin
173+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerFrontendUnitTests/VideoPlayerFrontendUnitTests $(1)/usr/bin
174+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerMediaPipelineBackendUnitTests/VideoPlayerMediaPipelineBackendUnitTests $(1)/usr/bin
175+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerUnitTests/VideoPlayerUnitTests $(1)/usr/bin
176+
$(INSTALL) -v -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/XmlUnitTests/XmlUnitTests $(1)/usr/bin
177+
endef
178+
endif
151179
################################################################################
152180
# Ruby
153181
################################################################################
@@ -156,38 +184,39 @@ RUBY_MAKE_OPTIONS=\
156184
RUBY_USING_IGNITION_CURL=OFF \
157185
HAWAII_BINDINGS_LIBS="${HAWAII_BINDINGS_LIBS}" \
158186
SDK_INCLUDE_DIRECTORIES="${SDK_INCLUDE_DIRECTORIES}" \
159-
SDK_FLAGS="${AMAZON_CXX_FLAGS}"
187+
SDK_FLAGS="${AMAZON_CXX_FLAGS}" \
188+
HAVE_PLAYREADY=1
160189

161190
define AMAZON_BUILD_RUBY
162191
$(call AMAZON_BUILD_DPC_DPP)
163192
$(call AMAZON_MAKE, ruby, BACKEND=$(AMAZON_BACKEND) BUILD_TYPE=$(AMAZON_BUILD_TYPE) ${RUBY_MAKE_OPTIONS})
164193
endef
165194

166195
define AMAZON_INSTALL_RUBY
167-
$(INSTALL) -v -d -m 0755 $(1)/usr/lib
168196
$(INSTALL) -v -m 750 -D $(@D)/install/$(BR2_PACKAGE_AMAZON_PLATFORM_NAME)/bin/*.so $(1)/usr/lib
197+
$(INSTALL) -v -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/device-properties/*.so $(1)/usr/lib
169198
endef
170199

171200
define AMAZON_INSTALL_RUBY_DEV
172201
$(call AMAZON_INSTALL_RUBY, ${STAGING_DIR})
173202

174203
$(INSTALL) -v -d -m 0755 $(STAGING_DIR)/usr/include/amazon
175-
cp -a $(@D)/ruby/amp/libs/Network/Network/include/* $(STAGING_DIR)/usr/include/amazon
176-
cp -a $(@D)/ruby/amp/libs/Gfx/Gfx/include/* $(STAGING_DIR)/usr/include/amazon
177-
cp -a $(@D)/ruby/amp/libs/Crypto/Crypto/include/* $(STAGING_DIR)/usr/include/amazon
178-
cp -a $(@D)/ruby/amp/libs/BareClient/BareClient/include/* $(STAGING_DIR)/usr/include/amazon
179-
cp -a $(@D)/ruby/amp/libs/Pad/Pad/include/* $(STAGING_DIR)/usr/include/amazon
180-
cp -a $(@D)/ruby/amp/libs/Hawaii/HawaiiBindings/include/* $(STAGING_DIR)/usr/include/amazon
181-
cp -a $(@D)/ruby/amp/libs/Hawaii/Hawaii/include/* $(STAGING_DIR)/usr/include/amazon
182-
cp -a $(@D)/ruby/amp/libs/Xml/Xml/include/* $(STAGING_DIR)/usr/include/amazon
183-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackendCommon/include/* $(STAGING_DIR)/usr/include/amazon
184-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFakeBackend/include/* $(STAGING_DIR)/usr/include/amazon
185-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerMediaPipelineBackend/include/* $(STAGING_DIR)/usr/include/amazon
186-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFrontend/include/* $(STAGING_DIR)/usr/include/amazon
187-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerApp/include/* $(STAGING_DIR)/usr/include/amazon
188-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackend/include/* $(STAGING_DIR)/usr/include/amazon
189-
cp -a $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayer/include/* $(STAGING_DIR)/usr/include/amazon
190-
cp -a $(@D)/ruby/amp/libs/Core/Core/include/* $(STAGING_DIR)/usr/include/amazon
204+
cp -av $(@D)/ruby/amp/libs/Network/Network/include/* $(STAGING_DIR)/usr/include/amazon
205+
cp -av $(@D)/ruby/amp/libs/Gfx/Gfx/include/* $(STAGING_DIR)/usr/include/amazon
206+
cp -av $(@D)/ruby/amp/libs/Crypto/Crypto/include/* $(STAGING_DIR)/usr/include/amazon
207+
cp -av $(@D)/ruby/amp/libs/BareClient/BareClient/include/* $(STAGING_DIR)/usr/include/amazon
208+
cp -av $(@D)/ruby/amp/libs/Pad/Pad/include/* $(STAGING_DIR)/usr/include/amazon
209+
cp -av $(@D)/ruby/amp/libs/Hawaii/HawaiiBindings/include/* $(STAGING_DIR)/usr/include/amazon
210+
cp -av $(@D)/ruby/amp/libs/Hawaii/Hawaii/include/* $(STAGING_DIR)/usr/include/amazon
211+
cp -av $(@D)/ruby/amp/libs/Xml/Xml/include/* $(STAGING_DIR)/usr/include/amazon
212+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackendCommon/include/* $(STAGING_DIR)/usr/include/amazon
213+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFakeBackend/include/* $(STAGING_DIR)/usr/include/amazon
214+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerMediaPipelineBackend/include/* $(STAGING_DIR)/usr/include/amazon
215+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerFrontend/include/* $(STAGING_DIR)/usr/include/amazon
216+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerApp/include/* $(STAGING_DIR)/usr/include/amazon
217+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayerBackend/include/* $(STAGING_DIR)/usr/include/amazon
218+
cp -av $(@D)/ruby/amp/libs/VideoPlayer/VideoPlayer/include/* $(STAGING_DIR)/usr/include/amazon
219+
cp -av $(@D)/ruby/amp/libs/Core/Core/include/* $(STAGING_DIR)/usr/include/amazon
191220
endef
192221

193222
################################################################################
@@ -220,27 +249,6 @@ ifeq ($(BR2_PACKAGE_AMAZON_INCLUDE_IGNITION),y)
220249
endef
221250
endif
222251

223-
224-
################################################################################
225-
# Tests
226-
################################################################################
227-
ifeq ($(AMAZON_BUILD_TYPE),testing)
228-
define AMAZON_INSTALL_TESTS
229-
$(INSTALL) -d -m 0755 $(1)/usr/bin
230-
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
231-
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiescomponent/$(AMAZON_BUILD_TYPE)/tests/*.so $(1)/usr/lib
232-
$(INSTALL) -m 750 -D $(@D)/build/devicepropertiesprovider/$(AMAZON_BUILD_TYPE)/tests/*.tests $(1)/usr/bin
233-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CoreUnitTests/CoreUnitTests $(1)/usr/bin
234-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/CryptoUnitTests/CryptoUnitTests $(1)/usr/bin
235-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/HawaiiUnitTests/HawaiiUnitTests $(1)/usr/bin
236-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/NetworkUnitTests/NetworkUnitTests $(1)/usr/bin
237-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerFrontendUnitTests/VideoPlayerFrontendUnitTests $(1)/usr/bin
238-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerMediaPipelineBackendUnitTests/VideoPlayerMediaPipelineBackendUnitTests $(1)/usr/bin
239-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/VideoPlayerUnitTests/VideoPlayerUnitTests $(1)/usr/bin
240-
$(INSTALL) -m 750 -D $(@D)/build/ruby/ruby-with-${AMAZON_BACKEND}/$(AMAZON_BUILD_TYPE)/XmlUnitTests/XmlUnitTests $(1)/usr/bin
241-
endef
242-
endif
243-
244252
################################################################################
245253
# Generic buildroot
246254
################################################################################

‎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 = 237d0d2a0c1d285e23c1c05a6edfa3ceb9110b84
7+
WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 7c3a2fe8a458e0472405b50ada2cd66433042e52
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

‎package/wpe/wpeframework-plugins/Config.in‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@ config BR2_PACKAGE_WPEFRAMEWORK_MONITOR_YOUTUBE
286286
string "youtube-limit"
287287
default "614400"
288288

289+
config BR2_PACKAGE_WPEFRAMEWORK_MONITOR_AMAZON
290+
depends on BR2_PACKAGE_WPEFRAMEWORK_AMAZON
291+
string "amazon-limit"
292+
default "614400"
293+
289294
config BR2_PACKAGE_WPEFRAMEWORK_MONITOR_APPS
290295
depends on BR2_PACKAGE_WPEFRAMEWORK_APPS
291296
string "apps-limit"
@@ -691,6 +696,44 @@ config BR2_PACKAGE_WPEFRAMEWORK_YOUTUBE_USERAGENT
691696

692697
endif
693698

699+
menuconfig BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TAB
700+
depends on BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
701+
bool "amazon"
702+
help
703+
A wrapper around the amazon app to start it as a
704+
wpeframework plugin.
705+
706+
if BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TAB
707+
708+
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USERAGENT
709+
string "useragent"
710+
default "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"
711+
712+
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_STARTURL
713+
string "start-url"
714+
default "about:blank"
715+
716+
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_TRANSPARENT
717+
bool "transparent"
718+
default true
719+
720+
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER
721+
string "user"
722+
default ""
723+
help
724+
run Amazon as this user, leave empty to use the same as
725+
WPEframework
726+
727+
config BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP
728+
string "group"
729+
default ""
730+
help
731+
run Amazon as this group, leave empty to use the same as
732+
WPEframework
733+
734+
735+
endif
736+
694737
menuconfig BR2_PACKAGE_WPEFRAMEWORK_APPS
695738
depends on BR2_PACKAGE_WPEFRAMEWORK_WEBKITBROWSER
696739
bool "apps"

0 commit comments

Comments
 (0)