From 52d4ff7b35602faa52360a3e7a800891ef60c739 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 4 Jul 2012 10:28:20 +0300 Subject: libx11: upgrade to 1.5.0 Removed one backported patch. Signed-off-by: Laurentiu Palcu --- ...quest-as-substitute-for-GetReq-GetReqExtr.patch | 137 --------------------- .../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 ---- .../libx11-1.4.4/makekeys_crosscompile.patch | 76 ------------ .../libx11-1.4.4/x11_disable_makekeys.patch | 31 ----- .../xorg-lib/libx11-1.5.0/keysymdef_include.patch | 23 ++++ .../libx11-1.5.0/makekeys_crosscompile.patch | 76 ++++++++++++ .../libx11-1.5.0/x11_disable_makekeys.patch | 34 +++++ meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 22 ---- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 21 ++++ 9 files changed, 154 insertions(+), 289 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb 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 @@ -From 4a060f993bf676cf21ad9784e010f54134da7b40 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 17 Oct 2011 09:45:15 +1000 -Subject: [PATCH] Add _XGetRequest as substitute for GetReq/GetReqExtra - -Signed-off-by: Peter Hutterer -Reviewed-by: Jamey Sharp ---- - 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.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 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - 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 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -The error information from LSB Test suite is as follow: -VSW5TESTSUITE PURPOSE 7 -Assertion XStringToKeysym-7.(A) -When the string argument is the name of a KeySym in the -table with the prefix XK_ removed, then a call to -XStringToKeysym returns that KeySym. -METH: For each KeySym name in table with code G: -METH: Call XStringToKeysym to obtain the KeySym defined for that string. -METH: Verify that XStringToKeysym did not return NoSymbol. -METH: Verify that the returned string is correct. -CHECK: XStringToKeysym-7 1, line 130 -CHECK: XStringToKeysym-7 2, line 140 -CHECK: XStringToKeysym-7 3, line 150 -CHECK: XStringToKeysym-7 4, line 160 -CHECK: XStringToKeysym-7 5, line 170 -CHECK: XStringToKeysym-7 6, line 180 -CHECK: XStringToKeysym-7 7, line 190 -CHECK: XStringToKeysym-7 8, line 200 -CHECK: XStringToKeysym-7 9, line 210 -CHECK: XStringToKeysym-7 10, line 220 -CHECK: XStringToKeysym-7 11, line 230 -CHECK: XStringToKeysym-7 12, line 240 -CHECK: XStringToKeysym-7 13, line 250 -CHECK: XStringToKeysym-7 14, line 260 -CHECK: XStringToKeysym-7 15, line 270 -CHECK: XStringToKeysym-7 16, line 280 -CHECK: XStringToKeysym-7 17, line 290 -CHECK: XStringToKeysym-7 18, line 300 -CHECK: XStringToKeysym-7 19, line 310 -CHECK: XStringToKeysym-7 20, line 320 - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - 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 @@ -Upstream-Status: Pending - -Index: libX11-1.3.4/src/util/Makefile.am -=================================================================== ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --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 -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch new file mode 100644 index 0000000000..d1bdab9778 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch new file mode 100644 index 0000000000..daf3696b34 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch @@ -0,0 +1,76 @@ +Because the size of "unsigned long" is different between 32-bit +and 64-bit, judge whether target is 32-bit or 64-bit and tell +"makekey". + +The error information from LSB Test suite is as follow: +VSW5TESTSUITE PURPOSE 7 +Assertion XStringToKeysym-7.(A) +When the string argument is the name of a KeySym in the +table with the prefix XK_ removed, then a call to +XStringToKeysym returns that KeySym. +METH: For each KeySym name in table with code G: +METH: Call XStringToKeysym to obtain the KeySym defined for that string. +METH: Verify that XStringToKeysym did not return NoSymbol. +METH: Verify that the returned string is correct. +CHECK: XStringToKeysym-7 1, line 130 +CHECK: XStringToKeysym-7 2, line 140 +CHECK: XStringToKeysym-7 3, line 150 +CHECK: XStringToKeysym-7 4, line 160 +CHECK: XStringToKeysym-7 5, line 170 +CHECK: XStringToKeysym-7 6, line 180 +CHECK: XStringToKeysym-7 7, line 190 +CHECK: XStringToKeysym-7 8, line 200 +CHECK: XStringToKeysym-7 9, line 210 +CHECK: XStringToKeysym-7 10, line 220 +CHECK: XStringToKeysym-7 11, line 230 +CHECK: XStringToKeysym-7 12, line 240 +CHECK: XStringToKeysym-7 13, line 250 +CHECK: XStringToKeysym-7 14, line 260 +CHECK: XStringToKeysym-7 15, line 270 +CHECK: XStringToKeysym-7 16, line 280 +CHECK: XStringToKeysym-7 17, line 290 +CHECK: XStringToKeysym-7 18, line 300 +CHECK: XStringToKeysym-7 19, line 310 +CHECK: XStringToKeysym-7 20, line 320 + +Upstream-Status: Pending + +Signed-off-by: dbuitenh@windriver.com + +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + typedef unsigned long Signature; + +@@ -124,7 +125,12 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif ++ + first = j = sig % z; + for (k = 0; tab[j]; k++) { + j += first + 1; +@@ -163,7 +169,11 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif + first = j = sig % z; + while (offsets[j]) { + j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch new file mode 100644 index 0000000000..69f9e6c4d6 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch @@ -0,0 +1,34 @@ +Upstream-Status: Pending + +Index: libX11-1.5.0/src/util/Makefile.am +=================================================================== +--- libX11-1.5.0.orig/src/util/Makefile.am ++++ libX11-1.5.0/src/util/Makefile.am +@@ -1,27 +1,2 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(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 +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb deleted file mode 100644 index 1ad8046144..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -require libx11.inc -inherit gettext - -PR = "r3" - -BBCLASSEXTEND = "native nativesdk" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11" - -DEPENDS += "util-macros xtrans libxdmcp libxau \ - bigreqsproto xproto xextproto xcmiscproto \ - xf86bigfontproto kbproto inputproto libxcb \ - xproto-native" - -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" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb new file mode 100644 index 0000000000..04805d74f4 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -0,0 +1,21 @@ +require libx11.inc +inherit gettext + +PR = "r0" + +BBCLASSEXTEND = "native nativesdk" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11" + +DEPENDS += "util-macros xtrans libxdmcp libxau \ + bigreqsproto xproto xextproto xcmiscproto \ + xf86bigfontproto kbproto inputproto libxcb \ + xproto-native" + +SRC_URI += " file://keysymdef_include.patch \ + file://x11_disable_makekeys.patch \ + file://makekeys_crosscompile.patch \ + " + +SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" +SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -- cgit v1.2.3