Skip to content

Commit 0843426

Browse files
Merge pull request #365 from WebPlatformForEmbedded/development/cobalt-patch-updates
Cobalt: patch updates to syncup with src tree changes
2 parents fdec60e + fa03f96 commit 0843426

File tree

3 files changed

+6
-190
lines changed

3 files changed

+6
-190
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,23 @@ diff -ruN cobalt.orig/src/third_party/starboard/wpe/rpi/gyp_configuration.gypi c
3737

3838
# For some reason Thumb build is broken
3939
'-marm',
40-
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
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
43-
@@ -105,8 +105,7 @@
40+
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
41+
--- cobalt.orig/src/third_party/starboard/wpe/shared/player/player_internal.cc 2021-10-05 04:26:34.055692176 -0700
42+
+++ cobalt/src/third_party/starboard/wpe/shared/player/player_internal.cc 2021-10-05 04:41:45.428710275 -0700
43+
@@ -110,8 +110,7 @@
4444

4545
G_END_DECLS
4646

4747
-#define GST_COBALT_SRC_GET_PRIVATE(obj) \
48-
- (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_COBALT_TYPE_SRC, GstCobaltSrcPrivate))
48+
- (G_TYPE_INSTANCE_GET_PRIVATE((obj), GST_COBALT_TYPE_SRC, GstCobaltSrcPrivate))
4949
+#define GST_COBALT_SRC_GET_PRIVATE(obj) static_cast<GstCobaltSrcPrivate*>(gst_cobalt_src_get_instance_private(obj))
5050

5151
struct _GstCobaltSrcPrivate {
5252
gchar* uri;
53-
@@ -129,6 +128,7 @@
53+
@@ -134,6 +133,7 @@
5454
G_DEFINE_TYPE_WITH_CODE(GstCobaltSrc,
5555
gst_cobalt_src,
5656
GST_TYPE_BIN,
5757
+ G_ADD_PRIVATE(GstCobaltSrc)
5858
G_IMPLEMENT_INTERFACE(GST_TYPE_URI_HANDLER,
5959
gst_cobalt_src_uri_handler_init));
60-

package/cobalt/0005-changes-for-wayland-sink.patch

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)