Cannot compile xorg-server-git with current mesa

[son_of_the_osiris at interia.pl]

Hi. I have got the following error:
Making all in glx
make[1]: Enter to folder `/usr/src/xorg-server-git/src/xserver/glx'
   CC       glxdri2.lo
glxdri2.c: In function '__glXDRIscreenDestroy':
glxdri2.c:385:18: warning: cast discards '__attribute__((const))' 
qualifier from pointer target type [-Wcast-qual]
glxdri2.c: In function 'dri2_convert_glx_attribs':
glxdri2.c:446:17: error: 'screen' undeclared (first use in this function)
glxdri2.c:446:17: note: each undeclared identifier is reported only once 
for each function it appears in
glxdri2.c:486:9: warning: statement with no effect [-Wunused-value]
glxdri2.c: In function 'create_driver_context':
glxdri2.c:520:17: warning: 'return' with a value, in function returning 
void [enabled by default]
glxdri2.c:537:26: error: '__DRI_CTX_NO_RESET_NOTIFICATION' undeclared 
(first use in this function)
glxdri2.c:539:21: error: '__DRI_CTX_ATTRIB_RESET_NOTIFICATION' 
undeclared (first use in this function)
glxdri2.c: In function 'initializeExtensions':
glxdri2.c:902:29: warning: cast discards '__attribute__((const))' 
qualifier from pointer target type [-Wcast-qual]
glxdri2.c: In function '__glXDRIscreenProbe':
glxdri2.c:949:36: warning: cast discards '__attribute__((const))' 
qualifier from pointer target type [-Wcast-qual]
glxdri2.c:950:24: warning: cast discards '__attribute__((const))' 
qualifier from pointer target type [-Wcast-qual]
make[1]: *** [glxdri2.lo] error 1
make[1]: Opuszczenie katalogu `/usr/src/xorg-server-git/src/xserver/glx'
make: *** [all-recursive] error 1