rpms/xorg-x11-drv-evdev/F-10 evdev-2.0.7-fix-testbit.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.36, 1.37

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16566

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-2.0.7-fix-testbit.patch 
Log Message:
* Wed Oct 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.7-3
- evdev-2.0.7-fix-testbit.patch: fix TestBit() on 64 bit arch.



evdev-2.0.7-fix-testbit.patch:

--- NEW FILE evdev-2.0.7-fix-testbit.patch ---
>From 6626ad5cb9a9fab9bd3c3d8a36d8b09b8cb037a0 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Tue, 21 Oct 2008 19:21:21 +0200
Subject: [PATCH] Fix TestBit() on 64bit

Reported by Albert Damen <albrt at gmx.net>
X.Org Bug#18150 <http://bugs.freedesktop.org/show_bug.cgi?id=18150>
(cherry picked from commit f57e8face94c9e6986b35ca2ec231e284b9f58cf)
---
 src/evdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 3d7a76f..d186be0 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -381,7 +381,7 @@ EvdevReadInput(InputInfoPtr pInfo)
     }
 }
 
-#define TestBit(bit, array) (array[(bit) / LONG_BITS]) & (1 << ((bit) % LONG_BITS))
+#define TestBit(bit, array) (array[(bit) / LONG_BITS]) & (1L << ((bit) % LONG_BITS))
 
 static void
 EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
-- 
1.5.4.3



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-10/xorg-x11-drv-evdev.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xorg-x11-drv-evdev.spec	21 Oct 2008 04:12:46 -0000	1.36
+++ xorg-x11-drv-evdev.spec	22 Oct 2008 00:23:34 -0000	1.37
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.0.7
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -23,6 +23,8 @@
 # branch anyway.
 Patch0002:  evdev-2.0.6-dont-grab.patch
 Patch0003:  evdev-2.0.7-store-minmaj.patch
+# Merged upstream, remove with 2.0.8
+Patch0004:  evdev-2.0.7-fix-testbit.patch
 
 ExcludeArch: s390 s390x
 
@@ -43,6 +45,7 @@
 %patch0001 -p1 -b .rules-evdev
 %patch0002 -p1 -b .dont-grab
 %patch0003 -p1 -b .store-minmaj
+%patch0004 -p1 -b .fix-testbit
 
 %build
 autoreconf -v --install || exit 1
@@ -67,6 +70,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Wed Oct 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.7-3
+- evdev-2.0.7-fix-testbit.patch: fix TestBit() on 64 bit arch.
+
 * Tue Oct 21 2008 Peter Hutterer <peter.hutterer at redhat.com> 2.0.7-2
 - evdev-2.0.7-store-minmaj.patch: store minor/major of device node to guard
   against duplicates.