Revive patch-bc (updated) and patch-bl. The former gets the correct

readdir and getpwuid handling for DragonFly, avoids the mouse problems
due to use of floating point math in a signal handler (xorg-server).

3 files changed, 57 insertions, 2 deletions

diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 2a30157c0ba..cf48e29a556 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: distinfo,v 1.28 2006/01/19 00:59:27 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -31,6 +31,7 @@ SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd
 SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151
 SHA1 (patch-av) = 052de5919a40751062a008d6f590872f84284d9f
 SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7
-SHA1 (patch-ax) = fb3f8dcf42bf5fb7fd1eaa3997b84000ce659305
 SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5
 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6
+SHA1 (patch-bc) = b735c3f0cfd5ac161eff941a9878c6840ee45788
+SHA1 (patch-bl) = ccfd290ebffc08b9cd03b7eb83a9671b0e16baec
diff --git a/x11/xorg-libs/patches/patch-bc b/x11/xorg-libs/patches/patch-bc
new file mode 100644
index 00000000000..6543b685f7b
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bc
@@ -0,0 +1,30 @@
+$NetBSD: patch-bc,v 1.5 2006/01/19 00:59:27 joerg Exp $
+
+--- include/Xos_r.h.orig	2005-07-13 07:23:56.000000000 +0000
++++ include/Xos_r.h
+@@ -208,6 +208,9 @@ extern void XtProcessUnlock(
+ # undef _POSIX_THREAD_SAFE_FUNCTIONS
+ #endif
+ 
++#if defined(__DragonFly__)
++#define XNO_MTSAFE_PWDAPI 1
++#endif
+ 
+ /***** <pwd.h> wrappers *****/
+ 
+@@ -655,6 +658,15 @@ extern int _Preaddir_r(DIR *, struct dir
+ # elif defined(SVR4)
+ /* Pre-POSIX API, returns non-NULL on success. */
+ #  define _XReaddir(d,p)	(readdir_r((d), &(p).dir_entry))
++#elif defined(__DragonFly__)
++#  define _XReaddir(d,p)        \
++    ( (_Xos_processLock),                                               \
++      (((p).result = readdir((d))) ?                                    \
++       (memcpy(&((p).dir_entry), (p).result, _DIRENT_MINSIZ((p).result)),     \
++        ((p).result = &(p).dir_entry), 0) :                             \
++       0),                                                              \
++      (_Xos_processUnlock),                                             \
++      (p).result )
+ # else
+ /* We have no idea what is going on.  Fake it all using process locks. */
+ #  define _XReaddir(d,p)	\
diff --git a/x11/xorg-libs/patches/patch-bl b/x11/xorg-libs/patches/patch-bl
new file mode 100644
index 00000000000..74be3e721d1
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bl
@@ -0,0 +1,24 @@
+$NetBSD: patch-bl,v 1.4 2006/01/19 00:59:27 joerg Exp $
+
+--- programs/Xserver/hw/xfree86/common/xf86Xinput.c.orig	2005-05-16 23:20:56.000000000 +0900
++++ programs/Xserver/hw/xfree86/common/xf86Xinput.c	2005-05-16 23:23:25.000000000 +0900
+@@ -932,15 +932,10 @@
+ 		    /* modeled from xf86Events.c */
+ 		    if (device->ptrfeed->ctrl.threshold) {
+ 			if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) {
+-			    local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dxremaind;
+-			    valuator[0] = (int)local->dxremaind;
+-			    local->dxremaind = local->dxremaind - (float)valuator[0];
+-			    
+-			    local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dyremaind;
+-			    valuator[1] = (int)local->dyremaind;
+-			    local->dyremaind = local->dyremaind - (float)valuator[1];
++			    valuator[0] = (dx * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
++			    valuator[1] = (dy * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
+ 			}
+ 		    }
+ 		    else if (dx || dy) {