Skip to content

Commit

Permalink
wayland: update the patch files to apply on 1.18.0 version
Browse files Browse the repository at this point in the history 
ERROR: wayland-1.18.0-r0 do_patch: Command Error: 'quilt --quiltrc quiltrc push' exited with 0  Output:
Applying patch 0001-server-Fix-crash-when-accessing-client-which-is-alre.patch
patching file src/wayland-server.c
patch: **** malformed patch at line 36: &display->client_list, link) {

Patch 0001-server-Fix-crash-when-accessing-client-which-is-alre.patch does not apply (enforce with -f)
ERROR: Logfile of failure stored in: log.do_patch.111269
ERROR: Task (wayland_1.18.0.bb:do_patch) failed with exit code '1'
ERROR: wayland-native-1.18.0-r0 do_patch: Command Error: 'quilt --quiltrc /etc/quiltrc push' exited with 0  Output:
Applying patch 0001-server-Fix-crash-when-accessing-client-which-is-alre.patch
patching file src/wayland-server.c
patch: **** malformed patch at line 36: &display->client_list, link) {

Patch 0001-server-Fix-crash-when-accessing-client-which-is-alre.patch does not apply (enforce with -f)
ERROR: Logfile of failure stored in: log.do_patch.111273
ERROR: Task (wayland_1.18.0.bb:do_patch) failed with exit code '1'

[PLAT-115145] CCC: Upgrade to Yocto 3.1 Dunfell

Change-Id: I5f62d1fd1cb83f51ffdb4447c695819a0c983eaa
  • Loading branch information
@shr-project
shr-project authored and Hyunjae Shin committed Sep 26, 2020
1 parent e5b3de4 commit f927c85
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 35 deletions.
8 changes: 4 additions & 4 deletions ...-graphics/wayland/wayland/0001-server-Fix-crash-when-accessing-client-which-is-alre.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6e746799c710bfcee0983f7d7598c191007e2cc3 Mon Sep 17 00:00:00 2001
From d70550dae0668e46ecd31f9abdbee5a886a54628 Mon Sep 17 00:00:00 2001
From: Hyunkook Khang <[email protected]>
Date: Tue, 20 Sep 2016 10:25:36 +0900
Subject: [PATCH] server: Fix crash when accessing client which is already
Expand All @@ -20,10 +20,10 @@ Upstream-Status: Submitted
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/wayland-server.c b/src/wayland-server.c
index 19f6a76..20681e6 100644
index 3f48dfe..2eaf398 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -1286,10 +1286,16 @@ wl_display_terminate(struct wl_display *display)
@@ -1344,10 +1344,16 @@ wl_display_terminate(struct wl_display *display)
WL_EXPORT void
wl_display_run(struct wl_display *display)
{
Expand All @@ -40,7 +40,7 @@ index 19f6a76..20681e6 100644
wl_event_loop_dispatch(display->loop, -1);
}
}
@@ -1307,7 +1313,7 @@ wl_display_flush_clients(struct wl_display *display)
@@ -1365,7 +1371,7 @@ wl_display_flush_clients(struct wl_display *display)
WL_EVENT_WRITABLE |
WL_EVENT_READABLE);
} else if (ret < 0) {
Expand Down
6 changes: 3 additions & 3 deletions ...webos/recipes-graphics/wayland/wayland/0002-client-Exit-on-a-fatal-connection-error.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 33b19050622db5269ff3e8dd8ed6a5ce49de38e4 Mon Sep 17 00:00:00 2001
From bca6188befb5853b7fbff620ea3456ce46cc2667 Mon Sep 17 00:00:00 2001
From: Jaeyoon Jung <[email protected]>
Date: Mon, 13 Aug 2018 14:29:34 +0900
Subject: [PATCH] client: Exit on a fatal connection error
Expand All @@ -17,10 +17,10 @@ Upstream-Status: Inappropriate [webOS specific]
1 file changed, 7 insertions(+)

diff --git a/src/wayland-client.c b/src/wayland-client.c
index b0805f1..49b7df5 100644
index 5358500..46c1ad6 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -152,6 +152,13 @@ display_fatal_error(struct wl_display *display, int error)
@@ -153,6 +153,13 @@ display_fatal_error(struct wl_display *display, int error)
display->last_error = error;

display_wakeup_threads(display);
Expand Down
56 changes: 28 additions & 28 deletions meta-webos/recipes-graphics/wayland/wayland/0003-Enhance-Wayland-debug-print.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 67c72d6e95e9895363271b347b6670bd8d3fc53b Mon Sep 17 00:00:00 2001
From 197e1512ca41d5148fd4ee355b6f5c33a807057f Mon Sep 17 00:00:00 2001
From: Jaeyoon Jung <[email protected]>
Date: Tue, 27 Jan 2015 16:45:01 +0900
Subject: [PATCH] Enhance Wayland debug print
Expand All @@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [webOS specific]
7 files changed, 212 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f47d055..c9c1678 100644
index cc87392..8902192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,12 @@ libwayland_util_la_CFLAGS = $(AM_CFLAGS)
@@ -45,6 +45,12 @@ libwayland_util_la_CFLAGS = $(AM_CFLAGS)
libwayland_util_la_SOURCES = \
src/wayland-util.c \
src/wayland-util.h
Expand All @@ -41,21 +41,21 @@ index f47d055..c9c1678 100644

noinst_LTLIBRARIES = libwayland-util.la

@@ -72,6 +78,10 @@ nodist_include_HEADERS = \
@@ -74,6 +80,10 @@ nodist_include_HEADERS = \

libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
+if ENABLE_PMLOG
+libwayland_server_la_CFLAGS += $(PMLOG_CFLAGS)
+libwayland_server_la_LIBADD += $(PMLOG_LIBS)
+endif
libwayland_server_la_LDFLAGS = -version-info 1:0:1
libwayland_server_la_SOURCES = \
src/wayland-server.c \
@@ -84,6 +94,10 @@ nodist_libwayland_server_la_SOURCES = \
@@ -86,6 +96,10 @@ nodist_libwayland_server_la_SOURCES = \

libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la -lrt -lm
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
+if ENABLE_PMLOG
+libwayland_client_la_CFLAGS += $(PMLOG_CFLAGS)
+libwayland_client_la_LIBADD += $(PMLOG_LIBS)
Expand All @@ -64,10 +64,10 @@ index f47d055..c9c1678 100644
libwayland_client_la_SOURCES = \
src/wayland-client.c
diff --git a/configure.ac b/configure.ac
index 8d56f2b..9641445 100644
index dda5e48..92e3bee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,13 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
@@ -99,6 +99,13 @@ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)

AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)

Expand All @@ -81,7 +81,7 @@ index 8d56f2b..9641445 100644
AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
[ ICONDIR=$withval],
[ ICONDIR=${datadir}/icons])
@@ -120,6 +127,11 @@ if test "x$enable_dtd_validation" = "xyes"; then
@@ -126,6 +133,11 @@ if test "x$enable_dtd_validation" = "xyes"; then
AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
fi

Expand All @@ -94,7 +94,7 @@ index 8d56f2b..9641445 100644
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])

diff --git a/src/connection.c b/src/connection.c
index 7fba999..0cf2e18 100644
index d0c7d9f..479d30d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -64,6 +64,49 @@ struct wl_buffer {
Expand Down Expand Up @@ -147,7 +147,7 @@ index 7fba999..0cf2e18 100644
struct wl_connection {
struct wl_buffer in, out;
struct wl_buffer fds_in, fds_out;
@@ -1252,18 +1295,41 @@ wl_closure_queue(struct wl_closure *closure, struct wl_connection *connection)
@@ -1256,18 +1299,41 @@ wl_closure_queue(struct wl_closure *closure, struct wl_connection *connection)
}

void
Expand Down Expand Up @@ -192,7 +192,7 @@ index 7fba999..0cf2e18 100644
time / 1000.0,
send ? " -> " : "",
target->interface->name, target->id,
@@ -1272,53 +1338,54 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
@@ -1276,53 +1342,54 @@ wl_closure_print(struct wl_closure *closure, struct wl_object *target, int send)
for (i = 0; i < closure->count; i++) {
signature = get_next_argument(signature, &arg);
if (i > 0)
Expand Down Expand Up @@ -264,19 +264,19 @@ index 7fba999..0cf2e18 100644

static int
diff --git a/src/wayland-client.c b/src/wayland-client.c
index 49b7df5..f66fb91 100644
index 46c1ad6..a1aeea3 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -751,7 +751,7 @@ wl_proxy_marshal_array_constructor_versioned(struct wl_proxy *proxy,
wl_abort("Error marshalling request: %s\n", strerror(errno));
@@ -759,7 +759,7 @@ wl_proxy_marshal_array_constructor_versioned(struct wl_proxy *proxy,
}

if (debug_client)
- wl_closure_print(closure, &proxy->object, true);
+ wl_closure_print(closure, &proxy->object, true, NULL);

if (wl_closure_send(closure, proxy->display->connection))
wl_abort("Error sending request: %s\n", strerror(errno));
@@ -1426,13 +1426,13 @@ dispatch_event(struct wl_display *display, struct wl_event_queue *queue)
if (wl_closure_send(closure, proxy->display->connection)) {
wl_log("Error sending request: %s\n", strerror(errno));
@@ -1441,13 +1441,13 @@ dispatch_event(struct wl_display *display, struct wl_event_queue *queue)

if (proxy->dispatcher) {
if (debug_client)
Expand All @@ -293,10 +293,10 @@ index 49b7df5..f66fb91 100644
wl_closure_invoke(closure, WL_CLOSURE_INVOKE_CLIENT,
&proxy->object, opcode, proxy->user_data);
diff --git a/src/wayland-private.h b/src/wayland-private.h
index 29516ec..c6eaa60 100644
index 9bf8cb7..b7950c7 100644
--- a/src/wayland-private.h
+++ b/src/wayland-private.h
@@ -215,7 +215,7 @@ wl_closure_queue(struct wl_closure *closure, struct wl_connection *connection);
@@ -211,7 +211,7 @@ wl_closure_queue(struct wl_closure *closure, struct wl_connection *connection);

void
wl_closure_print(struct wl_closure *closure,
Expand All @@ -306,18 +306,18 @@ index 29516ec..c6eaa60 100644
void
wl_closure_destroy(struct wl_closure *closure);
diff --git a/src/wayland-server.c b/src/wayland-server.c
index 20681e6..7567b23 100644
index 2eaf398..4a0bfa2 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -137,6 +137,7 @@ struct wl_protocol_logger {
@@ -140,6 +140,7 @@ struct wl_protocol_logger {
};

static int debug_server = 0;
+static char debug_fifo_path[UNIX_PATH_MAX];

static void
log_closure(struct wl_resource *resource,
@@ -147,8 +148,14 @@ log_closure(struct wl_resource *resource,
@@ -150,8 +151,14 @@ log_closure(struct wl_resource *resource,
struct wl_protocol_logger *protocol_logger;
struct wl_protocol_logger_message message;

Expand All @@ -334,7 +334,7 @@ index 20681e6..7567b23 100644

if (!wl_list_empty(&display->protocol_loggers)) {
message.resource = resource;
@@ -1022,6 +1029,71 @@ bind_display(struct wl_client *client, struct wl_display *display)
@@ -1031,6 +1038,71 @@ bind_display(struct wl_client *client, struct wl_display *display)
return 0;
}

Expand Down Expand Up @@ -406,7 +406,7 @@ index 20681e6..7567b23 100644
/** Create Wayland display object.
*
* \return The Wayland display object. Null if failed to create
@@ -1067,6 +1139,8 @@ wl_display_create(void)
@@ -1076,6 +1148,8 @@ wl_display_create(void)

wl_array_init(&display->additional_shm_formats);

Expand All @@ -415,7 +415,7 @@ index 20681e6..7567b23 100644
return display;
}

@@ -1136,6 +1210,8 @@ wl_display_destroy(struct wl_display *display)
@@ -1145,6 +1219,8 @@ wl_display_destroy(struct wl_display *display)

wl_list_remove(&display->protocol_loggers);

Expand All @@ -425,7 +425,7 @@ index 20681e6..7567b23 100644
}

diff --git a/src/wayland-util.c b/src/wayland-util.c
index 3a471a8..fcbb409 100644
index d5973bf..3cb23d8 100644
--- a/src/wayland-util.c
+++ b/src/wayland-util.c
@@ -30,8 +30,12 @@
Expand Down

0 comments on commit f927c85

Please sign in to comment.