head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.10 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.8 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.6 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.4 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.2 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q1:1.5.0.2 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.4.0.4 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.2 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.1.0.4 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.2 pkgsrc-2007Q1-base:1.1; locks; strict; comment @# @; 1.6 date 2009.06.07.11.23.47; author wiz; state dead; branches; next 1.5; 1.5 date 2009.03.14.11.00.21; author apb; state Exp; branches; next 1.4; 1.4 date 2008.09.18.20.56.01; author bjs; state dead; branches; next 1.3; 1.3 date 2007.08.14.21.34.37; author joerg; state Exp; branches; next 1.2; 1.2 date 2007.08.05.23.30.22; author joerg; state dead; branches; next 1.1; 1.1 date 2007.04.03.20.25.44; author drochner; state Exp; branches; next ; desc @@ 1.6 log @Update to 1.6.1.901, first 1.6.2 prerelease. Lots of changes since last pkgsrc version 1.4.x. Based on patches provided by Hasso Tepper on pkgsrc-users. Enable dri by default. NOTE: You must install new versions of all dependencies, old ones won't work! @ text @$NetBSD: patch-ag,v 1.5 2009/03/14 11:00:21 apb Exp $ Changes from NetBSD xsrc/external/mit/xorg-server/dist/\ hw/xfree86/os-support/bsd/bsd_mouse.c ---------------------------- revision 1.5 date: 2009/02/09 09:49:39; author: plunky; state: Exp; lines: +16 -0 add horizontal mouse-wheel functionality to USB and WSMOUSE drivers ---------------------------- revision 1.4 date: 2009/02/02 03:06:37; author: christos; state: Exp; lines: +7 -11 add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to SetupMouse. ---------------------------- revision 1.3 date: 2009/01/19 00:54:29; author: christos; state: Exp; lines: +2 -1 fix ioctl. ---------------------------- revision 1.2 date: 2009/01/13 18:43:46; author: christos; state: Exp; lines: +25 -0 Set the mouse event protocol version. (untested, but head will be broken unless I add this). ---------------------------- --- hw/xfree86/os-support/bsd/bsd_mouse.c.orig 2009-03-12 19:22:51.000000000 +0200 +++ hw/xfree86/os-support/bsd/bsd_mouse.c @@@@ -55,12 +55,15 @@@@ #define HUP_GENERIC_DESKTOP 0x0001 #define HUP_BUTTON 0x0009 +#define HUP_CONSUMER 0x000c #define HUG_X 0x0030 #define HUG_Y 0x0031 #define HUG_Z 0x0032 #define HUG_WHEEL 0x0038 +#define HUC_AC_PAN 0x0238 + #define HID_USAGE2(p,u) (((p) << 16) | u) /* The UMS mices have middle button as number 3 */ @@@@ -340,6 +343,25 @@@@ } #endif +#if defined(__NetBSD__) + +static Bool +SetupMouse(InputInfoPtr pInfo) +{ +#ifdef WSCONS_SUPPORT +#ifdef WSMOUSEIO_SETVERSION + int version = WSMOUSE_EVENT_VERSION; + if (ioctl(pInfo->fd, WSMOUSEIO_SETVERSION, &version) == -1) { + xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name); + return FALSE; + } +#endif +#endif + return TRUE; +} + +#endif + #if defined(__OpenBSD__) && defined(WSCONS_SUPPORT) /* Only support wsmouse configuration for now */ @@@@ -430,6 +452,11 @@@@ dz = event->value; break; #endif +#ifdef WSCONS_EVENT_MOUSE_DELTA_W + case WSCONS_EVENT_MOUSE_DELTA_W: + dw = event->value; + break; +#endif default: xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n", pInfo->name, event->type); @@@@ -491,6 +518,7 @@@@ hid_item_t loc_x; /* x locator item */ hid_item_t loc_y; /* y locator item */ hid_item_t loc_z; /* z (wheel) locator item */ + hid_item_t loc_w; /* w (pan) locator item */ hid_item_t loc_btn[MSE_MAXBUTTONS]; /* buttons locator items */ unsigned char *buffer; } UsbMseRec, *UsbMsePtr; @@@@ -610,6 +638,7 @@@@ dx = hid_get_data(pBuf, &pUsbMse->loc_x); dy = hid_get_data(pBuf, &pUsbMse->loc_y); dz = hid_get_data(pBuf, &pUsbMse->loc_z); + dw = hid_get_data(pBuf, &pUsbMse->loc_w); buttons = 0; for (n = 0; n < pMse->buttons; n++) { @@@@ -701,6 +730,9 @@@@ if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), hid_input, &pUsbMse->loc_z, pUsbMse->iid) < 0) { } + if (hid_locate(reportDesc, HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN), + hid_input, &pUsbMse->loc_w, pUsbMse->iid) < 0) { + } #else if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), hid_input, &pUsbMse->loc_x) < 0) { @@@@ -713,6 +745,9 @@@@ if (hid_locate(reportDesc, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), hid_input, &pUsbMse->loc_z) < 0) { } + if (hid_locate(reportDesc, HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN), + hid_input, &pUsbMse->loc_w) < 0) { + } #endif /* Probe for number of buttons */ for (i = 1; i <= MSE_MAXBUTTONS; i++) { @@@@ -783,6 +818,9 @@@@ p->SetupAuto = SetupAuto; p->SetMiscRes = SetMouseRes; #endif +#if defined(__NetBSD__) + p->SetupMouse = SetupMouse; +#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) p->FindDevice = FindDevice; #endif @ 1.5 log @Modular-xorg-server-1.4.2nb5. Apply the following patches from NetBSD xsrc/external/mit/xorg-server/dist; thanks to joerg for providing a list of changes to apply. 2009-02-19 20:02 macallan * hw/xfree86/xaa/: xaaFillRect.c (1.2), xaaInitAccel.c (1.2), xaalocal.h (1.2): Actually use scanline image writes to upload images if available 2009-02-09 09:49 plunky * hw/xfree86/os-support/bsd/bsd_mouse.c (1.5): add horizontal mouse-wheel functionality to USB and WSMOUSE drivers 2009-02-02 03:06 christos * hw/xfree86/os-support/: bsd/bsd_mouse.c (1.4), xf86OSmouse.h (1.2): add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to SetupMouse. 2009-01-19 00:54 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.3): fix ioctl. 2009-01-13 18:43 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.2): Set the mouse event protocol version. (untested, but head will be broken unless I add this). @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Welcome to modular-xorg-server-1.4.2. This long-overdue update brings many improvements: - Many improvements to EXA - Input Hotplugging via HAL or dbus (not enabled yet) - Support for RandR 1.2. Users using a dual-head configuration are encouraged to see for more information. - The server now uses the same version of Mesa we have in pkgsrc; this likely will result in more reliable OpenGL/DRI operation. I realize that this server is still not the latest release (1.5.0); upgrading to that version will require an involved mesa update, libpciaccess, etc. I hope that by the next quarter, that work will be done. Please file a problem report and/or contact us via the usual means (mailing lists, etc.) should you encounter any issues. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3 2007/08/14 21:34:37 joerg Exp $ d3 65 a67 10 --- hw/xfree86/common/Makefile.am.orig 2007-08-14 20:51:48.000000000 +0200 +++ hw/xfree86/common/Makefile.am @@@@ -25,8 +25,8 @@@@ KBDSOURCES = xf86Kbd@@XORG_OS_KBD@@.c MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes -xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) - cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@@ +xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) + cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@@ d69 26 a94 1 BUILT_SOURCES = xf86DefModeSet.c d96 32 @ 1.3 log @Add modeline2c.awk, which replaces modeline2c.pl from Xorg. This allows us to drop the Perl dependency. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to modular xorg-server 1.3.0: - RandR 1.2 support in the server (drivers must support it as well) - many bug fixes, improvements for AIGLX and EXA etc pp @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2007/04/03 20:25:44 drochner Exp $ d3 3 a5 5 --- Xext/xcmisc.c.orig 2007-04-03 18:03:01.000000000 +0200 +++ Xext/xcmisc.c @@@@ -42,6 +42,12 @@@@ from The Open Group. #include #include "modinit.h" d7 1 a7 10 +#if HAVE_STDINT_H +#include +#elif !defined(UINT32_MAX) +#define UINT32_MAX 0xffffffffU +#endif + #if 0 static unsigned char XCMiscCode; #endif @@@@ -143,7 +149,10 @@@@ ProcXCMiscGetXIDList(client) d9 4 a12 1 REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq); d14 1 a14 16 - pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID)); + if (stuff->count > UINT32_MAX / sizeof(XID)) + return BadAlloc; + + pids = (XID *)Xalloc(stuff->count * sizeof(XID)); if (!pids) { return BadAlloc; @@@@ -164,7 +173,7 @@@@ ProcXCMiscGetXIDList(client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, count * sizeof(XID), pids); } - DEALLOCATE_LOCAL(pids); + Xfree(pids); return(client->noClientException); } @ 1.1 log @fix a possible memory corruption due to integer overflow in ProcXCMiscGetXIDList() (CVE-2007-1003) bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @