sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

calibrateproto: Add missing length fields to X_Replies 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-02-11 12:10:39 +00:00
parent c33fa352b8
commit 2146902ae4
4 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/packages/xorg-lib/libxcalibrate_git.bb
View File

@ -4,7 +4,7 @@ DESCRIPTION = " Touchscreen calibration client library"
LICENSE = "BSD-X"
DEPENDS = "virtual/libx11 calibrateproto libxext"
PV = "0.0+git${SRCPV}"
PR = "r1"
PR = "r2"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \
file://fix-xcb.patch;patch=1"

40
meta/packages/xorg-proto/calibrateproto/fix.patch Normal file
View File

@ -0,0 +1,40 @@
Add missing length fields to the replies. Without these, sanity checking in recent X
breaks things.
RP 11/2/10
Index: git/xcalibrateproto.h
===================================================================
--- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000
+++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000
@@ -67,13 +67,13 @@
BYTE type; /* X_Reply */
BYTE pad1;
CARD16 sequenceNumber B16;
+ CARD32 length;
CARD32 status;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
CARD32 pad6 B32;
- CARD32 pad7 B32;
} xXCalibrateRawModeReply;
#define sz_xXCalibrateRawModeReply 32
@@ -92,13 +92,13 @@
BYTE type; /* X_Reply */
BYTE pad1;
CARD16 sequenceNumber B16;
+ CARD32 length;
CARD32 x;
CARD32 y;
CARD32 pad2 B32;
CARD32 pad3 B32;
CARD32 pad4 B32;
CARD32 pad5 B32;
- CARD32 pad6 B32;
} xXCalibrateScreenToCoordReply;
#define sz_xXCalibrateScreenToCoordReply 32

5
meta/packages/xorg-proto/calibrateproto_git.bb
View File

@ -3,7 +3,8 @@ require xorg-proto-common.inc
DESCRIPTION = "Touchscreen calibration protocol"
PV = "0.0+git${SRCPV}"
PR = "r1"
PR = "r2"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git \
file://fix.patch;patch=1"
S = "${WORKDIR}/git"

4
meta/packages/xtscal/xtscal_0.6.3.bb
View File

@ -4,11 +4,11 @@ SECTION = "x11/base"
DEPENDS = "virtual/libx11 libxft libxcalibrate"
PR = "r10"
PR = "r11"
SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
file://change-cross.patch;patch=1 \
file://cleanup.patch;patch=1 \
file://cleanup.patch;patch=1 \
file://30xTs_Calibrate.sh"
inherit autotools