On 05/02/2014 11:51 PM, Brian Paul wrote:
> I don't have time to investigate right now, but a recent Mesa commit
> seems to have broke some of our automated builds on Linux:
>
> With SCONS:
>
> scons: done reading SConscript files.
> scons: Building targets ...
> Compiling src/gallium/state_trackers/egl/x11/x11_screen.c ...
> Compiling src/gallium/state_trackers/egl/x11/dri2.c ...
> Compiling src/glx/dri2.c ...
> Compiling src/glx/dri2_glx.c ...
> Compiling src/glx/dri2_query_renderer.c ...
> In file included from src/glx/dri2_query_renderer.c:31:0:
> src/glx/dri3_priv.h:58:22: fatal error: xcb/dri3.h: No such file or
> directory
> #include <xcb/dri3.h>
> ^
> compilation terminated.
> Compiling src/glx/dri_glx.c ...
> scons: *** [build/linux-x86_64-checked/glx/dri2_query_renderer.os] Error 1
> scons: building terminated because of errors.
>
>
> With make:
>
> CC glxhash.lo
> CC dri2_glx.lo
> CC dri2.lo
> CC dri2_query_renderer.lo
> CC applegl_glx.lo
> In file included from dri2_query_renderer.c:31:0:
> dri3_priv.h:58:22: fatal error: xcb/dri3.h: No such file or directory
> #include <xcb/dri3.h>
> ^
> compilation terminated.
> make[3]: *** [dri2_query_renderer.lo] Error 1
> make[3]: Leaving directory
> `/var/lib/hudson/jobs/mesa-ubuntu64-make/workspace/src/glx'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory
> `/var/lib/hudson/jobs/mesa-ubuntu64-make/workspace/src/glx'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory
> `/var/lib/hudson/jobs/mesa-ubuntu64-make/workspace/src'
> make: *** [all-recursive] Error 1
>
> It would be great if someone could check on this.
>
> -Brian
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Does the attached patch fix the build for you?
--
Note: My last name is not Krejzi.
>From f83c41c6e3cca790cdfe9415c667cb7c379e6ceb Mon Sep 17 00:00:00 2001
From: Armin K <kre...@email.com>
Date: Fri, 2 May 2014 23:59:22 +0200
Subject: [PATCH] glx: Conditionally compile GLX_MESA_query_renderer DRI3
support
---
src/glx/dri2_query_renderer.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
index c96e1f9..c1e8772 100644
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri2_query_renderer.c
@@ -28,7 +28,9 @@
#include "dri2.h"
#include "dri_interface.h"
#include "dri2_priv.h"
+#if defined(HAVE_DRI3)
#include "dri3_priv.h"
+#endif
static int
dri2_convert_glx_query_renderer_attribs(int attribute)
@@ -99,6 +101,7 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute,
return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value);
}
+#if defined(HAVE_DRI3)
_X_HIDDEN int
dri3_query_renderer_integer(struct glx_screen *base, int attribute,
unsigned int *value)
@@ -136,5 +139,6 @@ dri3_query_renderer_string(struct glx_screen *base, int attribute,
return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value);
}
+#endif /* HAVE_DRI3 */
#endif /* GLX_DIRECT_RENDERING */
--
1.9.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
