DRI build failing

Hello,

Seeing this on an amd64 box when doing a fresh Xorg build:

===>  Building for dri-7.6.1,2
gmake[1]: Entering directory `/usr/ports/graphics/dri/work/Mesa-7.6.1/src'
Making sources for autoconf
gmake[2]: Entering directory
`/usr/ports/graphics/dri/work/Mesa-7.6.1/src/glx/x11'
rm -f depend
touch depend
/usr/local/bin/makedepend -fdepend -I. -I../../../include
-I../../../include/GL/internal -I../../../src/mesa
-I../../../src/mesa/glapi -I/usr/local/include
-I/usr/local/include/drm   -I/usr/local/include   -D_THREAD_SAFE
-I/usr/local/include   glcontextmodes.c clientattrib.c compsize.c
eval.c glxcmds.c glxcurrent.c glxext.c glxextensions.c indirect.c
indirect_init.c indirect_size.c indirect_window_pos.c
indirect_texture_compression.c indirect_transpose_matrix.c
indirect_vertex_array.c indirect_vertex_program.c pixel.c pixelstore.c
render2.c renderpix.c single2.c singlepix.c vertarr.c xfont.c
glx_pbuffer.c glx_query.c drisw_glx.c dri_common.c dri_glx.c XF86dri.c
glxhash.c dri2_glx.c dri2.c \
                ../../../src/mesa/main/dispatch.c
../../../src/mesa/glapi/glapi.c
../../../src/mesa/glapi/glapi_getproc.c
../../../src/mesa/glapi/glthread.c
../../../src/mesa/x86-64/glapi_x86-64.S
gmake[2]: Leaving directory
`/usr/ports/graphics/dri/work/Mesa-7.6.1/src/glx/x11'
gmake[2]: Entering directory
`/usr/ports/graphics/dri/work/Mesa-7.6.1/src/glx/x11'
cc -L/usr/local/lib -I/usr/local/include -c -I. -I../../../include
-I../../../include/GL/internal -I../../../src/mesa
-I../../../src/mesa/glapi -I/usr/local/include
-I/usr/local/include/drm   -I/usr/local/include   -D_THREAD_SAFE
-I/usr/local/include   -I/usr/local/include -O2 -pipe -march=native
-fno-strict-aliasing -Wall -Wmissing-prototypes -std=c99 -ffast-math
-fno-strict-aliasing  -fPIC  -DUSE_X86_64_ASM -DHAVE_POSIX_MEMALIGN
-DUSE_XCB -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
-DHAVE_ALIAS -DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING
-DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
-DDEFAULT_DRIVER_DIR=\"/usr/local/lib/dri\" glcontextmodes.c -o
glcontextmodes.o
glcontextmodes.c: In function '_gl_copy_visual_to_context_mode':
glcontextmodes.c:193: error: '__GLcontextModes' has no member named
'bindToTextureRgb'
glcontextmodes.c:194: error: '__GLcontextModes' has no member named
'bindToTextureRgba'
glcontextmodes.c:196: error: '__GLcontextModes' has no member named
'bindToMipmapTexture'
glcontextmodes.c:197: error: '__GLcontextModes' has no member named
'bindToTextureTargets'
glcontextmodes.c:200: error: '__GLcontextModes' has no member named 'yInverted'
glcontextmodes.c: In function '_gl_get_context_mode_data':
glcontextmodes.c:333: error: '__GLcontextModes' has no member named
'bindToTextureRgb'
glcontextmodes.c:336: error: '__GLcontextModes' has no member named
'bindToTextureRgba'
glcontextmodes.c:339: error: '__GLcontextModes' has no member named
'bindToMipmapTexture'
glcontextmodes.c:343: error: '__GLcontextModes' has no member named
'bindToTextureTargets'
glcontextmodes.c:346: error: '__GLcontextModes' has no member named 'yInverted'
glcontextmodes.c: In function '_gl_context_modes_create':
glcontextmodes.c:418: error: '__GLcontextModes' has no member named
'bindToTextureRgb'
glcontextmodes.c:419: error: '__GLcontextModes' has no member named
'bindToTextureRgba'
glcontextmodes.c:420: error: '__GLcontextModes' has no member named
'bindToMipmapTexture'
glcontextmodes.c:421: error: '__GLcontextModes' has no member named
'bindToTextureTargets'
glcontextmodes.c:422: error: '__GLcontextModes' has no member named 'yInverted'
glcontextmodes.c: In function '_gl_context_modes_are_same':
glcontextmodes.c:539: error: '__GLcontextModes' has no member named
'bindToTextureRgb'
glcontextmodes.c:539: error: '__GLcontextModes' has no member named
'bindToTextureRgb'
glcontextmodes.c:540: error: '__GLcontextModes' has no member named
'bindToTextureRgba'
glcontextmodes.c:540: error: '__GLcontextModes' has no member named
'bindToTextureRgba'
glcontextmodes.c:541: error: '__GLcontextModes' has no member named
'bindToMipmapTexture'
glcontextmodes.c:541: error: '__GLcontextModes' has no member named
'bindToMipmapTexture'
glcontextmodes.c:542: error: '__GLcontextModes' has no member named
'bindToTextureTargets'
glcontextmodes.c:542: error: '__GLcontextModes' has no member named
'bindToTextureTargets'
glcontextmodes.c:543: error: '__GLcontextModes' has no member named 'yInverted'
glcontextmodes.c:543: error: '__GLcontextModes' has no member named 'yInverted'
gmake[2]: *** [glcontextmodes.o] Error 1
gmake[2]: Leaving directory
`/usr/ports/graphics/dri/work/Mesa-7.6.1/src/glx/x11'
gmake[1]: *** [subdirs] Error 1
gmake[1]: Leaving directory `/usr/ports/graphics/dri/work/Mesa-7.6.1/src'
gmake: *** [default] Error 1
*** Error code 1

Stop in /usr/ports/graphics/dri.
*** Error code 1

Stop in /usr/ports/x11/xorg.


It looks like a boo-boo in the code. This is from a freshly pulled
down ports tree from this morning and with "WITHOUT_NOUVEAU=yes" in
/etc/make.conf. Is there a patch in the works or do we need to let the
Freedesktop folks know?

Thanks,

Chris