summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-11 12:10:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-11 12:10:39 +0000
commit2146902ae475347a8603dd6abcc1f042f2797d37 (patch)
treefebce7ec9f0a66a777cea5f3c7f2aa4281fb4b8e
parentc33fa352b8268e3769976a06159fb9bb733a687e (diff)
downloadpoky-2146902ae475347a8603dd6abcc1f042f2797d37.tar.gz
calibrateproto: Add missing length fields to X_Replies
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/xorg-lib/libxcalibrate_git.bb2
-rw-r--r--meta/packages/xorg-proto/calibrateproto/fix.patch40
-rw-r--r--meta/packages/xorg-proto/calibrateproto_git.bb5
-rw-r--r--meta/packages/xtscal/xtscal_0.6.3.bb4
4 files changed, 46 insertions, 5 deletions
diff --git a/meta/packages/xorg-lib/libxcalibrate_git.bb b/meta/packages/xorg-lib/libxcalibrate_git.bb
index 2815520b03..5c2cd12f74 100644
--- a/meta/packages/xorg-lib/libxcalibrate_git.bb
+++ b/meta/packages/xorg-lib/libxcalibrate_git.bb
@@ -4,7 +4,7 @@ DESCRIPTION = " Touchscreen calibration client library"
4LICENSE = "BSD-X" 4LICENSE = "BSD-X"
5DEPENDS = "virtual/libx11 calibrateproto libxext" 5DEPENDS = "virtual/libx11 calibrateproto libxext"
6PV = "0.0+git${SRCPV}" 6PV = "0.0+git${SRCPV}"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \ 9SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git \
10 file://fix-xcb.patch;patch=1" 10 file://fix-xcb.patch;patch=1"
diff --git a/meta/packages/xorg-proto/calibrateproto/fix.patch b/meta/packages/xorg-proto/calibrateproto/fix.patch
new file mode 100644
index 0000000000..0c85cb0ccf
--- /dev/null
+++ b/meta/packages/xorg-proto/calibrateproto/fix.patch
@@ -0,0 +1,40 @@
1Add missing length fields to the replies. Without these, sanity checking in recent X
2breaks things.
3
4RP 11/2/10
5
6
7Index: git/xcalibrateproto.h
8===================================================================
9--- git.orig/xcalibrateproto.h 2010-02-11 11:47:45.711985932 +0000
10+++ git/xcalibrateproto.h 2010-02-11 11:40:21.000000000 +0000
11@@ -67,13 +67,13 @@
12 BYTE type; /* X_Reply */
13 BYTE pad1;
14 CARD16 sequenceNumber B16;
15+ CARD32 length;
16 CARD32 status;
17 CARD32 pad2 B32;
18 CARD32 pad3 B32;
19 CARD32 pad4 B32;
20 CARD32 pad5 B32;
21 CARD32 pad6 B32;
22- CARD32 pad7 B32;
23 } xXCalibrateRawModeReply;
24
25 #define sz_xXCalibrateRawModeReply 32
26@@ -92,13 +92,13 @@
27 BYTE type; /* X_Reply */
28 BYTE pad1;
29 CARD16 sequenceNumber B16;
30+ CARD32 length;
31 CARD32 x;
32 CARD32 y;
33 CARD32 pad2 B32;
34 CARD32 pad3 B32;
35 CARD32 pad4 B32;
36 CARD32 pad5 B32;
37- CARD32 pad6 B32;
38 } xXCalibrateScreenToCoordReply;
39
40 #define sz_xXCalibrateScreenToCoordReply 32
diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb
index c6bf242153..2c85cd7033 100644
--- a/meta/packages/xorg-proto/calibrateproto_git.bb
+++ b/meta/packages/xorg-proto/calibrateproto_git.bb
@@ -3,7 +3,8 @@ require xorg-proto-common.inc
3DESCRIPTION = "Touchscreen calibration protocol" 3DESCRIPTION = "Touchscreen calibration protocol"
4 4
5PV = "0.0+git${SRCPV}" 5PV = "0.0+git${SRCPV}"
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" 8SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git \
9 file://fix.patch;patch=1"
9S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
diff --git a/meta/packages/xtscal/xtscal_0.6.3.bb b/meta/packages/xtscal/xtscal_0.6.3.bb
index 35eccbe4ee..504ceaa9ed 100644
--- a/meta/packages/xtscal/xtscal_0.6.3.bb
+++ b/meta/packages/xtscal/xtscal_0.6.3.bb
@@ -4,11 +4,11 @@ SECTION = "x11/base"
4 4
5DEPENDS = "virtual/libx11 libxft libxcalibrate" 5DEPENDS = "virtual/libx11 libxft libxcalibrate"
6 6
7PR = "r10" 7PR = "r11"
8 8
9SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ 9SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
10 file://change-cross.patch;patch=1 \ 10 file://change-cross.patch;patch=1 \
11 file://cleanup.patch;patch=1 \ 11 file://cleanup.patch;patch=1 \
12 file://30xTs_Calibrate.sh" 12 file://30xTs_Calibrate.sh"
13 13
14inherit autotools 14inherit autotools