Added logic to control how xorg-xserver source is obtained