Skip to content

Commit 93d5be7

Browse files
author
Neeraj Deshpande
committed
cobalt: version bump.
1 parent 2fb4f51 commit 93d5be7

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

package/cobalt/0001-changes-for-gcc-8.patch

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -ruN cobalt.orig/src/net/third_party/quic/core/frames/quic_frame.h cobalt/src/net/third_party/quic/core/frames/quic_frame.h
2-
--- cobalt.orig/src/net/third_party/quic/core/frames/quic_frame.h 2020-04-14 16:47:47.990357428 +0530
3-
+++ cobalt/src/net/third_party/quic/core/frames/quic_frame.h 2020-04-14 20:23:36.349154705 +0530
2+
--- cobalt.orig/src/net/third_party/quic/core/frames/quic_frame.h 2021-09-07 17:58:28.083287161 +0530
3+
+++ cobalt/src/net/third_party/quic/core/frames/quic_frame.h 2021-09-07 18:07:10.195682023 +0530
44
@@ -111,7 +111,7 @@
55
static_assert(sizeof(QuicFrame) <= 24,
66
"Frames larger than 24 bytes should be referenced by pointer.");
@@ -11,8 +11,8 @@ diff -ruN cobalt.orig/src/net/third_party/quic/core/frames/quic_frame.h cobalt/s
1111
static_assert(offsetof(QuicStreamFrame, type) == offsetof(QuicFrame, type),
1212
"Offset of |type| must match in QuicFrame and QuicStreamFrame");
1313
diff -ruN cobalt.orig/src/net/third_party/quic/core/frames/quic_inlined_frame.h cobalt/src/net/third_party/quic/core/frames/quic_inlined_frame.h
14-
--- cobalt.orig/src/net/third_party/quic/core/frames/quic_inlined_frame.h 2020-04-14 16:47:47.990357428 +0530
15-
+++ cobalt/src/net/third_party/quic/core/frames/quic_inlined_frame.h 2020-04-14 20:24:24.282159470 +0530
14+
--- cobalt.orig/src/net/third_party/quic/core/frames/quic_inlined_frame.h 2021-09-07 17:58:28.083287161 +0530
15+
+++ cobalt/src/net/third_party/quic/core/frames/quic_inlined_frame.h 2021-09-07 18:07:10.195682023 +0530
1616
@@ -18,7 +18,7 @@
1717
struct QUIC_EXPORT_PRIVATE QuicInlinedFrame {
1818
QuicInlinedFrame(QuicFrameType type) : type(type) {
@@ -23,21 +23,23 @@ diff -ruN cobalt.orig/src/net/third_party/quic/core/frames/quic_inlined_frame.h
2323
// turn on this check on as many platforms as possible.
2424
static_assert(offsetof(DerivedT, type) == 0,
2525
diff -ruN cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi cobalt/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi
26-
--- cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2020-04-14 16:48:10.675208200 +0530
27-
+++ cobalt/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2020-04-14 20:25:14.427143197 +0530
28-
@@ -65,6 +65,9 @@
26+
--- cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2021-09-07 18:01:28.002849795 +0530
27+
+++ cobalt/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi 2021-09-07 18:08:41.150350881 +0530
28+
@@ -66,6 +66,11 @@
2929
# matters: Wall implies Wunused-parameter and Wno-unused-parameter
3030
# has no effect if specified before Wall.
3131
'-Wno-unused-parameter',
3232
+ '-Wno-expansion-to-defined',
3333
+ '-Wimplicit-fallthrough=0',
3434
+ '-Wno-ignored-qualifiers',
35+
+ '-Wno-error=class-memaccess',
36+
+ '-Wno-error=deprecated-copy',
3537

3638
# For some reason Thumb build is broken
3739
'-marm',
3840
diff -ruN cobalt.orig/src/third_party/starboard/wpe/shared/player/player_internal.cc cobalt/src/third_party/starboard/wpe/shared/player/player_internal.cc
39-
--- cobalt.orig/src/third_party/starboard/wpe/shared/player/player_internal.cc 2020-04-14 16:48:10.679208347 +0530
40-
+++ cobalt/src/third_party/starboard/wpe/shared/player/player_internal.cc 2020-04-14 20:26:05.564081978 +0530
41+
--- cobalt.orig/src/third_party/starboard/wpe/shared/player/player_internal.cc 2021-09-07 17:58:38.438241572 +0530
42+
+++ cobalt/src/third_party/starboard/wpe/shared/player/player_internal.cc 2021-09-07 18:07:10.195682023 +0530
4143
@@ -105,8 +105,7 @@
4244

4345
G_END_DECLS
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
diff -ruN cobalt.orig/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi cobalt/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi
2-
--- cobalt.orig/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi 2021-05-27 17:36:48.000000000 +0530
3-
+++ cobalt/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi 2021-07-28 00:24:54.604927098 +0530
4-
@@ -65,6 +65,9 @@
2+
--- cobalt.orig/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi 2021-09-21 23:20:25.942997866 +0530
3+
+++ cobalt/src/third_party/starboard/wpe/brcm/arm/gyp_configuration.gypi 2021-09-21 23:31:30.555285073 +0530
4+
@@ -65,6 +65,11 @@
55
# matters: Wall implies Wunused-parameter and Wno-unused-parameter
66
# has no effect if specified before Wall.
77
'-Wno-unused-parameter',
88
+ '-Wno-expansion-to-defined',
99
+ '-Wimplicit-fallthrough=0',
1010
+ '-Wno-ignored-qualifiers',
11+
+ '-Wno-error=class-memaccess',
12+
+ '-Wno-error=deprecated-copy',
1113

1214
# For some reason Thumb build is broken
1315
'-marm',

package/cobalt/cobalt.mk

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

7-
COBALT_VERSION = c0b2b94473714aa58e1547eaa26d65c54283cb06
7+
COBALT_VERSION = 6b2b7b07b6b0cc6d870f8bd0b4b3cc684f635dfb
88
COBALT_SITE_METHOD = git
99
COBALT_SITE = [email protected]:Metrological/cobalt
1010
COBALT_INSTALL_STAGING = YES
@@ -31,7 +31,8 @@ export COBALT_HAS_OCDM=0
3131
endif
3232

3333
ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_PROVISIONPROXY),y)
34-
export COBALT_HAS_PROVISION=1
34+
# TODO: There is an issue in linking provisionproxy in cobalt 22
35+
export COBALT_HAS_PROVISION=0
3536
else
3637
export COBALT_HAS_PROVISION=0
3738
endif

0 commit comments

Comments
 (0)