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
This commit is contained in:
parent
d7753c6d47
commit
de8dfb8bba
|
@ -116,7 +116,8 @@ SRCREV_pn-matchbox-desktop-sato ?= "76"
|
|||
SRCREV_pn-evince ?= "2437"
|
||||
SRCREV_pn-oh-puzzles ?= "22"
|
||||
SRCREV_pn-libowl ?= "354"
|
||||
SRCREV_pn-libxcalibrate ?= "95c1708a48ab470971dc37df31b2733ad1aeb220"
|
||||
SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
|
||||
PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
|
||||
SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
|
||||
PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}"
|
||||
SRCDATE_gtk-theme-torturer ?= "20060821"
|
||||
|
|
|
@ -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
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Reference in New Issue