aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-25 09:24:29 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 15:27:59 +0200
commitfa32ebe81050abf55f73f8431f6529362f3080d7 (patch)
tree5c1d107272cf4625092dd2666e7071ba69afce6e
parentea69e240f8e91a3583c7a996412e5c8ca5bc7375 (diff)
downloadopenembedded-fa32ebe81050abf55f73f8431f6529362f3080d7.zip
openembedded-fa32ebe81050abf55f73f8431f6529362f3080d7.tar.gz
openembedded-fa32ebe81050abf55f73f8431f6529362f3080d7.tar.bz2
xserver-common: use only xinput_calibrator for calibration (used only for SHR)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch24
-rw-r--r--recipes/xserver-common/xserver-common_1.33.bb2
2 files changed, 2 insertions, 24 deletions
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
index 0409a1f..e23bbf0 100644
--- a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
+++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
@@ -2,31 +2,9 @@ Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator
===================================================================
--- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
+++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,12 @@
+#!/bin/sh
+
-+SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
-+
-+if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
-+ # moved in 2.6.31
-+ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/s3c2410-ts/calibration
-+fi
-+
-+if [ ! -d $SYSFS_CALIBRATION_DIR ]; then
-+ # moved in 2.6.32
-+ SYSFS_CALIBRATION_DIR=/sys/devices/platform/s3c2440-i2c/i2c-0/0-0073/s3c2410-ts/calibration
-+fi
-+
-+if [ -d $SYSFS_CALIBRATION_DIR ]; then
-+ echo 0 > $SYSFS_CALIBRATION_DIR/0
-+ echo 80000 > $SYSFS_CALIBRATION_DIR/1
-+ echo -8000000 > $SYSFS_CALIBRATION_DIR/2
-+ echo -81000 > $SYSFS_CALIBRATION_DIR/3
-+ echo 0 > $SYSFS_CALIBRATION_DIR/4
-+ echo 75000000 > $SYSFS_CALIBRATION_DIR/5
-+ echo 65536 > $SYSFS_CALIBRATION_DIR/6
-+fi
-+
+if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+ if [ -e /etc/pointercal.xinput ] ; then
+ if [ -e /usr/bin/fsoraw ] ; then
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index f1fcfc3..470bc4c 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r2"
+PR = "r3"
PACKAGE_ARCH = "all"
DEFAULT_PREFERENCE = "-1"