summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-10-20 18:02:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:38 +0000
commit60dcdbf6bf5b3d3bd05260846125bf89fb47d1f6 (patch)
treef3b775f7126f87edc73c9eaf57c31ed394b25030
parente1e2581ba03ed86fef0856b1b226b08c62e9f69d (diff)
downloadpoky-60dcdbf6bf5b3d3bd05260846125bf89fb47d1f6.tar.gz
libx11: update to 1.6.7 and sytle cleanup
refresh Fix-hanging-issue-in-_XReply.patch (From OE-Core rev: 7edcf4f5b54ae713ede600f6c43ae955320efe69) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch28
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb (renamed from meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb)10
2 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
index 897882b8d8..2a723b7e43 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
@@ -17,19 +17,19 @@ https://patchwork.freedesktop.org/patch/171458/
17 17
18Signed-off-by: Tatu Frisk <tatu.frisk@ge.com> 18Signed-off-by: Tatu Frisk <tatu.frisk@ge.com>
19Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> 19Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
20
21[Refreshed for 1.6.7 update]
22Signed-off-by: Armin Kuster <akuster808@gmail.com>
23
20--- 24---
21 src/xcb_io.c | 19 +++++++------------ 25 src/xcb_io.c | 19 +++++++------------
22 1 file changed, 7 insertions(+), 12 deletions(-) 26 1 file changed, 7 insertions(+), 12 deletions(-)
23 27
24diff --git a/src/xcb_io.c b/src/xcb_io.c 28Index: libX11-1.6.7/src/xcb_io.c
25index 5987329..c64eb04 100644 29===================================================================
26--- a/src/xcb_io.c 30--- libX11-1.6.7.orig/src/xcb_io.c
27+++ b/src/xcb_io.c 31+++ libX11-1.6.7/src/xcb_io.c
28@@ -609,22 +609,17 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) 32@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep
29 * letting anyone else process this sequence number, we
30 * need to process any events that should have come
31 * earlier. */
32-
33 if(dpy->xcb->event_owner == XlibOwnsEventQueue) 33 if(dpy->xcb->event_owner == XlibOwnsEventQueue)
34 { 34 {
35 xcb_generic_reply_t *event; 35 xcb_generic_reply_t *event;
@@ -42,6 +42,9 @@ index 5987329..c64eb04 100644
42- while(dpy->xcb->event_waiter) 42- while(dpy->xcb->event_waiter)
43- { /* need braces around ConditionWait */ 43- { /* need braces around ConditionWait */
44- ConditionWait(dpy, dpy->xcb->event_notify); 44- ConditionWait(dpy, dpy->xcb->event_notify);
45- }
46- while((event = poll_for_event(dpy, True)))
47- handle_response(dpy, event, True);
45+ 48+
46+ /* Assume event queue is empty if another thread is blocking 49+ /* Assume event queue is empty if another thread is blocking
47+ * waiting for event. */ 50+ * waiting for event. */
@@ -49,12 +52,7 @@ index 5987329..c64eb04 100644
49+ { 52+ {
50+ while((event = poll_for_response(dpy))) 53+ while((event = poll_for_response(dpy)))
51+ handle_response(dpy, event, True); 54+ handle_response(dpy, event, True);
52 } 55+ }
53- while((event = poll_for_event(dpy)))
54- handle_response(dpy, event, True);
55 } 56 }
56 57
57 req->reply_waiter = 0; 58 req->reply_waiter = 0;
58--
592.10.1
60
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
index 0fee1a9089..f0f1bfd341 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb
@@ -1,14 +1,16 @@
1require libx11.inc 1require libx11.inc
2inherit gettext
3 2
4BBCLASSEXTEND = "native nativesdk" 3SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162"
4SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348"
5 5
6SRC_URI += "file://disable_tests.patch \ 6SRC_URI += "file://disable_tests.patch \
7 file://Fix-hanging-issue-in-_XReply.patch \ 7 file://Fix-hanging-issue-in-_XReply.patch \
8 " 8 "
9
10inherit gettext
11
9do_configure_append () { 12do_configure_append () {
10 sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile 13 sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile
11} 14}
12 15
13SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42" 16BBCLASSEXTEND = "native nativesdk"
14SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f"