You're the man, Pali! I just tried the modified patch and it works for me too.
Glamor, OpenGL and vdpau seem to be working perfectly now!