From 2640ec67728a78acdda7c0b8d5ce477646fbdd05 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 4 Aug 2011 20:08:29 -0500
Subject: xf86-input-evdev: Bump to latest.

---
 abs/core/xf86-input-evdev/PKGBUILD                 | 18 ++++---
 .../xf86-input-evdev/initialize-valuators.patch    | 61 ----------------------
 2 files changed, 11 insertions(+), 68 deletions(-)
 delete mode 100644 abs/core/xf86-input-evdev/initialize-valuators.patch

diff --git a/abs/core/xf86-input-evdev/PKGBUILD b/abs/core/xf86-input-evdev/PKGBUILD
index 55c7faa..2bc3d6b 100644
--- a/abs/core/xf86-input-evdev/PKGBUILD
+++ b/abs/core/xf86-input-evdev/PKGBUILD
@@ -1,27 +1,31 @@
-# $Id: PKGBUILD 88543 2010-08-24 08:25:22Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
 pkgver=2.6.0
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org evdev input driver"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.9.0')
-options=('!libtool' !makeflags)
-groups=('xorg-input-drivers')
+conflicts=('xorg-server<1.10.0')
+options=('!libtool' '!makeflags')
+groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('f33fe9413bde68936d8909206a13e8a1')
diff --git a/abs/core/xf86-input-evdev/initialize-valuators.patch b/abs/core/xf86-input-evdev/initialize-valuators.patch
deleted file mode 100644
index 47b02db..0000000
--- a/abs/core/xf86-input-evdev/initialize-valuators.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ed47c7f33e315f163a6aebeb3e1c8947004576fd Mon Sep 17 00:00:00 2001
-From: Bartosz Brachaczek <b.brachaczek@gmail.com>
-Date: Tue, 10 Aug 2010 20:31:00 +0000
-Subject: evdev: Revert "Set all valuators for relative motion events (#24737)"
-
-It isn't necessary to post zero-deltas to X Server. In order not to post
-uninitialized "v" array we should rather simply initialize it.
-
-This reverts commit c1f16a4f59a584ab4546c2f16e20b06703042057.
-
-Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
-Tested-by: Bartek Iwaniec <hash87@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/evdev.c b/src/evdev.c
-index 5ea230c..bdac330 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -386,7 +386,7 @@ EvdevProcessValuators(InputInfoPtr pInfo, int v[MAX_VALUATORS], int *num_v,
-         for (i = 0; i < REL_CNT; i++)
-         {
-             int map = pEvdev->axis_map[i];
--            if (map != -1)
-+            if (pEvdev->delta[i] && map != -1)
-             {
-                 v[map] = pEvdev->delta[i];
-                 if (map < first)
---
-cgit v0.8.3-6-g21f6
-From ec6cb31cc47eed3ccba4c906ca6c54b99136e9eb Mon Sep 17 00:00:00 2001
-From: Bartosz Brachaczek <b.brachaczek@gmail.com>
-Date: Tue, 10 Aug 2010 20:31:37 +0000
-Subject: evdev: Initialize valuators array. (#24737)
-
-The array needs to be filled with zeros, otherwise we may end up sending
-it with random values if non-zero values aren't in one row (which is the
-case for A4Tech X-750F which sends REL_MISC events without a reason).
-
-X.Org Bug 24737 <http://bugs.freedesktop.org/show_bug.cgi?id=24737>
-
-Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
-Tested-by: Bartek Iwaniec <hash87@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/evdev.c b/src/evdev.c
-index bdac330..512e957 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -661,7 +661,7 @@ static void
- EvdevProcessSyncEvent(InputInfoPtr pInfo, struct input_event *ev)
- {
-     int num_v = 0, first_v = 0;
--    int v[MAX_VALUATORS];
-+    int v[MAX_VALUATORS] = {};
-     EvdevPtr pEvdev = pInfo->private;
- 
-     EvdevProcessValuators(pInfo, v, &num_v, &first_v);
---
-cgit v0.8.3-6-g21f6
-- 
cgit v0.12

