From 352901fdc41aef00e63802f72907343306f985ae Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Sat, 13 Mar 2010 20:00:10 +0100
Subject: [PATCH] xf86-input-evdev: - add HAL support

---
 .../xf86-input-evdev/config/00-evdev.conf     | 39 -------------------
 .../xf86-input-evdev/config/10-x11-evdev.fdi  | 18 +++++++++
 packages/x11/driver/xf86-input-evdev/install  |  7 ++--
 3 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-input-evdev/config/00-evdev.conf
 create mode 100644 packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi

diff --git a/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf b/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf
deleted file mode 100644
index 877aa4ac5e..0000000000
--- a/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Catchall classes for input devices
-# We don't simply match on any device since that also adds accelerometers
-# and other devices that we don't really want to use. The list below
-# matches everything but joysticks.
-
-Section "InputClass"
-        Identifier "evdev pointer catchall"
-        MatchIsPointer "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev keyboard catchall"
-        MatchIsKeyboard "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchpad catchall"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev tablet catchall"
-        MatchIsTablet "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
-
-Section "InputClass"
-        Identifier "evdev touchscreen catchall"
-        MatchIsTouchscreen "on"
-        MatchDevicePath "/dev/input/event*"
-        Driver "evdev"
-EndSection
diff --git a/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi b/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi
new file mode 100644
index 0000000000..a7fe8ccb42
--- /dev/null
+++ b/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.mouse">
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="Linux">
+        <merge key="input.x11_driver" type="string">evdev</merge>
+      </match>
+    </match>
+
+    <match key="info.capabilities" contains="input.keys">
+      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
+             string="Linux">
+        <merge key="input.x11_driver" type="string">evdev</merge>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install
index f1717ff219..6458108fee 100755
--- a/packages/x11/driver/xf86-input-evdev/install
+++ b/packages/x11/driver/xf86-input-evdev/install
@@ -5,7 +5,8 @@
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/input
-  cp -PR $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
+cp $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
 
-mkdir -p $INSTALL/etc/X11/xorg.conf.d
-  cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
+mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty
+cp $PKG_DIR/config/10-x11-evdev.fdi \
+   $INSTALL/usr/share/hal/fdi/policy/20thirdparty