summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-02-11 21:11:02 +0000
committerRoss Burton <ross@openedhand.com>2008-02-11 21:11:02 +0000
commitde8dfb8bbad0af17b796e64d51ca48e661fa6856 (patch)
treed01d2b1d423f7bbe658c8f832efd198e7ccfd552 /meta/packages
parentd7753c6d471561cd20ee99ff8445b3c0adb90d6a (diff)
downloadopenembedded-core-de8dfb8bbad0af17b796e64d51ca48e661fa6856.tar.gz
openembedded-core-de8dfb8bbad0af17b796e64d51ca48e661fa6856.tar.bz2
openembedded-core-de8dfb8bbad0af17b796e64d51ca48e661fa6856.tar.xz
openembedded-core-de8dfb8bbad0af17b796e64d51ca48e661fa6856.zip
libxcalibrate: fix package versions, and update to latest git which has our patches merged
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3764 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xorg-lib/libxcalibrate/coords.patch50
-rw-r--r--meta/packages/xorg-lib/libxcalibrate_git.bb4
2 files changed, 1 insertions, 53 deletions
diff --git a/meta/packages/xorg-lib/libxcalibrate/coords.patch b/meta/packages/xorg-lib/libxcalibrate/coords.patch
deleted file mode 100644
index 19cf1639f..000000000
--- a/meta/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/meta/packages/xorg-lib/libxcalibrate_git.bb b/meta/packages/xorg-lib/libxcalibrate_git.bb
index 7ddc831d3..24b4a1f06 100644
--- a/meta/packages/xorg-lib/libxcalibrate_git.bb
+++ b/meta/packages/xorg-lib/libxcalibrate_git.bb
@@ -4,10 +4,8 @@ DESCRIPTION = " Touchscreen calibration client library"
LICENSE = "BSD-X"
DEPENDS = "virtual/libx11 calibrateproto libxext"
PV = "0.0+git${SRCREV}"
-PR = "r3"
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=${SRCREV} \
- file://coords.patch;patch=1"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
S = "${WORKDIR}/git"