diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-07-28 11:26:58 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-28 11:26:58 +0200 |
| commit | 1d5ab38e312a724337e438098cd8ec960f1758d8 (patch) | |
| tree | bc438b4c2b513b62108de0e1617fc49b56312f9d /recipes/xserver-common | |
| parent | 7af11a2eff9daeb53807e85e9df6d9d964496d23 (diff) | |
xserver-common: run tslib-calibrate for angstrom instead of xtscal (patch from gumstix)
Diffstat (limited to 'recipes/xserver-common')
| -rw-r--r-- | recipes/xserver-common/files/xtscal-fix.patch | 16 | ||||
| -rw-r--r-- | recipes/xserver-common/xserver-common_1.25.bb | 5 |
2 files changed, 20 insertions, 1 deletions
diff --git a/recipes/xserver-common/files/xtscal-fix.patch b/recipes/xserver-common/files/xtscal-fix.patch new file mode 100644 index 0000000000..eca9276be0 --- /dev/null +++ b/recipes/xserver-common/files/xtscal-fix.patch @@ -0,0 +1,16 @@ +--- xserver-common-1.22/run-calibrate.sh-orig 2007-07-12 11:21:28.000000000 -0700 ++++ xserver-common-1.22/run-calibrate.sh 2009-02-18 06:42:00.000000000 -0800 +@@ -1,12 +1,8 @@ + #! /bin/sh + +-if [ -x /usr/bin/xtscal ]; then +- exec /usr/bin/xtscal +-else ++if [ -e /dev/input/touchscreen0 ]; then + if [ -x /usr/bin/ts_calibrate ]; then + exec /usr/bin/ts_calibrate + fi + fi + +-exec xtscal +- diff --git a/recipes/xserver-common/xserver-common_1.25.bb b/recipes/xserver-common/xserver-common_1.25.bb index ac1f758ef4..b55e0e5ce1 100644 --- a/recipes/xserver-common/xserver-common_1.25.bb +++ b/recipes/xserver-common/xserver-common_1.25.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "all" @@ -15,6 +15,9 @@ SRC_URI_append = " file://setDPI.sh \ file://ts-handling-cleanup.diff;patch=1 \ " +SRC_URI_append_angstrom = " file://xtscal-fix.patch;patch=1 " +RDEPENDS_append_angstrom = " tslib-calibrate " + do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xsession.d/89xdgautostart" |