[oe] [PATCH] xf86-input-evtouch: make calibration work

[Petr Štetiar]

- add missing dependency on xinit
- add init.d script for hal settings
- calibrate.sh: don't use invoke-rc.d and bash
- ev_calibrate: fix font

Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .../xf86-input-evtouch/fix-calibrate-sh.path       |   19 +++++++++++++++++++
 .../xorg-driver/xf86-input-evtouch/fix-font.patch  |   13 +++++++++++++
 recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb    |   14 +++++++++++++-
 3 files changed, 45 insertions(+), 1 deletions(-)
 create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fix-calibrate-sh.path
 create mode 100644 recipes/xorg-driver/xf86-input-evtouch/fix-font.patch

diff --git a/recipes/xorg-driver/xf86-input-evtouch/fix-calibrate-sh.path b/recipes/xorg-driver/xf86-input-evtouch/fix-calibrate-sh.path
new file mode 100644
index 0000000..862f124
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-evtouch/fix-calibrate-sh.path
@@ -0,0 +1,19 @@
+Index: xf86-input-evtouch-0.8.8/calibrate.sh
+===================================================================
+--- xf86-input-evtouch-0.8.8.orig/calibrate.sh	2009-11-29 13:21:17.000000000 +0100
++++ xf86-input-evtouch-0.8.8/calibrate.sh	2009-11-29 13:21:52.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ XINIT=`which xinit`
+ XSERVER=`which X`
+ EVCALIBRATE=`which ev_calibrate || echo ./ev_calibrate`
+@@ -87,7 +87,7 @@
+ 
+ hal-set-property --remove --udi $UDI --key input.x11_options.calibrate
+ 
+-invoke-rc.d --quiet xserver-xorg-input-evtouch start
++/etc/init.d/xserver-xorg-input-evtouch start
+ 
+ rm /tmp/ev_calibrate
+ 
diff --git a/recipes/xorg-driver/xf86-input-evtouch/fix-font.patch b/recipes/xorg-driver/xf86-input-evtouch/fix-font.patch
new file mode 100644
index 0000000..f977917
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-evtouch/fix-font.patch
@@ -0,0 +1,13 @@
+Index: xf86-input-evtouch-0.8.8/ev_calibrate.c
+===================================================================
+--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c	2009-11-29 00:29:42.000000000 +0100
++++ xf86-input-evtouch-0.8.8/ev_calibrate.c	2009-11-29 01:12:03.000000000 +0100
+@@ -198,7 +198,7 @@
+         Pixmap cursor_pic;
+         XColor cursor_fg, cursor_bg;
+         XFontStruct* font_info;
+-        char* font_name = "*freemono*";
++        char* font_name = "*";
+         char str[256];   
+         unsigned int cursor_width, cursor_height;
+         int hotspot_x, hotspot_y;
diff --git a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
index 2b016e2..0125c41 100644
--- a/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
+++ b/recipes/xorg-driver/xf86-input-evtouch_0.8.8.bb
@@ -1,24 +1,36 @@
 require xorg-driver-input.inc
 
-PR = "r11"
+PR = "r12"
 
 DESCRIPTION = "X.Org X server -- evtouch input driver"
 
+RDEPENDS += "xinit"
+
 SRC_URI = "http://www.conan.de/touchscreen/xf86-input-evtouch-${PV}.tar.bz2 \
            file://xf86-input-evtouch_0.8.8-0ubuntu6.diff;patch=1 \
            file://20_fix_calibrate_submission_directions.patch;patch=1 \
            file://21_more_calibration_fixups.patch;patch=1 \
            file://fdi/*.fdi \
            file://udev-ett-tc5uh.patch;patch=1 \
+           file://fix-calibrate-sh.path;patch=1 \
+           file://fix-font.patch;patch=1 \
 "
 
 EXTRA_OECONF = "--enable-evcalibrate \
                 --enable-udevinstall \
 "
 
+do_configure () {
+	CURSORDIR=${datadir}/${PN} oe_runconf
+}
+
 do_install_append() {
 	install -d ${D}${datadir}/hal/fdi/policy/20thirdparty
 	cp ${WORKDIR}/fdi/*.fdi ${D}${datadir}/hal/fdi/policy/20thirdparty
+	install -d ${D}${sysconfdir}/evtouch
+	install -d ${D}${sysconfdir}/rcS.d
+	install -c -D -m 755 ${S}/debian/xserver-xorg-input-evtouch.init ${D}${sysconfdir}/init.d/xserver-xorg-input-evtouch
+	ln -sf ../init.d/xserver-xorg-input-evtouch ${D}${sysconfdir}/rcS.d/S99xserver-xorg-input-evtouch
 }
 
 FILES_${PN} += "${datadir}/hal"
-- 
1.6.0.4