Skip to content

Commit 83d3dc3

Browse files
author
Santhosh Ramani
committed
Amazon prime on Main branch
Initial commit
1 parent 0905a9f commit 83d3dc3

File tree

7 files changed

+154
-17
lines changed

7 files changed

+154
-17
lines changed

‎package/Config.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ menu "Target packages"
1212
menu "Audio and video applications"
1313
source "package/alsa-utils/Config.in"
1414
source "package/atest/Config.in"
15-
source "package/amazon/Config.in"
16-
source "package/libamazon/Config.in"
1715
source "package/amazon-backend/Config.in"
1816
source "package/amazon-ignition/Config.in"
1917
source "package/aumix/Config.in"

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

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

7-
AMAZON_BACKEND_VERSION = 4babcc88d96b10f6944b3f36f9417b342b25a788
7+
AMAZON_BACKEND_VERSION = b41d654dafb0bbe6d4d715d6faea626365ad11b3
88
AMAZON_BACKEND_SITE = [email protected]:Metrological/amazon-backend.git
99
AMAZON_BACKEND_SITE_METHOD = git
1010
AMAZON_BACKEND_DEPENDENCIES = wpeframework wpeframework-clientlibraries
@@ -27,4 +27,6 @@ ifeq ($(BR2_PACKAGE_VSS_SDK),y)
2727
AMAZON_BACKEND_CONF_OPTS += -DAMAZON_GST_LIBRARY_PREFIX="wpe"
2828
endif
2929

30+
AMAZON_BACKEND_CONF_OPTS += -DDISABLE_OUTPUT_STATUS_CHECK=ON
31+
3032
$(eval $(cmake-package))

‎package/amazon-ignition/0001-disable-amp-error-warnings.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/ignition/amazon-player/ruby/amp/CMakeLists.txt 2020-10-13 17:52:40.000000000 +0530
2+
+++ b/ignition/amazon-player/ruby/amp/CMakeLists.txt 2022-06-03 22:31:07.677699807 +0530
3+
@@ -25,6 +25,8 @@ set(RUBY_PLATFORM_DIR ${RUBY_PLATFORM_RO
4+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
5+
6+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
7+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=stringop-overflow")
8+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=stringop-truncation")
9+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
10+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wswitch")
11+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wswitch-default")

‎package/amazon-ignition/Config.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ config BR2_PACKAGE_AMAZON_IGNITION_DEVELOPER_MODE
3838
help
3939
Enable this to use info and debug traces
4040

41+
config BR2_PACKAGE_AMAZON_IGNITION_BUILD_RUBY
42+
bool "Build RUBY Player"
43+
default "y"
44+
4145
config BR2_PACKAGE_AMAZON_IGNITION_BUILD_TESTS
4246
bool "include tests"
4347
select BR2_PACKAGE_AMAZON_IGNITION_DEVELOPER_MODE

‎package/amazon-ignition/amazon-ignition.mk‎

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

7-
AMAZON_IGNITION_VERSION = e72ab40d3eeb885a35170e39d2ba757d653170f3
7+
AMAZON_IGNITION_VERSION = 5e0e61cffb4cc65e4fc68e51a84a411a9875b5dd
88
AMAZON_IGNITION_SITE_METHOD = git
99
AMAZON_IGNITION_SITE = [email protected]:Metrological/amazon.git
10-
AMAZON_IGNITION_DEPENDENCIES = jpeg libpng wpeframework amazon amazon-backend
10+
AMAZON_IGNITION_DEPENDENCIES = jpeg libpng wpeframework amazon-backend
1111
# AMAZON_IGNITION_DEPENDENCIES = zlib jpeg libcurl libpng icu wpeframework amazon amazon-backend
1212
AMAZON_IGNITION_SUPPORTS_IN_SOURCE_BUILD = NO
1313
AMAZON_IGNITION_INSTALL_STAGING = YES
@@ -43,7 +43,8 @@ AMAZON_IGNITION_CONF_OPTS += \
4343
-DDISABLE_SAFE_BUILD_ROOT_CHECK=OFF \
4444
-DUSE_MEDIA_PIPELINE_BACKEND=OFF \
4545
-DBUILD_AS_SHARED_LIBRARY=ON \
46-
-DBUILD_CURL_7_72_0=ON
46+
-DBUILD_CURL_7_72_0=ON \
47+
-DDISABLE_SAFE_BUILD_ROOT_CHECK=ON
4748

4849
ifeq ($(BR2_PACKAGE_AMAZON_IGNITION_BUILD_TESTS),y)
4950
AMAZON_IGNITION_CONF_OPTS += -DBUILD_SHARED_LIBRARY_LAUNCHER=ON
@@ -136,11 +137,7 @@ define AMAZON_IGNITION_INSTALL_IGNITION
136137

137138
rsync -av ${AMAZON_IGNITION_BINARY_INSTALL_DIR}/ $(call qstrip,$(1))/$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)
138139

139-
ln -sf "../../../lib/libamazon_backend_device.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_backend_device.so"
140140
ln -sf "../../../lib/libamazon-backend.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon-backend.so"
141-
ln -sf "../../../lib/libamazon_player_mediapipeline.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player_mediapipeline.so"
142-
ln -sf "../../../lib/libamazon_player.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_player.so"
143-
ln -sf "../../../lib/libamazon_playready.so" "$(call qstrip,$(1))$(BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH)/lib/libamazon_playready.so"
144141
endef
145142

146143
define AMAZON_IGNITION_INSTALL_IGNITION_DEV

‎package/rpi-userland/0008-getproc-add-core-funcs.patch‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
--- a/interface/khronos/egl/egl_client_get_proc.c 2020-01-14 23:03:59.000000000 +0530
2+
+++ b/interface/khronos/egl/egl_client_get_proc.c 2021-06-08 15:39:22.943341684 +0530
3+
@@ -70,13 +70,119 @@ extern "C" {
4+
5+
EGLAPI void EGLAPIENTRY (* eglGetProcAddress(const char *procname))(void)
6+
{
7+
-/* Don't mangle the rest */
8+
-#include "interface/khronos/common/khrn_client_unmangle.h"
9+
-#include "interface/khronos/include/EGL/eglext.h"
10+
11+
/* TODO: any other functions we need to return here? */
12+
if(!procname) return (void(*)(void)) NULL;
13+
14+
+ if (!strcmp(procname, "glViewport"))
15+
+ return (void(*)(void))glViewport;
16+
+ if (!strcmp(procname, "glGetString"))
17+
+ return (void(*)(void))glGetString;
18+
+ if (!strcmp(procname, "glClear"))
19+
+ return (void(*)(void))glClear;
20+
+ if (!strcmp(procname, "glClearColor"))
21+
+ return (void(*)(void))glClearColor;
22+
+ if (!strcmp(procname, "glGetError"))
23+
+ return (void(*)(void))glGetError;
24+
+ if (!strcmp(procname, "glCreateShader"))
25+
+ return (void(*)(void))glCreateShader;
26+
+ if (!strcmp(procname, "glDeleteShader"))
27+
+ return (void(*)(void))glDeleteShader;
28+
+ if (!strcmp(procname, "glShaderSource"))
29+
+ return (void(*)(void))glShaderSource;
30+
+ if (!strcmp(procname, "glCompileShader"))
31+
+ return (void(*)(void))glCompileShader;
32+
+ if (!strcmp(procname, "glGetShaderiv"))
33+
+ return (void(*)(void))glGetShaderiv;
34+
+ if (!strcmp(procname, "glGetShaderInfoLog"))
35+
+ return (void(*)(void))glGetShaderInfoLog;
36+
+ if (!strcmp(procname, "glCreateProgram"))
37+
+ return (void(*)(void))glCreateProgram;
38+
+ if (!strcmp(procname, "glAttachShader"))
39+
+ return (void(*)(void))glAttachShader;
40+
+ if (!strcmp(procname, "glDetachShader"))
41+
+ return (void(*)(void))glDetachShader;
42+
+ if (!strcmp(procname, "glLinkProgram"))
43+
+ return (void(*)(void))glLinkProgram;
44+
+ if (!strcmp(procname, "glUseProgram"))
45+
+ return (void(*)(void))glUseProgram;
46+
+ if (!strcmp(procname, "glDeleteProgram"))
47+
+ return (void(*)(void))glDeleteProgram;
48+
+ if (!strcmp(procname, "glGenTextures"))
49+
+ return (void(*)(void))glGenTextures;
50+
+ if (!strcmp(procname, "glUniform1i"))
51+
+ return (void(*)(void))glUniform1i;
52+
+ if (!strcmp(procname, "glUniform1f"))
53+
+ return (void(*)(void))glUniform1f;
54+
+ if (!strcmp(procname, "glUniform2f"))
55+
+ return (void(*)(void))glUniform2f;
56+
+ if (!strcmp(procname, "glUniform4f"))
57+
+ return (void(*)(void))glUniform4f;
58+
+ if (!strcmp(procname, "glUniform4fv"))
59+
+ return (void(*)(void))glUniform4fv;
60+
+ if (!strcmp(procname, "glTexImage2D"))
61+
+ return (void(*)(void))glTexImage2D;
62+
+ if (!strcmp(procname, "glTexSubImage2D"))
63+
+ return (void(*)(void))glTexSubImage2D;
64+
+ if (!strcmp(procname, "glBindTexture"))
65+
+ return (void(*)(void))glBindTexture;
66+
+ if (!strcmp(procname, "glTexParameteri"))
67+
+ return (void(*)(void))glTexParameteri;
68+
+ if (!strcmp(procname, "glPixelStorei"))
69+
+ return (void(*)(void))glPixelStorei;
70+
+ if (!strcmp(procname, "glDeleteTextures"))
71+
+ return (void(*)(void))glDeleteTextures;
72+
+ if (!strcmp(procname, "glBindFramebuffer"))
73+
+ return (void(*)(void))glBindFramebuffer;
74+
+ if (!strcmp(procname, "glFramebufferTexture2D"))
75+
+ return (void(*)(void))glFramebufferTexture2D;
76+
+ if (!strcmp(procname, "glGenFramebuffers"))
77+
+ return (void(*)(void))glGenFramebuffers;
78+
+ if (!strcmp(procname, "glGenBuffers"))
79+
+ return (void(*)(void))glGenBuffers;
80+
+ if (!strcmp(procname, "glDeleteFramebuffers"))
81+
+ return (void(*)(void))glDeleteFramebuffers;
82+
+ if (!strcmp(procname, "glCheckFramebufferStatus"))
83+
+ return (void(*)(void))glCheckFramebufferStatus;
84+
+ if (!strcmp(procname, "glBindBuffer"))
85+
+ return (void(*)(void))glBindBuffer;
86+
+ if (!strcmp(procname, "glGetBooleanv"))
87+
+ return (void(*)(void))glGetBooleanv;
88+
+ if (!strcmp(procname, "glGetIntegerv"))
89+
+ return (void(*)(void))glGetIntegerv;
90+
+ if (!strcmp(procname, "glDisable"))
91+
+ return (void(*)(void))glDisable;
92+
+ if (!strcmp(procname, "glEnable"))
93+
+ return (void(*)(void))glEnable;
94+
+ if (!strcmp(procname, "glDeleteBuffers"))
95+
+ return (void(*)(void))glDeleteBuffers ;
96+
+ if (!strcmp(procname, "glScissor"))
97+
+ return (void(*)(void))glScissor;
98+
+ if (!strcmp(procname, "glEnableVertexAttribArray"))
99+
+ return (void(*)(void))glEnableVertexAttribArray;
100+
+ if (!strcmp(procname, "glVertexAttribPointer"))
101+
+ return (void(*)(void))glVertexAttribPointer;
102+
+ if (!strcmp(procname, "glBufferData"))
103+
+ return (void(*)(void))glBufferData ;
104+
+ if (!strcmp(procname, "glGetAttribLocation"))
105+
+ return (void(*)(void))glGetAttribLocation;
106+
+ if (!strcmp(procname, "glGetUniformLocation"))
107+
+ return (void(*)(void))glGetUniformLocation;
108+
+ if (!strcmp(procname, "glBlendFunc"))
109+
+ return (void(*)(void))glBlendFunc;
110+
+ if (!strcmp(procname, "glBlendFuncSeparate"))
111+
+ return (void(*)(void))glBlendFuncSeparate;
112+
+ if (!strcmp(procname, "glDrawArrays"))
113+
+ return (void(*)(void))glDrawArrays;
114+
+ if (!strcmp(procname, "glReadPixels"))
115+
+ return (void(*)(void))glReadPixels;
116+
+ if (!strcmp(procname, "glFlush"))
117+
+ return (void(*)(void))glFlush;
118+
+
119+
+/* Don't mangle the rest */
120+
+#include "interface/khronos/common/khrn_client_unmangle.h"
121+
+#include "interface/khronos/include/EGL/eglext.h"
122+
+
123+
#if EGL_KHR_image
124+
if (!strcmp(procname, "eglCreateImageKHR"))
125+
return (void(*)(void))eglCreateImageKHR;

‎package/wpe/wpeframework-amazon/wpeframework-amazon.mk‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
################################################################################
77

8-
WPEFRAMEWORK_AMAZON_VERSION = 0566320491735134054bba964354a9f61b57f9b7
8+
WPEFRAMEWORK_AMAZON_VERSION = 735948d77536ea1619656e9d94f7c8343044ce01
99
WPEFRAMEWORK_AMAZON_SITE_METHOD = git
1010
WPEFRAMEWORK_AMAZON_SITE = [email protected]:Metrological/WPEPluginAmazon.git
1111
WPEFRAMEWORK_AMAZON_INSTALL_STAGING = YES
@@ -24,29 +24,29 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_AUTOSTART),y)
2424
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_AUTOSTART=ON
2525
endif
2626

27-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE),)
27+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE),"")
2828
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_INSTALL_PATH=${BR2_PACKAGE_WPEFRAMEWORK_AMAZON_INSTALL_PATH_OVERRIDE}
2929
else
3030
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_INSTALL_PATH=${BR2_PACKAGE_AMAZON_IGNITION_IG_INSTALL_PATH}
3131
endif
3232

33-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER),)
33+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER),"")
3434
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_NAME=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_USER)
3535
endif
3636

37-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP),)
37+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP),"")
3838
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_GROUP=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_GROUP)
3939
endif
4040

41-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_CA_BUNDLE_PATH),)
41+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_CA_BUNDLE_PATH),"")
4242
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_CA_BUNDLE_PATH=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_CA_BUNDLE_PATH)
4343
endif
4444

45-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_FRAGMENT_CACHE_SIZE),)
45+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_FRAGMENT_CACHE_SIZE),"")
4646
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_FRAGMENT_CACHE_SIZE=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_FRAGMENT_CACHE_SIZE)
4747
endif
4848

49-
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_LOG_LEVEL),)
49+
ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_LOG_LEVEL),"")
5050
WPEFRAMEWORK_AMAZON_CONF_OPTS += -DPLUGIN_AMAZON_PRIME_LOG_LEVEL=$(BR2_PACKAGE_WPEFRAMEWORK_AMAZON_LOG_LEVEL)
5151
endif
5252

0 commit comments

Comments
 (0)