So this is probably indeed a Mesa issue, and you can remove the xorg.conf file again. Sorry, I can't help you with Ubuntu packages.