xf86-input-keyboard 2.0.0, xf86-video-cirrus 1.6.0, xf86-video-mach64 6.9.7,
and xf86-video-mga 2.0.1.

merge mga 2.0.0 and r128 6.12.0 drivers.

merge xf86-video-chips 1.2.7, xf86-video-glint 1.2.9, xf86-video-mga 1.6.5,
and xf86-video-r128 6.10.2.

remove xorg-server.h from all the places we added it recently, as this
problem is now fixed more generally and globally.

sprinkle const and #include "xorg-server.h"
now this builds at least

Restore part of previous to fix
xf86-video-mga/dist/src/mga_dac3026.c: In function 'MGA3026Save':
xf86-video-mga/dist/src/mga_dac3026.c:856:5: error: passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type [-Werror]
on i386.

Remove unneeded diffs to upstream.
Tested with gcc and clang on amd64.

merge xf86-video-mach64 6.9.4, xf86-video-mga 1.6.2, xf86-video-nv 2.1.20,
and xf86-video-r128 6.9.1.

avoid a bunch of int/ptr warnings.

initial import of xf86-video-mga-1.4.10

initial import of xf86-video-mga-1.4.8