diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-28 14:14:09 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-28 15:49:59 +0100 |
commit | dd44dc50adaaafd269fab18b09fa6d8b8f7a1759 (patch) | |
tree | f50612d206d0d6d953ea059ade57041cf02ee0f5 /meta-oe/recipes-graphics | |
parent | 11ab6e41b1131ea489e69c868ba2767201d39f93 (diff) | |
download | meta-openembedded-dd44dc50adaaafd269fab18b09fa6d8b8f7a1759.tar.gz |
xinput-calibrator 0.7.5: fix calibration script
The 'auto' format switched to 'xorg.conf.d' which broke the script. The pointercal package also installed an 'empty' pointercal by default, which also broke the script. Fix these 2 in one go.
Also remove the hal script since hal isn't supported in the oe-core universe anymore
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics')
2 files changed, 59 insertions, 3 deletions
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch new file mode 100644 index 000000000..8e6d9498e --- /dev/null +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From e73eb2c343006865ff3faf7777ab93ccfd1762d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 28 Feb 2012 14:09:08 +0100 | ||
4 | Subject: [PATCH] xinput_calibrator_pointercal.sh: specify output type since 'auto' doesn't always pick 'xinput' | ||
5 | |||
6 | Also deal with pointercal files that contain '# replace with valid machine specific pointercal.xinput' | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | |||
11 | Upstream-status: Submitted | ||
12 | |||
13 | scripts/xinput_calibrator_pointercal.sh | 22 +++++++++++++++------- | ||
14 | 1 files changed, 15 insertions(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh | ||
17 | index 579509c..fccb197 100755 | ||
18 | --- a/scripts/xinput_calibrator_pointercal.sh | ||
19 | +++ b/scripts/xinput_calibrator_pointercal.sh | ||
20 | @@ -6,18 +6,26 @@ | ||
21 | # | ||
22 | # original script: Martin Jansa <Martin.Jansa@gmail.com>, 2010-01-31 | ||
23 | # updated by Tias Guns <tias@ulyssis.org>, 2010-02-15 | ||
24 | +# updated by Koen Kooi <koen@dominion.thruhere.net>, 2012-02-28 | ||
25 | + | ||
26 | +PATH="/usr/bin:$PATH" | ||
27 | |||
28 | BINARY="xinput_calibrator" | ||
29 | CALFILE="/etc/pointercal.xinput" | ||
30 | LOGFILE="/var/log/xinput_calibrator.pointercal.log" | ||
31 | |||
32 | if [ -e $CALFILE ] ; then | ||
33 | - echo "Using calibration data stored in $CALFILE" | ||
34 | - . $CALFILE | ||
35 | -else | ||
36 | - CALDATA=`$BINARY -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` | ||
37 | - if [ ! -z "$CALDATA" ] ; then | ||
38 | - echo $CALDATA > $CALFILE | ||
39 | - echo "Calibration data stored in $CALFILE (log in $LOGFILE)" | ||
40 | + if grep replace $CALFILE ; then | ||
41 | + echo "Empty calibration file found, removing it" | ||
42 | + rm $CALFILE | ||
43 | + else | ||
44 | + echo "Using calibration data stored in $CALFILE" | ||
45 | + . $CALFILE && exit 0 | ||
46 | fi | ||
47 | fi | ||
48 | + | ||
49 | +CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` | ||
50 | +if [ ! -z "$CALDATA" ] ; then | ||
51 | + echo $CALDATA > $CALFILE | ||
52 | + echo "Calibration data stored in $CALFILE (log in $LOGFILE)" | ||
53 | +fi | ||
54 | -- | ||
55 | 1.7.2.5 | ||
56 | |||
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb index f0e85cfd8..e39cc44b5 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb | |||
@@ -4,11 +4,12 @@ LICENSE = "MIT-X" | |||
4 | LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" | 4 | LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc" |
5 | DEPENDS = "virtual/libx11 libxi" | 5 | DEPENDS = "virtual/libx11 libxi" |
6 | 6 | ||
7 | PR = "r2" | 7 | PR = "r3" |
8 | 8 | ||
9 | inherit autotools | 9 | inherit autotools |
10 | 10 | ||
11 | SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz" | 11 | SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \ |
12 | file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch" | ||
12 | SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" | 13 | SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa" |
13 | SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" | 14 | SRC_URI[sha256sum] = "baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971" |
14 | 15 | ||
@@ -20,7 +21,6 @@ EXTRA_OECONF += "--with-gui=x11" | |||
20 | do_install_append() { | 21 | do_install_append() { |
21 | install -d ${D}${bindir} | 22 | install -d ${D}${bindir} |
22 | install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | 23 | install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh |
23 | install -m 0755 scripts/xinput_calibrator_get_hal_calibration.sh ${D}${bindir}/xinput_calibrator_get_hal_calibration.sh | ||
24 | } | 24 | } |
25 | 25 | ||
26 | RDEPENDS_${PN} = "xinput" | 26 | RDEPENDS_${PN} = "xinput" |