calibrateproto: Switch to SRCREV, remove merged patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3762 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e3a57c3d2ce0784f5918dce85ad797175b3c2ea6..dec15c741cc38717767ff4de473d0f004bb374ea 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -117,7 +117,8 @@ SRCREV_pn-evince ?= "2437"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-libowl ?= "354"
 SRCREV_pn-libxcalibrate ?= "95c1708a48ab470971dc37df31b2733ad1aeb220"
-SRCDATE_calibrateproto ?= "20070607"
+SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+PV_pn-calibrateproto ?= "0.0-oh1-${SRCREV}"
 SRCDATE_gtk-theme-torturer ?= "20060821"
 SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
 SRCREV_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 (file)
index 8f44b02..0000000
--- a/meta/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/meta/packages/xorg-proto/calibrateproto_git.bb b/meta/packages/xorg-proto/calibrateproto_git.bb
index 60308601b9a9405b01c7b2c225cc4fd3ca5ecc7c..02d20b50381ecb7f4d11b690926f80fcf57d5107 100644 (file)
--- 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
 
 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"