From ce8deda64f78ac48820d06c4f90c20a31f9e3eed Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 6 Feb 2014 22:05:41 +0000 Subject: libx11: backport _XEatDataWords API If you build libx11-native then that has to be ABI-compatible with the libX11 on the host or you'll have problems running qemu-native. Most current distros are using libX11 1.6+. Thus, we need to backport the _XEatDataWords API present in 1.6. This only affects the dylan branch as dora+ has libx11 1.6+. Fixes [YOCTO #5040]. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../xorg-lib/libx11/xeatdatawords.patch | 65 ++++++++++++++++++++++ meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/xeatdatawords.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11/xeatdatawords.patch b/meta/recipes-graphics/xorg-lib/libx11/xeatdatawords.patch new file mode 100644 index 0000000000..63fac8b9cf --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/xeatdatawords.patch @@ -0,0 +1,65 @@ +From 9f5d83706543696fc944c1835a403938c06f2cc5 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 02 Mar 2013 04:54:24 +0000 +Subject: Add _XEatDataWords to discard a given number of 32-bit words of reply data + +Matches the units of the length field in X protocol replies, and provides +a single implementation of overflow checking to avoid having to replicate +those checks in every caller. + +Signed-off-by: Alan Coopersmith +Reviewed-by: Matthieu Herrb + +Upstream-Status: Backport +Signed-off-by: Paul Eggleton + +--- +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index 06395b3..d63a534 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -855,6 +855,10 @@ extern void _XEatData( + Display* /* dpy */, + unsigned long /* n */ + ); ++extern void _XEatDataWords( ++ Display* /* dpy */, ++ unsigned long /* n */ ++); + extern char *_XAllocScratch( + Display* /* dpy */, + unsigned long /* nbytes */ +diff --git a/src/xcb_io.c b/src/xcb_io.c +index 300ef57..727c6c7 100644 +--- a/src/xcb_io.c ++++ b/src/xcb_io.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SYS_SELECT_H + #include + #endif +@@ -757,3 +758,19 @@ void _XEatData(Display *dpy, unsigned long n) + dpy->xcb->reply_consumed += n; + _XFreeReplyData(dpy, False); + } ++ ++/* ++ * Read and discard "n" 32-bit words of data ++ * Matches the units of the length field in X protocol replies, and provides ++ * a single implementation of overflow checking to avoid having to replicate ++ * those checks in every caller. ++ */ ++void _XEatDataWords(Display *dpy, unsigned long n) ++{ ++ if (n < ((INT_MAX - dpy->xcb->reply_consumed) >> 2)) ++ dpy->xcb->reply_consumed += (n << 2); ++ else ++ /* Overflow would happen, so just eat the rest of the reply */ ++ dpy->xcb->reply_consumed = dpy->xcb->reply_length; ++ _XFreeReplyData(dpy, False); ++} +-- +cgit v0.9.0.2-2-gbebe diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 7f18824850..95d5c7d8e2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -7,6 +7,7 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://keysymdef_include.patch \ file://disable_tests.patch \ + file://xeatdatawords.patch \ " SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" -- cgit 1.2.3-korg