diff options
| author | Maxin B. John <maxin.john@intel.com> | 2016-08-09 17:36:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:32:18 +0100 |
| commit | c0b8e1ff40af05b29780164c860c68da35e7fc32 (patch) | |
| tree | 61fa974b340c351b84d1086447d9af7102cf0ebd /meta/recipes-graphics | |
| parent | 80dfaf40e087b34d6360188df372c1c3805a00bd (diff) | |
| download | openembedded-core-c0b8e1ff40af05b29780164c860c68da35e7fc32.tar.gz openembedded-core-c0b8e1ff40af05b29780164c860c68da35e7fc32.tar.bz2 openembedded-core-c0b8e1ff40af05b29780164c860c68da35e7fc32.zip | |
xinput-calibrator: remove bash dependency
Refresh add-geometry-input-when-calibrating.patch to remove
bashism from it.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 2 |
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 @@ -Upstream-Status: Inappropriate [no longer maintained] - -From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001 -From: Jonathan David <jonathan.david@ni.com> -Date: Mon, 30 Nov 2015 12:12:20 -0600 +From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Tue, 9 Aug 2016 17:03:31 +0300 Subject: [PATCH] add geometry input when calibrating Send monitor geometry to xinput_calibrator when running the script +Update: + Remove bashism + +Upstream-Status: Inappropriate [no longer maintained] Signed-off-by: Jonathan David <jonathan.david@ni.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - scripts/xinput_calibrator_pointercal.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + scripts/xinput_calibrator_pointercal.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index 0ada7da..6a3aded 100755 +index fccb197..fea7c2f 100755 --- a/scripts/xinput_calibrator_pointercal.sh +++ b/scripts/xinput_calibrator_pointercal.sh -@@ -37,7 +37,10 @@ done - - [ "$USER" != "root" ] && CALFILE=$USER_CALFILE +@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then + fi + fi -CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` -+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \ -+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') -+ ++RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') +CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` if [ ! -z "$CALDATA" ] ; then echo $CALDATA > $CALFILE echo "Calibration data stored in $CALFILE (log in $LOGFILE)" -- -1.9.1 +2.4.0 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() { } FILES_${PN} += "${sysconfdir}/xdg/autostart" -RDEPENDS_${PN} = "xinput formfactor xrandr bash" +RDEPENDS_${PN} = "xinput formfactor xrandr" RRECOMMENDS_${PN} = "pointercal-xinput" |