summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-08-09 17:36:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:41 +0100
commita6b26f8a6c3f10514b40f469625c6cfc9affffc4 (patch)
tree76876279ace8a1b87dbf000d926c533b7519d07e /meta/recipes-graphics
parent99d109cdbc1dd3053bbb9f177bb14251745d49f0 (diff)
downloadpoky-a6b26f8a6c3f10514b40f469625c6cfc9affffc4.tar.gz
xinput-calibrator: remove bash dependency
Refresh add-geometry-input-when-calibrating.patch to remove bashism from it. (From OE-Core rev: c0b8e1ff40af05b29780164c860c68da35e7fc32) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch31
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb2
2 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
index 9351331be8..9dc94ae493 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch
@@ -1,33 +1,34 @@
1Upstream-Status: Inappropriate [no longer maintained] 1From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001
2 2From: "Maxin B. John" <maxin.john@intel.com>
3From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001 3Date: Tue, 9 Aug 2016 17:03:31 +0300
4From: Jonathan David <jonathan.david@ni.com>
5Date: Mon, 30 Nov 2015 12:12:20 -0600
6Subject: [PATCH] add geometry input when calibrating 4Subject: [PATCH] add geometry input when calibrating
7 5
8Send monitor geometry to xinput_calibrator when running the script 6Send monitor geometry to xinput_calibrator when running the script
7Update:
8 Remove bashism
9
10Upstream-Status: Inappropriate [no longer maintained]
9 11
10Signed-off-by: Jonathan David <jonathan.david@ni.com> 12Signed-off-by: Jonathan David <jonathan.david@ni.com>
13Signed-off-by: Maxin B. John <maxin.john@intel.com>
11--- 14---
12 scripts/xinput_calibrator_pointercal.sh | 5 ++++- 15 scripts/xinput_calibrator_pointercal.sh | 3 ++-
13 1 file changed, 4 insertions(+), 1 deletion(-) 16 1 file changed, 2 insertions(+), 1 deletion(-)
14 17
15diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh 18diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh
16index 0ada7da..6a3aded 100755 19index fccb197..fea7c2f 100755
17--- a/scripts/xinput_calibrator_pointercal.sh 20--- a/scripts/xinput_calibrator_pointercal.sh
18+++ b/scripts/xinput_calibrator_pointercal.sh 21+++ b/scripts/xinput_calibrator_pointercal.sh
19@@ -37,7 +37,10 @@ done 22@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then
20 23 fi
21 [ "$USER" != "root" ] && CALFILE=$USER_CALFILE 24 fi
22 25
23-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` 26-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
24+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \ 27+RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
25+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }')
26+
27+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` 28+CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'`
28 if [ ! -z "$CALDATA" ] ; then 29 if [ ! -z "$CALDATA" ] ; then
29 echo $CALDATA > $CALFILE 30 echo $CALDATA > $CALFILE
30 echo "Calibration data stored in $CALFILE (log in $LOGFILE)" 31 echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
31-- 32--
321.9.1 332.4.0
33 34
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 98ce7eec6a..57c3a7a9a6 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -34,5 +34,5 @@ do_install_append() {
34} 34}
35 35
36FILES_${PN} += "${sysconfdir}/xdg/autostart" 36FILES_${PN} += "${sysconfdir}/xdg/autostart"
37RDEPENDS_${PN} = "xinput formfactor xrandr bash" 37RDEPENDS_${PN} = "xinput formfactor xrandr"
38RRECOMMENDS_${PN} = "pointercal-xinput" 38RRECOMMENDS_${PN} = "pointercal-xinput"