summaryrefslogtreecommitdiff
path: root/packages/xorg-lib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-18 16:20:58 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-18 16:20:58 +0000
commit7d427c988107e61e6d9b9f949af49398caa204e4 (patch)
tree2bbffd6f8177e809482ac2b790370c928d300635 /packages/xorg-lib
parentffd4a5b48f26451870c89660a1b92b1d4f9a4073 (diff)
calibrateproto, libxcalibrate: Update recipes to SRCREV and a new tag since the patches were merged upstream
Diffstat (limited to 'packages/xorg-lib')
-rw-r--r--packages/xorg-lib/libxcalibrate/.mtn2git_empty0
-rw-r--r--packages/xorg-lib/libxcalibrate/coords.patch50
-rw-r--r--packages/xorg-lib/libxcalibrate_git.bb6
3 files changed, 2 insertions, 54 deletions
diff --git a/packages/xorg-lib/libxcalibrate/.mtn2git_empty b/packages/xorg-lib/libxcalibrate/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xorg-lib/libxcalibrate/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xorg-lib/libxcalibrate/coords.patch b/packages/xorg-lib/libxcalibrate/coords.patch
deleted file mode 100644
index 19cf1639f6..0000000000
--- a/packages/xorg-lib/libxcalibrate/coords.patch
+++ /dev/null
@@ -1,50 +0,0 @@
----
- xcalibrate.c | 26 ++++++++++++++++++++++++++
- xcalibrate.h | 2 ++
- 2 files changed, 28 insertions(+)
-
-Index: XCalibrate/xcalibrate.c
-===================================================================
---- XCalibrate.orig/xcalibrate.c 2007-06-30 14:12:22.000000000 +0100
-+++ XCalibrate/xcalibrate.c 2007-06-30 14:18:10.000000000 +0100
-@@ -227,3 +227,29 @@ XCalibrateSetRawMode (Display *dpy, Bool
- SyncHandle ();
- return 0;
- }
-+
-+Status
-+XCalibrateScreenToCoord (Display *dpy, int *x, int *y)
-+{
-+ XExtDisplayInfo *info = XCalibrateFindDisplay (dpy);
-+ xXCalibrateScreenToCoordReq *req;
-+ xXCalibrateScreenToCoordReply rep;
-+ LockDisplay (dpy);
-+ GetReq (XCalibrateScreenToCoord, req);
-+ req->reqType = info->codes->major_opcode;
-+ req->xCalibrateReqType = X_XCalibrateScreenToCoord;
-+ req->x = *x;
-+ req->y = *y;
-+ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
-+ {
-+ UnlockDisplay (dpy);
-+ SyncHandle ();
-+ return 1;
-+ }
-+ *x = rep.x;
-+ *y = rep.y;
-+ UnlockDisplay (dpy);
-+ SyncHandle ();
-+ return 0;
-+}
-+
-Index: XCalibrate/xcalibrate.h
-===================================================================
---- XCalibrate.orig/xcalibrate.h 2007-06-30 14:16:16.000000000 +0100
-+++ XCalibrate/xcalibrate.h 2007-06-30 14:16:38.000000000 +0100
-@@ -43,4 +43,6 @@ Status XCalibrateQueryVersion (Display *
-
- Status XCalibrateSetRawMode (Display *dpy, Bool enable);
-
-+Status XCalibrateScreenToCoord (Display *dpy, int *x, int *y);
-+
- #endif
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
index 99f11e40fd..24b4a1f067 100644
--- a/packages/xorg-lib/libxcalibrate_git.bb
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -3,11 +3,9 @@ require xorg-lib-common.inc
DESCRIPTION = " Touchscreen calibration client library"
LICENSE = "BSD-X"
DEPENDS = "virtual/libx11 calibrateproto libxext"
-PV = "0.0+git${SRCDATE}"
-PR = "r2"
+PV = "0.0+git${SRCREV}"
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62 \
- file://coords.patch;patch=1"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
S = "${WORKDIR}/git"