diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-23 14:42:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-23 18:33:28 +0200 |
commit | 650434097008fbaee4bc9998a4bf27f0857b87a1 (patch) | |
tree | c6e7ea606ac1387ea6d816f32490caafc0f4c828 /recipes/xserver-common | |
parent | 22e3772f799948bf4a7806e74d83948ee2b2e1f4 (diff) |
xserver-common: update 89xTs_Calibrate.xinput_calibrator
* after 5c3846f9bbf1dbb4a9ee1d916107747c2f9dc909 we already know that user won't be forced to provide new calibration, so no need to request Display,CPU resources
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xserver-common')
-rw-r--r-- | recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch | 9 | ||||
-rw-r--r-- | recipes/xserver-common/xserver-common_1.33.bb | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch index e23bbf0347..8f4b4d0adc 100644 --- a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch +++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch @@ -2,16 +2,11 @@ Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator =================================================================== --- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) +++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0) -@@ -0,0 +1,12 @@ +@@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then + if [ -e /etc/pointercal.xinput ] ; then -+ if [ -e /usr/bin/fsoraw ] ; then -+ # because ts tap to unblank will be used as first calibration click and then store invalid calibration -+ fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh -+ else -+ /usr/bin/xinput_calibrator_once.sh -+ fi ++ /usr/bin/xinput_calibrator_once.sh + fi +fi diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb index 71fa2314b8..7486459522 100644 --- a/recipes/xserver-common/xserver-common_1.33.bb +++ b/recipes/xserver-common/xserver-common_1.33.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r5" +PR = "r6" PACKAGE_ARCH = "all" DEFAULT_PREFERENCE = "-1" |