first merge of xorg-server 1.18.4 reach over. not tested, andmissing at these new subdirs, some which may not be needed: dri2 glamor hw/xfree86/drivers/modesetting hw/xfree86/parser present pseudoramiX
build updates and fixes for xorg-server 1.10.3.