removed extra/xorg-server, arm patch merged upstream