xserver-common: run tslib-calibrate for angstrom instead of xtscal (patch from gumstix)

diff --git a/recipes/xserver-common/files/xtscal-fix.patch b/recipes/xserver-common/files/xtscal-fix.patch
new file mode 100644 (file)
index 0000000..eca9276
--- /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 ac1f758..b55e0e5 100644 (file)
--- 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"