2 files changed, 59 insertions, 1 deletions
diff --git a/meta/packages/xorg-proto/calibrateproto/coords.patch b/meta/packages/xorg-proto/calibrateproto/coords.patch
new file mode 100644
index 0000000000..8f44b029c5
--- /dev/null
+++ b/meta/packages/xorg-proto/calibrateproto/coords.patch
@@ -0,0 +1,56 @@
+---
+ xcalibrateproto.h |   25 +++++++++++++++++++++++++
+ xcalibratewire.h  |    3 ++-
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+Index: XCalibrateExt/xcalibrateproto.h
+===================================================================
+--- XCalibrateExt.orig/xcalibrateproto.h        2004-06-02 20:18:47.000000000 +0100
+++ XCalibrateExt/xcalibrateproto.h     2007-06-30 14:17:29.000000000 +0100
+@@ -78,6 +78,31 @@ typedef struct {
+ 
+ #define sz_xXCalibrateRawModeReply     32
+ 
+typedef struct {
+    CARD8   reqType;
+    CARD8   xCalibrateReqType;
+    CARD16  length B16;
+    CARD32  x B32;
+    CARD32  y B32;
+} xXCalibrateScreenToCoordReq;
+
+#define sz_xXCalibrateScreenToCoordReq 12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  x;
+    CARD32  y;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+    CARD32  pad6 B32;
+} xXCalibrateScreenToCoordReply;
+
+#define sz_xXCalibrateScreenToCoordReply       32
+
+ /* Events */
+ 
+ typedef struct {
+Index: XCalibrateExt/xcalibratewire.h
+===================================================================
+--- XCalibrateExt.orig/xcalibratewire.h 2004-06-02 20:18:47.000000000 +0100
+++ XCalibrateExt/xcalibratewire.h      2007-06-30 14:17:29.000000000 +0100
+@@ -31,8 +31,9 @@
+ 
+ #define X_XCalibrateQueryVersion               0
+ #define X_XCalibrateRawMode                    1
+#define X_XCalibrateScreenToCoord              2
+ 
+-#define XCalibrateNumberRequests               (X_XCalibrateSetRawMode + 1)
+#define XCalibrateNumberRequests               (X_XCalibrateScreenToCoord + 1)
+ 
+ #define X_XCalibrateRawTouchscreen             0
+ 
diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb
index dc03f02bf2..68c57ff3c7 100644
--- a/meta/packages/xorg-proto/calibrateproto_git.bb
+++ b/meta/packages/xorg-proto/calibrateproto_git.bb
@@ -3,7 +3,9 @@ require xorg-proto-common.inc
 DESCRIPTION = " Touchscreen calibration protocol"
 PV = "0.0+git${SRCDATE}"
+PR = "r1"
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
+           file://coords.patch;patch=1"
 S = "${WORKDIR}/git"

diff --git a/meta/packages/xorg-proto/calibrateproto/coords.patch b/meta/packages/xorg-proto/calibrateproto/coords.patch new file mode 100644 index 0000000000..8f44b029c5 --- /dev/null +++ b/meta/packages/xorg-proto/calibrateproto/coords.patch
@@ -0,0 +1,56 @@
		1	---
		2	xcalibrateproto.h \| 25 +++++++++++++++++++++++++
		3	xcalibratewire.h \| 3 ++-
		4	2 files changed, 27 insertions(+), 1 deletion(-)
		5
		6	Index: XCalibrateExt/xcalibrateproto.h
		7	===================================================================
		8	--- XCalibrateExt.orig/xcalibrateproto.h 2004-06-02 20:18:47.000000000 +0100
		9	+++ XCalibrateExt/xcalibrateproto.h 2007-06-30 14:17:29.000000000 +0100
		10	@@ -78,6 +78,31 @@ typedef struct {
		11
		12	#define sz_xXCalibrateRawModeReply 32
		13
		14	+typedef struct {
		15	+ CARD8 reqType;
		16	+ CARD8 xCalibrateReqType;
		17	+ CARD16 length B16;
		18	+ CARD32 x B32;
		19	+ CARD32 y B32;
		20	+} xXCalibrateScreenToCoordReq;
		21	+
		22	+#define sz_xXCalibrateScreenToCoordReq 12
		23	+
		24	+typedef struct {
		25	+ BYTE type; /* X_Reply */
		26	+ BYTE pad1;
		27	+ CARD16 sequenceNumber B16;
		28	+ CARD32 x;
		29	+ CARD32 y;
		30	+ CARD32 pad2 B32;
		31	+ CARD32 pad3 B32;
		32	+ CARD32 pad4 B32;
		33	+ CARD32 pad5 B32;
		34	+ CARD32 pad6 B32;
		35	+} xXCalibrateScreenToCoordReply;
		36	+
		37	+#define sz_xXCalibrateScreenToCoordReply 32
		38	+
		39	/* Events */
		40
		41	typedef struct {
		42	Index: XCalibrateExt/xcalibratewire.h
		43	===================================================================
		44	--- XCalibrateExt.orig/xcalibratewire.h 2004-06-02 20:18:47.000000000 +0100
		45	+++ XCalibrateExt/xcalibratewire.h 2007-06-30 14:17:29.000000000 +0100
		46	@@ -31,8 +31,9 @@
		47
		48	#define X_XCalibrateQueryVersion 0
		49	#define X_XCalibrateRawMode 1
		50	+#define X_XCalibrateScreenToCoord 2
		51
		52	-#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1)
		53	+#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1)
		54
		55	#define X_XCalibrateRawTouchscreen 0
		56


diff --git a/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb index dc03f02bf2..68c57ff3c7 100644 --- a/meta/packages/xorg-proto/calibrateproto_git.bb +++ b/meta/packages/xorg-proto/calibrateproto_git.bb
@@ -3,7 +3,9 @@ require xorg-proto-common.inc
3	DESCRIPTION = " Touchscreen calibration protocol"	3	DESCRIPTION = " Touchscreen calibration protocol"
4		4
5	PV = "0.0+git${SRCDATE}"	5	PV = "0.0+git${SRCDATE}"
		6	PR = "r1"
6		7
7	SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"	8	SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
		9	file://coords.patch;patch=1"
8	S = "${WORKDIR}/git"	10	S = "${WORKDIR}/git"
9		11