summaryrefslogtreecommitdiff
path: root/packages/xorg-proto
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-02-18 23:57:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-02-18 23:57:28 +0000
commit55269916959bddb4a07f06825e1ab0a47feba221 (patch)
tree29103395f4530ccf2d8195364eace1e66faeb990 /packages/xorg-proto
parentf659468be29e8e2056fc1aa9f382abd790fcd6f8 (diff)
parent3736c8dda619105cbe8908c9a86f4263d610a59e (diff)
merge of '4bfcfd2edc67793c8c00682ad89309619eddab3a'
and 'eec0cf22d27780a5209f4aad8fee7ddaa6bb80a0'
Diffstat (limited to 'packages/xorg-proto')
-rw-r--r--packages/xorg-proto/calibrateproto/.mtn2git_empty0
-rw-r--r--packages/xorg-proto/calibrateproto/coords.patch56
-rw-r--r--packages/xorg-proto/calibrateproto_git.bb6
3 files changed, 2 insertions, 60 deletions
diff --git a/packages/xorg-proto/calibrateproto/.mtn2git_empty b/packages/xorg-proto/calibrateproto/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xorg-proto/calibrateproto/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-proto/calibrateproto/coords.patch b/packages/xorg-proto/calibrateproto/coords.patch
deleted file mode 100644
index 8f44b029c5..0000000000
--- a/packages/xorg-proto/calibrateproto/coords.patch
+++ /dev/null
@@ -1,56 +0,0 @@
----
- 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/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index 60308601b9..02d20b5038 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -2,10 +2,8 @@ require xorg-proto-common.inc
DESCRIPTION = "Touchscreen calibration protocol"
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+git${SRCREV}"
PR = "r1"
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04 \
- file://coords.patch;patch=1"
-
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
S = "${WORKDIR}/git"