diff options
Diffstat (limited to 'recipes/hal')
| -rw-r--r-- | recipes/hal/files/20hal | 5 | ||||
| -rw-r--r-- | recipes/hal/hal/0001-Add-touchscreen-option.patch | 28 | ||||
| -rw-r--r-- | recipes/hal/hal_0.5.14+git.bb | 26 | ||||
| -rw-r--r-- | recipes/hal/hal_0.5.9.1.bb | 2 | ||||
| -rw-r--r-- | recipes/hal/hal_git.bb | 2 |
5 files changed, 61 insertions, 2 deletions
diff --git a/recipes/hal/files/20hal b/recipes/hal/files/20hal index 926bd893e2..e98cc8ac6e 100644 --- a/recipes/hal/files/20hal +++ b/recipes/hal/files/20hal @@ -11,6 +11,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/hald +CACHEDIR=/var/cache/hald PIDDIR=/var/run/hald PIDFILE=$PIDDIR/pid NAME=hald @@ -26,6 +27,10 @@ do_start() { mkdir -p $PIDDIR chown $DAEMONUSER:$DAEMONUSER $PIDDIR fi + if [ ! -d $CACHEDIR ]; then + mkdir -p $CACHEDIR + chown $DAEMONUSER:$DAEMONUSER $CACHEDIR + fi echo "Starting $DESC" "$NAME" start-stop-daemon --start --pidfile $PIDFILE \ --exec $DAEMON -- $DAEMON_OPTS diff --git a/recipes/hal/hal/0001-Add-touchscreen-option.patch b/recipes/hal/hal/0001-Add-touchscreen-option.patch new file mode 100644 index 0000000000..28c30f5250 --- /dev/null +++ b/recipes/hal/hal/0001-Add-touchscreen-option.patch @@ -0,0 +1,28 @@ +From e2614c85992663c006184141e552f8b6920a9873 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Mon, 25 Jan 2010 10:58:14 +0100 +Subject: [PATCH] Add touchscreen option + +If a device sets the ABS_PRESSURE bit mark it as a touchscreen +--- + hald/linux/device.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/hald/linux/device.c b/hald/linux/device.c +index e7c9d4f..a4ff96f 100644 +--- a/hald/linux/device.c ++++ b/hald/linux/device.c +@@ -1181,6 +1181,10 @@ input_test_abs (HalDevice *d, const char *sysfs_path) + goto out; + } + } ++ if (test_bit (ABS_PRESSURE, bitmask_abs)) { ++ hal_device_add_capability (d, "input.touchscreen"); ++ goto out; ++ } + } + out: + ; +-- +1.6.5 + diff --git a/recipes/hal/hal_0.5.14+git.bb b/recipes/hal/hal_0.5.14+git.bb new file mode 100644 index 0000000000..1e1f10e01a --- /dev/null +++ b/recipes/hal/hal_0.5.14+git.bb @@ -0,0 +1,26 @@ +require hal.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ + file://0001-Add-touchscreen-option.patch;patch=1 \ + file://20hal \ + file://99_hal" + +SRCREV = "6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d" + +PV = "0.5.14" +PR = "r2" +PR_append = "+gitr${SRCREV}" + +S = "${WORKDIR}/git" + +# The following code finds the right linux/input.h, +# which also works with external-toolchain/SDK +do_configure() { + sed -i -e s:1.43:1.41:g ${S}/configure.in + linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \ + grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'` + autotools_do_configure --with-linux-input-header=${linux_input_h} +} diff --git a/recipes/hal/hal_0.5.9.1.bb b/recipes/hal/hal_0.5.9.1.bb index b666446cc2..a8ea38b2d5 100644 --- a/recipes/hal/hal_0.5.9.1.bb +++ b/recipes/hal/hal_0.5.9.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL LGPL AFL" DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat virtual/libusb0" RDEPENDS_${PN} += "udev-utils hal-info" -PR = "r9" +PR = "r10" SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ file://configure_fix.patch;patch=1 \ diff --git a/recipes/hal/hal_git.bb b/recipes/hal/hal_git.bb index 8bd8285613..58f534d3e1 100644 --- a/recipes/hal/hal_git.bb +++ b/recipes/hal/hal_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ file://99_hal" PV = "0.5.9.1+git${SRCDATE}" -PR = "r7" +PR = "r8" S = "${WORKDIR}/git" |