aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-25 09:24:36 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 15:28:08 +0200
commit7ce6d567e484fcfe5cfb6a16d28e37d013e2d717 (patch)
tree5204861323d559668adbc918d59c1dd10bd7a082
parentfa32ebe81050abf55f73f8431f6529362f3080d7 (diff)
downloadopenembedded-7ce6d567e484fcfe5cfb6a16d28e37d013e2d717.zip
openembedded-7ce6d567e484fcfe5cfb6a16d28e37d013e2d717.tar.gz
openembedded-7ce6d567e484fcfe5cfb6a16d28e37d013e2d717.tar.bz2
xinput-calibrator: add pointercal.xinput data for om-gta02 and install it by default
* is there someone else then SHR using xinput_calibrator_once.sh in Xsession.d? Then you should provide valid pointercal.xinput for your devices. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/xinput-calibrator/files/om-gta02/pointercal.xinput2
-rw-r--r--recipes/xinput-calibrator/files/pointercal.xinput1
-rw-r--r--recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb6
-rw-r--r--recipes/xinput-calibrator/xinput-calibrator_git.bb1
4 files changed, 9 insertions, 1 deletions
diff --git a/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput b/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
new file mode 100644
index 0000000..be25da3
--- /dev/null
+++ b/recipes/xinput-calibrator/files/om-gta02/pointercal.xinput
@@ -0,0 +1,2 @@
+xinput set-int-prop "Touchscreen" "Evdev Axis Calibration" 32 107 918 911 98
+xinput set-int-prop "Touchscreen" "Evdev Axes Swap" 8 1
diff --git a/recipes/xinput-calibrator/files/pointercal.xinput b/recipes/xinput-calibrator/files/pointercal.xinput
new file mode 100644
index 0000000..9633fc5
--- /dev/null
+++ b/recipes/xinput-calibrator/files/pointercal.xinput
@@ -0,0 +1 @@
+# replace with valid machine specific pointercal.xinput
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
index be03b32..8d0f245 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.6.1.bb
@@ -1,16 +1,22 @@
require xinput-calibrator.inc
SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+ file://pointercal.xinput \
"
SRCREV = "d2ce98b3f638667dd64b6d718721379b2dc750a7"
+PR = "r1"
S = "${WORKDIR}/git/"
do_install_append() {
install -d ${D}${bindir}
install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/pointercal.xinput ${D}${sysconfdir}/pointercal.xinput
ln -s ${bindir}/xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
install -d ${D}${datadir}/applications/
install -m 0755 scripts/xinput_calibrator.desktop ${D}${datadir}/applications/xinput-calibrator.desktop
install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh
}
+
+CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/recipes/xinput-calibrator/xinput-calibrator_git.bb b/recipes/xinput-calibrator/xinput-calibrator_git.bb
index 13c6a46..5fceed1 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_git.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_git.bb
@@ -17,4 +17,3 @@ do_install_append() {
# remove this after misclick branch is well-tested and merged to master
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_shr = "1"