git snapshot evdev, for ABI rebuild

.gitignore

@@ -11,3 +11,4 @@ xf86-input-evdev-20100823.tar.bz2
 /xf86-input-evdev-20120103.tar.bz2
 /xf86-input-evdev-20120118.tar.bz2
 /xf86-input-evdev-2.7.0.tar.bz2
+/xf86-input-evdev-20120718.tar.bz2

0001-Allow-relative-scroll-valuators-on-absolute-devices.patch

@@ -1,24 +1,7 @@
-From 2a21c2e35299c0438cea9d24e6754287e03aa0b6 Mon Sep 17 00:00:00 2001
+diff -up xf86-input-evdev-20120718/src/evdev.c.relscroll xf86-input-evdev-20120718/src/evdev.c
-From: Peter Hutterer <peter.hutterer@who-t.net>
+--- xf86-input-evdev-20120718/src/evdev.c.relscroll	2012-07-18 06:18:10.000000000 -0400
-Date: Tue, 27 Mar 2012 12:18:46 +1000
++++ xf86-input-evdev-20120718/src/evdev.c	2012-07-18 06:24:06.951594145 -0400
-Subject: [PATCH] Allow relative scroll valuators on absolute devices
+@@ -706,7 +706,9 @@ EvdevProcessRelativeMotionEvent(InputInf
-
-Special-case RHEL_WHEEL, RHEL_HWHEEL and REL_DIAL to add scroll valuators
-for those axes on top of the absolute axes.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=805902
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/evdev.c |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- src/evdev.h |    3 +-
- 2 files changed, 86 insertions(+), 6 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 8cf630c..90bd455 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -702,7 +702,9 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
  #endif
          default:
              /* Ignore EV_REL events if we never set up for them. */
@@ -29,7 +12,7 @@ index 8cf630c..90bd455 100644
                  return;
  
              /* Handle mouse wheel emulation */
-@@ -711,7 +713,7 @@ EvdevProcessRelativeMotionEvent(InputInfoPtr pInfo, struct input_event *ev)
+@@ -715,7 +717,7 @@ EvdevProcessRelativeMotionEvent(InputInf
  
              pEvdev->rel_queued = 1;
              pEvdev->delta[ev->code] += value;
@@ -38,7 +21,7 @@ index 8cf630c..90bd455 100644
              valuator_mask_set(pEvdev->vals, map, value);
              break;
      }
-@@ -1234,7 +1236,7 @@ is_blacklisted_axis(int axis)
+@@ -1239,7 +1241,7 @@ is_blacklisted_axis(int axis)
  
  
  static int
@@ -47,7 +30,7 @@ index 8cf630c..90bd455 100644
  {
      InputInfoPtr pInfo;
      EvdevPtr pEvdev;
-@@ -1282,6 +1284,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+@@ -1287,6 +1289,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
          }
      }
  #endif
@@ -68,7 +51,7 @@ index 8cf630c..90bd455 100644
      if (num_axes + num_mt_axes > MAX_VALUATORS) {
          xf86IDrvMsg(pInfo, X_WARNING, "found %d axes, limiting to %d.\n", num_axes, MAX_VALUATORS);
          num_axes = MAX_VALUATORS;
-@@ -1368,6 +1384,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+@@ -1376,6 +1392,20 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
              i++;
      }
  
@@ -89,7 +72,7 @@ index 8cf630c..90bd455 100644
      EvdevInitAxesLabels(pEvdev, Absolute, pEvdev->num_vals + num_mt_axes, atoms);
  
      if (!InitValuatorClassDeviceStruct(device, num_axes + num_mt_axes, atoms,
-@@ -1461,6 +1491,51 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
+@@ -1470,6 +1500,51 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
      }
  #endif
  
@@ -141,7 +124,7 @@ index 8cf630c..90bd455 100644
      free(atoms);
  
      for (i = 0; i < ArrayLength(proximity_bits); i++)
-@@ -1690,12 +1765,16 @@ static void
+@@ -1699,12 +1774,16 @@ static void
  EvdevInitAnyValuators(DeviceIntPtr device, EvdevPtr pEvdev)
  {
      InputInfoPtr pInfo = device->public.devicePrivate;
@@ -159,7 +142,7 @@ index 8cf630c..90bd455 100644
          xf86IDrvMsg(pInfo, X_INFO, "initialized for absolute axes.\n");
  }
  
-@@ -1704,7 +1783,7 @@ EvdevInitAbsValuators(DeviceIntPtr device, EvdevPtr pEvdev)
+@@ -1713,7 +1792,7 @@ EvdevInitAbsValuators(DeviceIntPtr devic
  {
      InputInfoPtr pInfo = device->public.devicePrivate;
  
@@ -168,20 +151,16 @@ index 8cf630c..90bd455 100644
          xf86IDrvMsg(pInfo, X_INFO,"initialized for absolute axes.\n");
      } else {
          xf86IDrvMsg(pInfo, X_ERROR,"failed to initialize for absolute axes.\n");
-diff --git a/src/evdev.h b/src/evdev.h
+diff -up xf86-input-evdev-20120718/src/evdev.h.relscroll xf86-input-evdev-20120718/src/evdev.h
-index 309b215..cca5cbe 100644
+--- xf86-input-evdev-20120718/src/evdev.h.relscroll	2012-07-18 06:18:10.000000000 -0400
---- a/src/evdev.h
++++ xf86-input-evdev-20120718/src/evdev.h	2012-07-18 06:24:32.542274216 -0400
-+++ b/src/evdev.h
+@@ -154,7 +154,8 @@ typedef struct {
-@@ -153,7 +153,8 @@ typedef struct {
-     int grabDevice;         /* grab the event device? */
  
      int num_vals;           /* number of valuators */
+     int num_mt_vals;        /* number of multitouch valuators */
 -    int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev <axis> to index */
 +    int axis_map[ABS_CNT + REL_CNT]; /* Map evdev <axis> to index */
 +    int rel_offset;         /* offset for relative axes in absolute device */
      ValuatorMask *vals;     /* new values coming in */
      ValuatorMask *old_vals; /* old values for calculating relative motion */
      ValuatorMask *prox;     /* last values set while not in proximity */
--- 
-1.7.7.6
-

commitid

@@ -1 +1 @@
-9d9c9870c88f2c636799a68cde8efcab59a4a2a5
+f5ede98085688b59dc56a9cc6592f75552a4e7ed

sources

@@ -1 +1 @@
-4449b2e94900e98d2f41c2f46dd0397e  xf86-input-evdev-2.7.0.tar.bz2
+137f66fa002c88db17f02f9a8d1dd0f2  xf86-input-evdev-20120718.tar.bz2

xorg-x11-drv-evdev.spec

@@ -2,13 +2,13 @@
 %global moduledir %(pkg-config xorg-server --variable=moduledir )
 %global driverdir %{moduledir}/input
 
-#global gitdate 20120118
+%global gitdate 20120718
-#global gitversion 9d9c9870c
+%global gitversion f5ede9808
 
 Summary:    Xorg X11 evdev input driver
 Name:       xorg-x11-drv-evdev
 Version:    2.7.0
-Release:    4%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release:    5%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:        http://www.x.org
 License:    MIT
 Group:      User Interface/X Hardware Support
@@ -21,7 +21,6 @@ Source2:    commitid
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 %endif
 
-Patch01: 0001-Fix-inverted-horizontal-scroll-46205.patch
 # Bug 805902 - Scrollwheels on tablets are broken
 Patch02: 0001-Allow-relative-scroll-valuators-on-absolute-devices.patch
 # Don't leak mtdev data
@@ -44,8 +43,7 @@ X.Org X11 evdev input driver.
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch01 -p1
+%patch02 -p1 -b .relscroll
-%patch02 -p1
 
 %build
 autoreconf -v --install || exit 1
@@ -87,6 +85,9 @@ X.Org X11 evdev input driver development files.
 
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied@redhat.com> 2.7.0-5.20120718gitf5ede9808
+- git snapshot evdev, for ABI rebuild
+
 * Wed Jul 04 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.7.0-4
 - Don't leak mtdev data