diff options
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch | 42 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb | 19 |
2 files changed, 61 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch new file mode 100644 index 0000000000..ff8cb25cd5 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-proto/calibrateproto/fix.patch @@ -0,0 +1,42 @@ +Upstream-Status: Pending + +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 diff --git a/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb b/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb new file mode 100644 index 0000000000..b88d157923 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-proto/calibrateproto_git.bb @@ -0,0 +1,19 @@ +require xorg-proto-common.inc + +SUMMARY = "XCalibrate: Touchscreen calibration headers" + +DESCRIPTION = "This package provides the wire protocol for the \ +Touchscreen calibration extension." + +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://xcalibratewire.h;endline=23;md5=7f86ef7b03cce6c4c9ebd59d20ca485f \ + file://xcalibrateproto.h;endline=23;md5=e4490491edcc171ca24f98569ee580db" + +SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" + +PV = "0.0+git${SRCPV}" +PR = "r2" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \ + file://fix.patch;apply=yes" +S = "${WORKDIR}/git" |