summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-1.4.4
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-1.4.4')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch137
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch23
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch76
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch31
4 files changed, 0 insertions, 267 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
deleted file mode 100644
index aedb5c4366..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
+++ /dev/null
@@ -1,137 +0,0 @@
1From 4a060f993bf676cf21ad9784e010f54134da7b40 Mon Sep 17 00:00:00 2001
2From: Peter Hutterer <peter.hutterer@who-t.net>
3Date: Mon, 17 Oct 2011 09:45:15 +1000
4Subject: [PATCH] Add _XGetRequest as substitute for GetReq/GetReqExtra
5
6Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
7Reviewed-by: Jamey Sharp <jamey@minilop.net>
8---
9 include/X11/Xlibint.h | 49 ++++++++++++++++---------------------------------
10 src/XlibInt.c | 31 +++++++++++++++++++++++++++++++
11 2 files changed, 47 insertions(+), 33 deletions(-)
12
13Upstream-Status: Backport
14
15diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
16index 2ce356d..43d1f2a 100644
17--- a/include/X11/Xlibint.h
18+++ b/include/X11/Xlibint.h
19@@ -420,6 +420,18 @@ extern LockInfoPtr _Xglobal_lock;
20 #define WORD64ALIGN
21 #endif /* WORD64 */
22
23+/**
24+ * Return a len-sized request buffer for the request type. This function may
25+ * flush the output queue.
26+ *
27+ * @param dpy The display connection
28+ * @param type The request type
29+ * @param len Length of the request in bytes
30+ *
31+ * @returns A pointer to the request buffer with a few default values
32+ * initialized.
33+ */
34+extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
35
36 /*
37 * GetReq - Get the next available X request packet in the buffer and
38@@ -432,25 +444,10 @@ extern LockInfoPtr _Xglobal_lock;
39
40 #if !defined(UNIXCPP) || defined(ANSICPP)
41 #define GetReq(name, req) \
42- WORD64ALIGN\
43- if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
44- _XFlush(dpy);\
45- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
46- req->reqType = X_##name;\
47- req->length = (SIZEOF(x##name##Req))>>2;\
48- dpy->bufptr += SIZEOF(x##name##Req);\
49- dpy->request++
50-
51+ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req))
52 #else /* non-ANSI C uses empty comment instead of "##" for token concatenation */
53 #define GetReq(name, req) \
54- WORD64ALIGN\
55- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
56- _XFlush(dpy);\
57- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
58- req->reqType = X_/**/name;\
59- req->length = (SIZEOF(x/**/name/**/Req))>>2;\
60- dpy->bufptr += SIZEOF(x/**/name/**/Req);\
61- dpy->request++
62+ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req))
63 #endif
64
65 /* GetReqExtra is the same as GetReq, but allocates "n" additional
66@@ -458,24 +455,10 @@ extern LockInfoPtr _Xglobal_lock;
67
68 #if !defined(UNIXCPP) || defined(ANSICPP)
69 #define GetReqExtra(name, n, req) \
70- WORD64ALIGN\
71- if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\
72- _XFlush(dpy);\
73- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
74- req->reqType = X_##name;\
75- req->length = (SIZEOF(x##name##Req) + n)>>2;\
76- dpy->bufptr += SIZEOF(x##name##Req) + n;\
77- dpy->request++
78+ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req) + n)
79 #else
80 #define GetReqExtra(name, n, req) \
81- WORD64ALIGN\
82- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req) + n) > dpy->bufmax)\
83- _XFlush(dpy);\
84- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
85- req->reqType = X_/**/name;\
86- req->length = (SIZEOF(x/**/name/**/Req) + n)>>2;\
87- dpy->bufptr += SIZEOF(x/**/name/**/Req) + n;\
88- dpy->request++
89+ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req) + n)
90 #endif
91
92
93diff --git a/src/XlibInt.c b/src/XlibInt.c
94index 3db151e..a8f5d08 100644
95--- a/src/XlibInt.c
96+++ b/src/XlibInt.c
97@@ -1956,6 +1956,37 @@ Screen *_XScreenOfWindow(Display *dpy, Window w)
98 }
99
100
101+/*
102+ * WARNING: This implementation's pre-conditions and post-conditions
103+ * must remain compatible with the old macro-based implementations of
104+ * GetReq, GetReqExtra, GetResReq, and GetEmptyReq. The portions of the
105+ * Display structure affected by those macros are part of libX11's
106+ * ABI.
107+ */
108+void *_XGetRequest(Display *dpy, CARD8 type, size_t len)
109+{
110+ xReq *req;
111+
112+ WORD64ALIGN
113+
114+ if (dpy->bufptr + len > dpy->bufmax)
115+ _XFlush(dpy);
116+
117+ if (len % 4)
118+ fprintf(stderr,
119+ "Xlib: request %d length %zd not a multiple of 4.\n",
120+ type, len);
121+
122+ dpy->last_req = dpy->bufptr;
123+
124+ req = (xReq*)dpy->bufptr;
125+ req->reqType = type;
126+ req->length = len / 4;
127+ dpy->bufptr += len;
128+ dpy->request++;
129+ return req;
130+}
131+
132 #if defined(WIN32)
133
134 /*
135--
1361.7.8.3
137
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
deleted file mode 100644
index d1bdab9778..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
deleted file mode 100644
index daf3696b34..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1Because the size of "unsigned long" is different between 32-bit
2and 64-bit, judge whether target is 32-bit or 64-bit and tell
3"makekey".
4
5The error information from LSB Test suite is as follow:
6VSW5TESTSUITE PURPOSE 7
7Assertion XStringToKeysym-7.(A)
8When the string argument is the name of a KeySym in the
9table with the prefix XK_ removed, then a call to
10XStringToKeysym returns that KeySym.
11METH: For each KeySym name in table with code G:
12METH: Call XStringToKeysym to obtain the KeySym defined for that string.
13METH: Verify that XStringToKeysym did not return NoSymbol.
14METH: Verify that the returned string is correct.
15CHECK: XStringToKeysym-7 1, line 130
16CHECK: XStringToKeysym-7 2, line 140
17CHECK: XStringToKeysym-7 3, line 150
18CHECK: XStringToKeysym-7 4, line 160
19CHECK: XStringToKeysym-7 5, line 170
20CHECK: XStringToKeysym-7 6, line 180
21CHECK: XStringToKeysym-7 7, line 190
22CHECK: XStringToKeysym-7 8, line 200
23CHECK: XStringToKeysym-7 9, line 210
24CHECK: XStringToKeysym-7 10, line 220
25CHECK: XStringToKeysym-7 11, line 230
26CHECK: XStringToKeysym-7 12, line 240
27CHECK: XStringToKeysym-7 13, line 250
28CHECK: XStringToKeysym-7 14, line 260
29CHECK: XStringToKeysym-7 15, line 270
30CHECK: XStringToKeysym-7 16, line 280
31CHECK: XStringToKeysym-7 17, line 290
32CHECK: XStringToKeysym-7 18, line 300
33CHECK: XStringToKeysym-7 19, line 310
34CHECK: XStringToKeysym-7 20, line 320
35
36Upstream-Status: Pending
37
38Signed-off-by: dbuitenh@windriver.com
39
40--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800
41+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
42@@ -33,6 +33,7 @@
43 #include <X11/keysymdef.h>
44 #include <stdio.h>
45 #include <stdlib.h>
46+#include <stdint.h>
47
48 typedef unsigned long Signature;
49
50@@ -124,7 +125,12 @@
51 name = info[i].name;
52 sig = 0;
53 while ((c = *name++))
54- sig = (sig << 1) + c;
55+#ifdef USE32
56+ sig = (uint32_t)(sig << 1) + c;
57+#else
58+ sig = (uint64_t)(sig << 1) + c;
59+#endif
60+
61 first = j = sig % z;
62 for (k = 0; tab[j]; k++) {
63 j += first + 1;
64@@ -163,7 +169,11 @@
65 name = info[i].name;
66 sig = 0;
67 while ((c = *name++))
68- sig = (sig << 1) + c;
69+#ifdef USE32
70+ sig = (uint32_t)(sig << 1) + c;
71+#else
72+ sig = (uint64_t)(sig << 1) + c;
73+#endif
74 first = j = sig % z;
75 while (offsets[j]) {
76 j += first + 1;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
deleted file mode 100644
index e3782a5557..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Pending
2
3Index: libX11-1.3.4/src/util/Makefile.am
4===================================================================
5--- libX11-1.3.4.orig/src/util/Makefile.am
6+++ libX11-1.3.4/src/util/Makefile.am
7@@ -1,24 +1 @@
8-
9-noinst_PROGRAMS=makekeys
10-
11-makekeys_CFLAGS = \
12- $(X11_CFLAGS) \
13- $(CWARNFLAGS)
14-
15-CC = @CC_FOR_BUILD@
16-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
17-CFLAGS = @CFLAGS_FOR_BUILD@
18-LDFLAGS = @LDFLAGS_FOR_BUILD@
19-
20 EXTRA_DIST = mkks.sh
21-
22-if LINT
23-# Check source code with tools like lint & sparse
24-
25-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
26- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
27-
28-lint:
29- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
30-
31-endif LINT
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-18 17:20:06 +0000