Hi,
I am seeing a build failure on -current when I build xenocara. I've
already built /usr/src so that's up to date.
/usr/xenocara/lib/mesa/src/mesa/main/varray.c:168: error: no previous prototype
for '_mesa_bind_vertex_buffer'
/usr/xenocara/lib/mesa/src/mesa/main/varray.c:280: error: no previous prototype
for '_mesa_update_array_format'
/usr/xenocara/lib/mesa/src/mesa/main/varray.c:787: error: no previous prototype
for '_mesa_enable_vertex_array_attrib'
*** Error 1 in lib/mesa/obj/src/mesa (Makefile:2819 'main/varray.lo')
*** Error 1 in lib/mesa/obj/src/mesa (Makefile:2956 'all-recursive')
*** Error 1 in lib/mesa/obj/src/mesa (Makefile:1789 'all')
*** Error 1 in lib/mesa/obj/src (Makefile:652 'all-recursive')
*** Error 1 in lib/mesa/obj (Makefile:598 'all-recursive')
*** Error 1 in lib/mesa (/usr/X11R6/share/mk/bsd.xorg.mk:145 'all')
*** Error 1 in lib/mesa (/usr/X11R6/share/mk/bsd.xorg.mk:216 'build')
*** Error 1 in lib (<bsd.subdir.mk>:48 'build')
*** Error 1 in . (<bsd.subdir.mk>:48 'realbuild')
*** Error 1 in /usr/xenocara (Makefile:37 'build')
I build xenocara with the following steps:
upgradexenocara() {
rm -rf /usr/xobj/*
cd /usr/xenocara
make bootstrap
make obj
make build
}
I patched the code as follows:
diff --git a/lib/mesa/src/mesa/main/varray.c b/lib/mesa/src/mesa/main/varray.c
index c2bf295..2e504d1 100644
--- a/lib/mesa/src/mesa/main/varray.c
+++ b/lib/mesa/src/mesa/main/varray.c
@@ -159,7 +159,7 @@ vertex_attrib_binding(struct gl_context *ctx,
* Binds a buffer object to the vertex buffer binding point given by index,
* and sets the Offset and Stride fields.
*/
-void
+static void
_mesa_bind_vertex_buffer(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint index,
@@ -270,7 +270,7 @@ get_legal_types_mask(const struct gl_context *ctx)
* \param flush_verties Should \c FLUSH_VERTICES be invoked before updating
* state?
*/
-void
+static void
_mesa_update_array_format(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
GLuint attrib, GLint size, GLenum type,
@@ -780,7 +780,7 @@ _mesa_VertexAttribLPointer(GLuint index, GLint size, GLenum
type,
}
-void
+static void
_mesa_enable_vertex_array_attrib(struct gl_context *ctx,
struct gl_vertex_array_object *vao,
unsigned attrib)
