Okay, the hack doesn't work for you, Mesa fails to link because the varying name is not the same. What version of wine are you using? FWIW, I'm building my local copy from bb16263fe1974851f495435fef9a3d57fa2d4aa9 with all wine-staging patches applied on top of that commit.