mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

Add patches for last commit (fixing scrollwheel on -current, and enabling

Browse Source 
SYSVIPC to aid nv binary drivers)

Approved by:	mdodd
This commit is contained in:
Eric Anholt 2002-08-05 07:33:22 +00:00
parent 05f2c750e9
commit 6c42faf2e8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=64029
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/XFree86-4-libraries/files/patch-mouse.c Normal file
View File

@ -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;

34
x11/XFree86-4-libraries/files/patch-sysvipc Normal file
View File

@ -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);
}