Some fixes from mesa-git pkg
Rebuild