2 files changed, 30 insertions, 1 deletions

diff --git a/meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch
new file mode 100644
index 0000000000..0d7efc70f3
--- /dev/null
+++ b/meta/packages/xorg-lib/libxcalibrate/fix-xcb.patch
@@ -0,0 +1,27 @@
+There is no extra reply data and if we say not to disgard it, xcb
+throws fatal asserts.
+
+RP - 26/11/09
+
+Index: git/xcalibrate.c
+===================================================================
+--- git.orig/xcalibrate.c       2009-11-26 08:11:48.000000000 +0000
++++ git/xcalibrate.c    2009-11-26 08:09:55.000000000 +0000
+@@ -216,7 +216,7 @@
+   req->reqType = info->codes->major_opcode;
+   req->xCalibrateReqType = X_XCalibrateRawMode;
+   req->on = enable;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();
+@@ -240,7 +240,7 @@
+   req->xCalibrateReqType = X_XCalibrateScreenToCoord;
+   req->x = *x;
+   req->y = *y;
+-  if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) 
++  if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) 
+     {
+       UnlockDisplay (dpy);
+       SyncHandle ();
diff --git a/meta/packages/xorg-lib/libxcalibrate_git.bb b/meta/packages/xorg-lib/libxcalibrate_git.bb
index 000004114d..2815520b03 100644
--- a/meta/packages/xorg-lib/libxcalibrate_git.bb
+++ b/meta/packages/xorg-lib/libxcalibrate_git.bb
@@ -4,8 +4,10 @@ DESCRIPTION = "	Touchscreen calibration client library"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
 PV = "0.0+git${SRCPV}"
+PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \
+           file://fix-xcb.patch;patch=1"
 
 S = "${WORKDIR}/git"