Here's the updated patch, which adds a mesa-headers package, and fixes the dlopening of s2tc.