Skip to content

Commit dc21fbc

Browse files
author
Neeraj Deshpande
authored
Merge pull request #342 from WebPlatformForEmbedded/main-update
wpeframework & plugins : version bump.
2 parents 93720e3 + 33960a4 commit dc21fbc

File tree

13 files changed

+96
-10
lines changed

13 files changed

+96
-10
lines changed

‎package/cobalt/0003-changes-for-wayland.patch‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
diff -ruN cobalt.orig/src/cobalt/renderer/backend/egl/graphics_context.cc cobalt/src/cobalt/renderer/backend/egl/graphics_context.cc
2+
--- cobalt.orig/src/cobalt/renderer/backend/egl/graphics_context.cc 2021-05-27 17:36:48.000000000 +0530
3+
+++ cobalt/src/cobalt/renderer/backend/egl/graphics_context.cc 2021-07-05 22:36:14.143943715 +0530
4+
@@ -76,7 +76,7 @@
5+
// when we need to make OpenGL calls that do not depend on a surface (e.g.
6+
// creating a texture).
7+
null_surface_ = new PBufferRenderTargetEGL(display, config, math::Size(0, 0));
8+
- CHECK(!null_surface_->CreationError());
9+
+ // CHECK(!null_surface_->CreationError());
10+
11+
ScopedMakeCurrent scoped_current_context(this);
12+
13+
diff -ruN cobalt.orig/src/cobalt/renderer/backend/egl/graphics_system.cc cobalt/src/cobalt/renderer/backend/egl/graphics_system.cc
14+
--- cobalt.orig/src/cobalt/renderer/backend/egl/graphics_system.cc 2021-05-27 17:36:48.000000000 +0530
15+
+++ cobalt/src/cobalt/renderer/backend/egl/graphics_system.cc 2021-07-05 22:36:39.544296168 +0530
16+
@@ -105,7 +105,10 @@
17+
// Return the first config that succeeds the above test.
18+
EGLint num_configs = 0;
19+
EGL_CALL(eglChooseConfig(display, attribute_list, NULL, 0, &num_configs));
20+
- CHECK_LT(0, num_configs);
21+
+ // CHECK_LT(0, num_configs);
22+
+ if (!num_configs) {
23+
+ return base::nullopt;
24+
+ }
25+
26+
std::unique_ptr<EGLConfig[]> configs(new EGLConfig[num_configs]);
27+
EGL_CALL_SIMPLE(eglChooseConfig(display, attribute_list, configs.get(),
28+
@@ -201,6 +204,15 @@
29+
}
30+
}
31+
32+
+ if (!choose_config_results) {
33+
+ DCHECK_EQ(EGL_SURFACE_TYPE, attribute_list[0]);
34+
+ EGLint& surface_type_value = attribute_list[1];
35+
+
36+
+ surface_type_value &= ~EGL_PBUFFER_BIT;
37+
+ choose_config_results =
38+
+ ChooseConfig(display_, attribute_list, system_window);
39+
+ }
40+
+
41+
DCHECK(choose_config_results);
42+
43+
config_ = choose_config_results->config;
44+
diff -ruN cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi cobalt/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi
45+
--- cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2021-07-05 22:30:34.734565943 +0530
46+
+++ cobalt/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2021-07-05 22:40:01.850929559 +0530
47+
@@ -50,6 +50,7 @@
48+
49+
# To support large files
50+
'-D_FILE_OFFSET_BITS=64',
51+
+ '-DEGL_NO_X11',
52+
53+
# Suppress some warnings that will be hard to fix.
54+
'-Wno-unused-local-typedefs',
55+
diff -ruN cobalt.orig/src/third_party/starboard/wpe/shared/window/window_internal.h cobalt/src/third_party/starboard/wpe/shared/window/window_internal.h
56+
--- cobalt.orig/src/third_party/starboard/wpe/shared/window/window_internal.h 2021-05-27 17:36:48.000000000 +0530
57+
+++ cobalt/src/third_party/starboard/wpe/shared/window/window_internal.h 2021-07-05 22:37:46.997216291 +0530
58+
@@ -20,7 +20,6 @@
59+
#include "starboard/time.h"
60+
#include "starboard/window.h"
61+
62+
-#define EGL_NO_X11
63+
#include "WPEFramework/compositor/Client.h"
64+
65+
namespace third_party {

‎package/cobalt/cobalt.mk‎

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

7-
COBALT_VERSION = 317861a3a73a17b0400442c8bb90ec8c347fe94b
7+
COBALT_VERSION = c0b2b94473714aa58e1547eaa26d65c54283cb06
88
COBALT_SITE_METHOD = git
99
COBALT_SITE = [email protected]:Metrological/cobalt
1010
COBALT_INSTALL_STAGING = YES

‎package/netflix52/0002-add-nox11-flag.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -ruN netflix52.orig/partner/gibbon/graphics/wpeframework/gibbon_graphics.cmake netflix52/partner/gibbon/graphics/wpeframework/gibbon_graphics.cmake
2+
--- netflix52.orig/partner/gibbon/graphics/wpeframework/gibbon_graphics.cmake 2021-06-07 16:57:41.000000000 +0530
3+
+++ netflix52/partner/gibbon/graphics/wpeframework/gibbon_graphics.cmake 2021-07-06 01:52:51.161273709 +0530
4+
@@ -63,6 +63,7 @@
5+
#endif()
6+
if(GIBBON_GRAPHICS_GL_WSYS STREQUAL "egl")
7+
message(" + Using GL WSYS: ${GIBBON_GRAPHICS_GL_WSYS}")
8+
+ add_definitions(-DEGL_NO_X11)
9+
else()
10+
message(FATAL_ERROR "Unknown GL WSYS: ${GIBBON_GRAPHICS_GL_WSYS}")
11+
endif()

‎package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.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_CLEARKEY_VERSION = 3fac75f6d0cbb8c0d854ef56754e2bc64d11b965
7+
WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 709a3bec04fb722712a3395c9033eb1c9e757e0e
88
WPEFRAMEWORK_CDMI_CLEARKEY_SITE_METHOD = git
99
WPEFRAMEWORK_CDMI_CLEARKEY_SITE = [email protected]:rdkcentral/OCDM-Clearkey.git
1010
WPEFRAMEWORK_CDMI_CLEARKEY_INSTALL_STAGING = YES

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

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

77
ifeq ($(BR2_PACKAGE_PLAYREADY4),y)
8-
WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = c904962129de4b04fafa8ab45f6dc0b4496d7cae
8+
WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 7b0c7cc9bd9f802054103ff382258e9869c64105
99
else
1010
WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 59b3deba0710b9f372fd333fcc7aca2ebed483a6
1111
endif

‎package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/0001-Module-h-fix.patch‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff -ruN wpeframework-cdmi-widevine.orig/Module.h wpeframework-cdmi-widevine/Module.h
2+
--- wpeframework-cdmi-widevine.orig/Module.h 2021-06-25 17:52:22.000000000 +0530
3+
+++ wpeframework-cdmi-widevine/Module.h 2021-07-05 17:23:33.879789601 +0530
4+
@@ -22,3 +22,6 @@
5+
#ifndef MODULE_NAME
6+
#define MODULE_NAME OCDM_Widevine
7+
#endif
8+
+
9+
+#include <core/core.h>
10+
+

‎package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.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_WIDEVINE_VERSION = e6584a33919c4d27e45875eda2229e6ca7f452cc
7+
WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 7736fc6ecf696089553258db74a8cb17c8970541
88
WPEFRAMEWORK_CDMI_WIDEVINE_SITE_METHOD = git
99
WPEFRAMEWORK_CDMI_WIDEVINE_SITE = [email protected]:rdkcentral/OCDM-Widevine.git
1010
WPEFRAMEWORK_CDMI_WIDEVINE_INSTALL_STAGING = NO

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# wpeframework-clientlibraries
44
#
55
################################################################################
6-
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 3ea90cf7b6ed25c417808e9da5ba7dd72ad927cc
6+
WPEFRAMEWORK_CLIENTLIBRARIES_VERSION = 1f83ec85b095ec8ed9c7e2dc723066bea587fef6
77
WPEFRAMEWORK_CLIENTLIBRARIES_SITE = $(call github,rdkcentral,ThunderClientLibraries,$(WPEFRAMEWORK_CLIENTLIBRARIES_VERSION))
88
WPEFRAMEWORK_CLIENTLIBRARIES_INSTALL_STAGING = YES
99
WPEFRAMEWORK_CLIENTLIBRARIES_DEPENDENCIES = wpeframework-interfaces

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

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

7-
WPEFRAMEWORK_INTERFACES_VERSION = 76390a3a1749e52e021e4034a6712c449cadb178
7+
WPEFRAMEWORK_INTERFACES_VERSION = a3d9a643b6ea00aaf24efea90a227dbc79058070
88
WPEFRAMEWORK_INTERFACES_SITE = $(call github,rdkcentral,ThunderInterfaces,$(WPEFRAMEWORK_INTERFACES_VERSION))
99
WPEFRAMEWORK_INTERFACES_INSTALL_STAGING = YES
1010
WPEFRAMEWORK_INTERFACES_DEPENDENCIES = wpeframework

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

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

7-
WPEFRAMEWORK_PLUGINS_VERSION = f7116377f20b76b3d9d94f87a3e8e7ca7a76d9e5
7+
WPEFRAMEWORK_PLUGINS_VERSION = 42de79c0a6022e3c94cab8e8fe490f48e2d5d5f8
88
WPEFRAMEWORK_PLUGINS_SITE = $(call github,rdkcentral,ThunderNanoServices,$(WPEFRAMEWORK_PLUGINS_VERSION))
99
WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
1010
WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework-clientlibraries libpng

0 commit comments

Comments
 (0)