[oe-commits] Martin Jansa : xserver-kdrive-common: use xinput_calibrator_once. sh for SHR in 89xTs_Calibrate

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: cc7402b9b0ff50ce0067a8ae4e8fd5cdf8fafc5e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cc7402b9b0ff50ce0067a8ae4e8fd5cdf8fafc5e

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Jan 31 01:45:08 2010 +0100

xserver-kdrive-common: use xinput_calibrator_once.sh for SHR in 89xTs_Calibrate

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xserver-kdrive-common/shr/89xTs_Calibrate      |   11 +++++++++++
 .../xserver-kdrive-common_0.1.bb                   |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
index e42e79c..07d2d08 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
@@ -3,8 +3,19 @@
 while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
 do
    /usr/bin/xtscal
+   exit
 done
 
+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+    if [ -e /usr/bin/fsoraw ] ; then
+      # because ts tap to unblank will be used as first calibration click and then store invalid calibration
+      fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
+    else
+      /usr/bin/xinput_calibrator_once.sh
+    fi
+    exit
+fi
+
 SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
 
 if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 5d5fa74..79757ab 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r39"
+PR = "r40"
 
 SRC_URI = "\
   file://Xdefaults \