summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2021-12-10 03:33:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-12-12 11:27:24 +0000
commit63f1e59f9f62eb39945aedc62ea01e0c29caea77 (patch)
tree08f272b55767aa460b9aa6c987950cccd176d5b1 /meta/recipes-graphics/xorg-lib/libx11
parenta5fe414531ec8f1b4e55ce0bd169e8aeb499eb2b (diff)
downloadpoky-63f1e59f9f62eb39945aedc62ea01e0c29caea77.tar.gz
libx11: update to 1.7.3
Dropped upstreamed patches. (From OE-Core rev: dc3fcb6f9f6b4f54519265a95d59279fceb5cc97) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch49
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/keysym.patch46
2 files changed, 0 insertions, 95 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
deleted file mode 100644
index 660e6968bf..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001
2From: Tatu Frisk <tatu.frisk@ge.com>
3Date: Tue, 14 Mar 2017 14:41:27 +0200
4Subject: [PATCH] Fix hanging issue in _XReply
5
6Assume event queue is empty if another thread is blocking waiting for event.
7
8If one thread was blocking waiting for an event and another thread sent a
9reply to the X server, both threads got blocked until an event was
10received.
11
12Upstream-Status: Backport [93a050c3ad2d2264d3880db3791387b1a9bf2e9e]
13Signed-off-by: Ross Burton <ross.burton@arm.com>
14
15---
16 src/xcb_io.c | 19 +++++++------------
17 1 file changed, 7 insertions(+), 12 deletions(-)
18
19Index: libX11-1.6.7/src/xcb_io.c
20===================================================================
21--- libX11-1.6.7.orig/src/xcb_io.c
22+++ libX11-1.6.7/src/xcb_io.c
23@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep
24 if(dpy->xcb->event_owner == XlibOwnsEventQueue)
25 {
26 xcb_generic_reply_t *event;
27- /* If some thread is already waiting for events,
28- * it will get the first one. That thread must
29- * process that event before we can continue. */
30- /* FIXME: That event might be after this reply,
31- * and might never even come--or there might be
32- * multiple threads trying to get events. */
33- while(dpy->xcb->event_waiter)
34- { /* need braces around ConditionWait */
35- ConditionWait(dpy, dpy->xcb->event_notify);
36- }
37- while((event = poll_for_event(dpy, True)))
38- handle_response(dpy, event, True);
39+
40+ /* Assume event queue is empty if another thread is blocking
41+ * waiting for event. */
42+ if(!dpy->xcb->event_waiter)
43+ {
44+ while((event = poll_for_response(dpy)))
45+ handle_response(dpy, event, True);
46+ }
47 }
48
49 req->reply_waiter = 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysym.patch b/meta/recipes-graphics/xorg-lib/libx11/keysym.patch
deleted file mode 100644
index f4d7419c02..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/keysym.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79]
2Signed-off-by: Ross Burton <ross.burton@arm.com>
3
4From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
5From: Peter Hutterer <peter.hutterer@who-t.net>
6Date: Tue, 27 Jul 2021 11:46:19 +1000
7Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
8
9These keys are all defined through a macro in the form:
10 #define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
11
12The _EVDEVK macro is simply an offset of 0x10081000.
13Let's parse these lines correctly so those keysyms end up in our
14hashtables.
15
16Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
17---
18 src/util/makekeys.c | 12 ++++++++++++
19 1 file changed, 12 insertions(+)
20
21diff --git a/src/util/makekeys.c b/src/util/makekeys.c
22index e847ef4c..4896cc53 100644
23--- a/src/util/makekeys.c
24+++ b/src/util/makekeys.c
25@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
26 return 1;
27 }
28
29+ /* See if we can parse one of the _EVDEVK symbols */
30+ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
31+ if (i == 2 && (tmp = strstr(key, "XK_"))) {
32+ memcpy(prefix, key, (size_t)(tmp - key));
33+ prefix[tmp - key] = '\0';
34+ tmp += 3;
35+ memmove(key, tmp, strlen(tmp) + 1);
36+
37+ *val += 0x10081000;
38+ return 1;
39+ }
40+
41 /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
42 * immediately: if the target is in the form XF86XK_foo, we need to
43 * canonicalise this to XF86foo before we do the lookup. */
44--
45GitLab
46