The FreeBSD x11 team proudly presents

an zeising, kwm, miwi, bapt, eadler production:

Xorg 7.7

Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.

PR:		ports/177942
Exp-run by:	miwi
Approved by:	portmgr (miwi)

Thanks to all who helped testing!

1 files changed, 0 insertions, 89 deletions

diff --git a/x11-servers/xorg-server/files/extra-dix_events.c b/x11-servers/xorg-server/files/extra-dix_events.c
deleted file mode 100644
index caa7a99ec255..000000000000
--- a/x11-servers/xorg-server/files/extra-dix_events.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- dix/events.c.orig	2010-05-04 02:47:57.000000000 +0200
-+++ dix/events.c	2012-04-24 12:59:22.000000000 +0200
-@@ -3440,7 +3440,6 @@ CheckPassiveGrabsOnWindow(
-     {
- 	DeviceIntPtr	gdev;
- 	XkbSrvInfoPtr	xkbi = NULL;
--	Mask		mask = 0;
- 
- 	gdev= grab->modifierDevice;
-         if (grab->grabtype == GRABTYPE_CORE)
-@@ -3555,9 +3554,6 @@ CheckPassiveGrabsOnWindow(
-                 }
-                 xE = &core;
-                 count = 1;
--                mask = grab->eventMask;
--                if (grab->ownerEvents)
--                    mask |= pWin->eventMask;
-             } else if (match & XI2_MATCH)
-             {
-                 rc = EventToXI2((InternalEvent*)event, &xE);
-@@ -3569,34 +3565,6 @@ CheckPassiveGrabsOnWindow(
-                     continue;
-                 }
-                 count = 1;
--
--                /* FIXME: EventToXI2 returns NULL for enter events, so
--                 * dereferencing the event is bad. Internal event types are
--                 * aligned with core events, so the else clause is valid.
--                 * long-term we should use internal events for enter/focus
--                 * as well */
--                if (xE)
--                    mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8];
--                else if (event->type == XI_Enter || event->type == XI_FocusIn)
--                    mask = grab->xi2mask[device->id][event->type/8];
--
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type;
--                            mask |= icp->xi2mask[device->id][evtype/8];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             } else
-             {
-                 rc = EventToXI((InternalEvent*)event, &xE, &count);
-@@ -3607,23 +3575,6 @@ CheckPassiveGrabsOnWindow(
-                                 "(%d, %d).\n", device->name, event->type, rc);
-                     continue;
-                 }
--                mask = grab->eventMask;
--                if (grab->ownerEvents && wOtherInputMasks(grab->window))
--                {
--                    InputClientsPtr icp =
--                        wOtherInputMasks(grab->window)->inputClients;
--
--                    while(icp)
--                    {
--                        if (rClient(icp) == rClient(grab))
--                        {
--                            mask |= icp->mask[device->id];
--                            break;
--                        }
--
--                        icp = icp->next;
--                    }
--                }
-             }
- 
- 	    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-@@ -3632,7 +3583,8 @@ CheckPassiveGrabsOnWindow(
-             {
-                 FixUpEventFromWindow(device, xE, grab->window, None, TRUE);
- 
--                TryClientEvents(rClient(grab), device, xE, count, mask,
-+                TryClientEvents(rClient(grab), device, xE, count,
-+                                       GetEventFilter(device, xE),
-                                        GetEventFilter(device, xE), grab);
-             }
-