diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator')
3 files changed, 19 insertions, 16 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput new file mode 100644 index 000000000..a816d6d10 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput @@ -0,0 +1,2 @@ +# Dummy pointercal.xinput file to prevent xinput_calibrator +# from running on qemu startup diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch index 9351331be..9dc94ae49 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch +++ b/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index ac5b70cba..57c3a7a9a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/import-layers/yocto-poky/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" +RDEPENDS_${PN} = "xinput formfactor xrandr" RRECOMMENDS_${PN} = "pointercal-xinput" |