[OE-core] [CONSOLIDATED PULL 03/41] libx11: upgrade to 1.5.0
Saul Wold
sgw at linux.intel.com
Mon Jul 9 15:47:17 UTC 2012
From: Laurentiu Palcu <laurentiu.palcu at intel.com>
Removed one backported patch.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
---
...quest-as-substitute-for-GetReq-GetReqExtr.patch | 137 --------------------
.../keysymdef_include.patch | 0
.../makekeys_crosscompile.patch | 0
.../x11_disable_makekeys.patch | 13 +-
.../xorg-lib/{libx11_1.4.4.bb => libx11_1.5.0.bb} | 7 +-
5 files changed, 11 insertions(+), 146 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
rename meta/recipes-graphics/xorg-lib/{libx11-1.4.4 => libx11-1.5.0}/keysymdef_include.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.4.4 => libx11-1.5.0}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.4.4 => libx11-1.5.0}/x11_disable_makekeys.patch (74%)
rename meta/recipes-graphics/xorg-lib/{libx11_1.4.4.bb => libx11_1.5.0.bb} (67%)
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 aedb5c4..0000000
--- 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 @@
-From 4a060f993bf676cf21ad9784e010f54134da7b40 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Mon, 17 Oct 2011 09:45:15 +1000
-Subject: [PATCH] Add _XGetRequest as substitute for GetReq/GetReqExtra
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Jamey Sharp <jamey at minilop.net>
----
- include/X11/Xlibint.h | 49 ++++++++++++++++---------------------------------
- src/XlibInt.c | 31 +++++++++++++++++++++++++++++++
- 2 files changed, 47 insertions(+), 33 deletions(-)
-
-Upstream-Status: Backport
-
-diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
-index 2ce356d..43d1f2a 100644
---- a/include/X11/Xlibint.h
-+++ b/include/X11/Xlibint.h
-@@ -420,6 +420,18 @@ extern LockInfoPtr _Xglobal_lock;
- #define WORD64ALIGN
- #endif /* WORD64 */
-
-+/**
-+ * Return a len-sized request buffer for the request type. This function may
-+ * flush the output queue.
-+ *
-+ * @param dpy The display connection
-+ * @param type The request type
-+ * @param len Length of the request in bytes
-+ *
-+ * @returns A pointer to the request buffer with a few default values
-+ * initialized.
-+ */
-+extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
-
- /*
- * GetReq - Get the next available X request packet in the buffer and
-@@ -432,25 +444,10 @@ extern LockInfoPtr _Xglobal_lock;
-
- #if !defined(UNIXCPP) || defined(ANSICPP)
- #define GetReq(name, req) \
-- WORD64ALIGN\
-- if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
-- _XFlush(dpy);\
-- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
-- req->reqType = X_##name;\
-- req->length = (SIZEOF(x##name##Req))>>2;\
-- dpy->bufptr += SIZEOF(x##name##Req);\
-- dpy->request++
--
-+ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req))
- #else /* non-ANSI C uses empty comment instead of "##" for token concatenation */
- #define GetReq(name, req) \
-- WORD64ALIGN\
-- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
-- _XFlush(dpy);\
-- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-- req->reqType = X_/**/name;\
-- req->length = (SIZEOF(x/**/name/**/Req))>>2;\
-- dpy->bufptr += SIZEOF(x/**/name/**/Req);\
-- dpy->request++
-+ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req))
- #endif
-
- /* GetReqExtra is the same as GetReq, but allocates "n" additional
-@@ -458,24 +455,10 @@ extern LockInfoPtr _Xglobal_lock;
-
- #if !defined(UNIXCPP) || defined(ANSICPP)
- #define GetReqExtra(name, n, req) \
-- WORD64ALIGN\
-- if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\
-- _XFlush(dpy);\
-- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
-- req->reqType = X_##name;\
-- req->length = (SIZEOF(x##name##Req) + n)>>2;\
-- dpy->bufptr += SIZEOF(x##name##Req) + n;\
-- dpy->request++
-+ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req) + n)
- #else
- #define GetReqExtra(name, n, req) \
-- WORD64ALIGN\
-- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req) + n) > dpy->bufmax)\
-- _XFlush(dpy);\
-- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
-- req->reqType = X_/**/name;\
-- req->length = (SIZEOF(x/**/name/**/Req) + n)>>2;\
-- dpy->bufptr += SIZEOF(x/**/name/**/Req) + n;\
-- dpy->request++
-+ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req) + n)
- #endif
-
-
-diff --git a/src/XlibInt.c b/src/XlibInt.c
-index 3db151e..a8f5d08 100644
---- a/src/XlibInt.c
-+++ b/src/XlibInt.c
-@@ -1956,6 +1956,37 @@ Screen *_XScreenOfWindow(Display *dpy, Window w)
- }
-
-
-+/*
-+ * WARNING: This implementation's pre-conditions and post-conditions
-+ * must remain compatible with the old macro-based implementations of
-+ * GetReq, GetReqExtra, GetResReq, and GetEmptyReq. The portions of the
-+ * Display structure affected by those macros are part of libX11's
-+ * ABI.
-+ */
-+void *_XGetRequest(Display *dpy, CARD8 type, size_t len)
-+{
-+ xReq *req;
-+
-+ WORD64ALIGN
-+
-+ if (dpy->bufptr + len > dpy->bufmax)
-+ _XFlush(dpy);
-+
-+ if (len % 4)
-+ fprintf(stderr,
-+ "Xlib: request %d length %zd not a multiple of 4.\n",
-+ type, len);
-+
-+ dpy->last_req = dpy->bufptr;
-+
-+ req = (xReq*)dpy->bufptr;
-+ req->reqType = type;
-+ req->length = len / 4;
-+ dpy->bufptr += len;
-+ dpy->request++;
-+ return req;
-+}
-+
- #if defined(WIN32)
-
- /*
---
-1.7.8.3
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
rename to meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
rename to meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch
similarity index 74%
rename from meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch
index e3782a5..69f9e6c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch
@@ -1,10 +1,10 @@
Upstream-Status: Pending
-Index: libX11-1.3.4/src/util/Makefile.am
+Index: libX11-1.5.0/src/util/Makefile.am
===================================================================
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1 @@
+--- libX11-1.5.0.orig/src/util/Makefile.am
++++ libX11-1.5.0/src/util/Makefile.am
+@@ -1,27 +1,2 @@
-
-noinst_PROGRAMS=makekeys
-
@@ -12,13 +12,16 @@ Index: libX11-1.3.4/src/util/Makefile.am
- $(X11_CFLAGS) \
- $(CWARNFLAGS)
-
+-makekeys_CPPFLAGS = \
+- -I$(top_srcdir)/include
+-
-CC = @CC_FOR_BUILD@
-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
-CFLAGS = @CFLAGS_FOR_BUILD@
-LDFLAGS = @LDFLAGS_FOR_BUILD@
-
EXTRA_DIST = mkks.sh
--
+
-if LINT
-# Check source code with tools like lint & sparse
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
similarity index 67%
rename from meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 1ad8046..04805d7 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
require libx11.inc
inherit gettext
-PR = "r3"
+PR = "r0"
BBCLASSEXTEND = "native nativesdk"
@@ -14,9 +14,8 @@ DEPENDS += "util-macros xtrans libxdmcp libxau \
SRC_URI += " file://keysymdef_include.patch \
file://x11_disable_makekeys.patch \
- file://0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch \
file://makekeys_crosscompile.patch \
"
-SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
-SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
+SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
+SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
--
1.7.7.6
More information about the Openembedded-core
mailing list