mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 15:32:14 +02:00
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>
This commit is contained in:
Oleksandr Kravchuk
committed by
Richard Purdie
Richard Purdie
parent
a5fe414531
commit
63f1e59f9f
@@ -1,49 +0,0 @@
|
||||
From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001
|
||||
From: Tatu Frisk <tatu.frisk@ge.com>
|
||||
Date: Tue, 14 Mar 2017 14:41:27 +0200
|
||||
Subject: [PATCH] Fix hanging issue in _XReply
|
||||
|
||||
Assume event queue is empty if another thread is blocking waiting for event.
|
||||
|
||||
If one thread was blocking waiting for an event and another thread sent a
|
||||
reply to the X server, both threads got blocked until an event was
|
||||
received.
|
||||
|
||||
Upstream-Status: Backport [93a050c3ad2d2264d3880db3791387b1a9bf2e9e]
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
---
|
||||
src/xcb_io.c | 19 +++++++------------
|
||||
1 file changed, 7 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: libX11-1.6.7/src/xcb_io.c
|
||||
===================================================================
|
||||
--- libX11-1.6.7.orig/src/xcb_io.c
|
||||
+++ libX11-1.6.7/src/xcb_io.c
|
||||
@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep
|
||||
if(dpy->xcb->event_owner == XlibOwnsEventQueue)
|
||||
{
|
||||
xcb_generic_reply_t *event;
|
||||
- /* If some thread is already waiting for events,
|
||||
- * it will get the first one. That thread must
|
||||
- * process that event before we can continue. */
|
||||
- /* FIXME: That event might be after this reply,
|
||||
- * and might never even come--or there might be
|
||||
- * multiple threads trying to get events. */
|
||||
- while(dpy->xcb->event_waiter)
|
||||
- { /* need braces around ConditionWait */
|
||||
- ConditionWait(dpy, dpy->xcb->event_notify);
|
||||
- }
|
||||
- while((event = poll_for_event(dpy, True)))
|
||||
- handle_response(dpy, event, True);
|
||||
+
|
||||
+ /* Assume event queue is empty if another thread is blocking
|
||||
+ * waiting for event. */
|
||||
+ if(!dpy->xcb->event_waiter)
|
||||
+ {
|
||||
+ while((event = poll_for_response(dpy)))
|
||||
+ handle_response(dpy, event, True);
|
||||
+ }
|
||||
}
|
||||
|
||||
req->reply_waiter = 0;
|
||||
@@ -1,46 +0,0 @@
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/79]
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue, 27 Jul 2021 11:46:19 +1000
|
||||
Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
|
||||
|
||||
These keys are all defined through a macro in the form:
|
||||
#define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
|
||||
|
||||
The _EVDEVK macro is simply an offset of 0x10081000.
|
||||
Let's parse these lines correctly so those keysyms end up in our
|
||||
hashtables.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
src/util/makekeys.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/src/util/makekeys.c b/src/util/makekeys.c
|
||||
index e847ef4c..4896cc53 100644
|
||||
--- a/src/util/makekeys.c
|
||||
+++ b/src/util/makekeys.c
|
||||
@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ /* See if we can parse one of the _EVDEVK symbols */
|
||||
+ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
|
||||
+ if (i == 2 && (tmp = strstr(key, "XK_"))) {
|
||||
+ memcpy(prefix, key, (size_t)(tmp - key));
|
||||
+ prefix[tmp - key] = '\0';
|
||||
+ tmp += 3;
|
||||
+ memmove(key, tmp, strlen(tmp) + 1);
|
||||
+
|
||||
+ *val += 0x10081000;
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
/* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
|
||||
* immediately: if the target is in the form XF86XK_foo, we need to
|
||||
* canonicalise this to XF86foo before we do the lookup. */
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -10,12 +10,13 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
|
||||
|
||||
PE = "1"
|
||||
|
||||
SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \
|
||||
file://disable_tests.patch \
|
||||
file://keysym.patch \
|
||||
"
|
||||
# temporarily override SRC_URI which is hard-coded in xorg-lib-common.inc
|
||||
# since new versions of packages use a new compression format - .tar.gz
|
||||
SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz"
|
||||
|
||||
SRC_URI[sha256sum] = "1cfa35e37aaabbe4792e9bb690468efefbfbf6b147d9c69d6f90d13c3092ea6c"
|
||||
SRC_URI += "file://disable_tests.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "dfd1343db3a0e523f1bb97d5ba71453c79eee78a77e51ca9f8dfef7131c6f0fe"
|
||||
|
||||
PROVIDES = "virtual/libx11"
|
||||
|
||||
@@ -23,8 +24,12 @@ XORG_PN = "libX11"
|
||||
LICENSE = "MIT & MIT-style & BSD-1-Clause & HPND & HPND-sell-variant"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
|
||||
|
||||
DEPENDS += "xorgproto xtrans libxcb"
|
||||
DEPENDS += "xorgproto-native"
|
||||
DEPENDS += "xorgproto \
|
||||
xtrans \
|
||||
libxcb \
|
||||
xorgproto-native \
|
||||
autoconf-archive \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
|
||||
EXTRA_OEMAKE += 'CWARNFLAGS=""'
|
||||
Reference in New Issue
Block a user