diff options
| author | anholt <anholt@FreeBSD.org> | 2002-08-05 07:33:22 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-08-05 07:33:22 +0000 |
| commit | 288ce7be03e4db399d8b793aa580acbf55633324 (patch) | |
| tree | 6fe3dcc3787303dfb6bf9bfd3dc9475e7821a802 | |
| parent | 7c8a5a0b415a8bad96cd3d363086cfad3ffbac7d (diff) | |
| download | FreeBSD-ports-288ce7be03e4db399d8b793aa580acbf55633324.zip FreeBSD-ports-288ce7be03e4db399d8b793aa580acbf55633324.tar.gz | |
Add patches for last commit (fixing scrollwheel on -current, and enabling
SYSVIPC to aid nv binary drivers)
Approved by: mdodd
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-mouse.c | 11 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-sysvipc | 34 |
2 files changed, 45 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-mouse.c b/x11/XFree86-4-libraries/files/patch-mouse.c new file mode 100644 index 0000000..321c169 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-mouse.c @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Wed Dec 19 08:05:22 2001 ++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Aug 2 15:35:01 2002 +@@ -1505,7 +1505,7 @@ + dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); + /* FreeBSD sysmouse sends additional data bytes */ + if (pMse->protoPara[4] >= 8) { +- dz = ((char)(pBuf[5] << 1) + (char)(pBuf[6] << 1)) / 2; ++ dz = ((signed char)(pBuf[5] << 1) + (signed char)(pBuf[6] << 1)) >> 1; + buttons |= (int)(~pBuf[7] & 0x07) << 3; + } + break; diff --git a/x11/XFree86-4-libraries/files/patch-sysvipc b/x11/XFree86-4-libraries/files/patch-sysvipc new file mode 100644 index 0000000..22bc4ed --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-sysvipc @@ -0,0 +1,34 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig Fri Aug 2 00:27:08 2002 ++++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Fri Aug 2 00:28:25 2002 +@@ -62,6 +62,10 @@ + MTRRDEFINES = -DHAS_MTRR_BUILTIN + #endif + ++#if defined(FreeBSDArchitecture) ++SYSVIPCDEFINES = -DHAVE_SYSV_IPC ++#endif ++ + #if UsbMouseSupport + USBMOUSEDEFINES1 = -DUSBMOUSE_SUPPORT + #if !HasLibUsb +@@ -142,7 +146,7 @@ + #endif + + DEFINES = $(CONSDEFINES) $(APDEFINES) $(IOPERMDEFINES) $(RESDEFINES) \ +- $(MTRRDEFINES) $(USBMOUSEDEFINES) ++ $(MTRRDEFINES) $(USBMOUSEDEFINES) $(SYSVIPCDEFINES) + + #if defined(AlphaArchitecture) + SpecialObjectRule(bsd_ev56.o, bsd_ev56.c, -mcpu=ev56) +--- programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c.orig Fri Aug 2 00:25:26 2002 ++++ programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fri Aug 2 00:25:48 2002 +@@ -1879,7 +1879,9 @@ + + if (xf86shmflg & XF86SHM_RDONLY) shmflg |= SHM_RDONLY; + if (xf86shmflg & XF86SHM_RND) shmflg |= SHM_RND; ++#ifdef SHM_REMAP + if (xf86shmflg & XF86SHM_REMAP) shmflg |= SHM_REMAP; ++#endif + + return shmat(id,addr,shmflg); + } |
