summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-11 21:02:20 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-11 21:02:20 +0000
commit94eca024ff206e6d56b3eb3f3c1ac04b40691380 (patch)
tree7664dc9bbde3c7ce8872ccb05b9c60ecebf5b16a
parent6ac3680a2d61d2023c7800ba718c94cb6659750c (diff)
downloadpoky-94eca024ff206e6d56b3eb3f3c1ac04b40691380.tar.gz
calibrateproto: Switch to SRCREV, remove merged patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3762 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky.conf3
-rw-r--r--meta/packages/xorg-proto/calibrateproto/coords.patch56
-rw-r--r--meta/packages/xorg-proto/calibrateproto_git.bb6
3 files changed, 4 insertions, 61 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e3a57c3d2c..dec15c741c 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -117,7 +117,8 @@ SRCREV_pn-evince ?= "2437"
117SRCREV_pn-oh-puzzles ?= "22" 117SRCREV_pn-oh-puzzles ?= "22"
118SRCREV_pn-libowl ?= "354" 118SRCREV_pn-libowl ?= "354"
119SRCREV_pn-libxcalibrate ?= "95c1708a48ab470971dc37df31b2733ad1aeb220" 119SRCREV_pn-libxcalibrate ?= "95c1708a48ab470971dc37df31b2733ad1aeb220"
120SRCDATE_calibrateproto ?= "20070607" 120SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
121PV_pn-calibrateproto ?= "0.0-oh1-${SRCREV}"
121SRCDATE_gtk-theme-torturer ?= "20060821" 122SRCDATE_gtk-theme-torturer ?= "20060821"
122SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545" 123SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
123SRCREV_pn-libsyncml ?= "241" 124SRCREV_pn-libsyncml ?= "241"
diff --git a/meta/packages/xorg-proto/calibrateproto/coords.patch b/meta/packages/xorg-proto/calibrateproto/coords.patch
deleted file mode 100644
index 8f44b029c5..0000000000
--- a/meta/packages/xorg-proto/calibrateproto/coords.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1---
2 xcalibrateproto.h | 25 +++++++++++++++++++++++++
3 xcalibratewire.h | 3 ++-
4 2 files changed, 27 insertions(+), 1 deletion(-)
5
6Index: 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 {
42Index: 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 60308601b9..02d20b5038 100644
--- a/meta/packages/xorg-proto/calibrateproto_git.bb
+++ b/meta/packages/xorg-proto/calibrateproto_git.bb
@@ -2,10 +2,8 @@ require xorg-proto-common.inc
2 2
3DESCRIPTION = "Touchscreen calibration protocol" 3DESCRIPTION = "Touchscreen calibration protocol"
4 4
5PV = "0.0+git${SRCDATE}" 5PV = "0.0+git${SRCREV}"
6PR = "r1" 6PR = "r1"
7 7
8SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \ 8SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
9 file://coords.patch;patch=1"
10
11S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"