[Mesa-dev] [PATCH] mesa: Build EGL without X11 headers after interop patchset

[Rob Herring]

On Sun, May 22, 2016 at 2:28 PM, Mark Janes <mark.a.janes at intel.com> wrote:
> Tom Stellard <tom at stellard.net> writes:
>
>> On Fri, May 20, 2016 at 04:29:07PM -0700, Mark Janes wrote:
>>> Tom Stellard <tom at stellard.net> writes:
>>>
>>> > On Wed, Apr 27, 2016 at 10:33:14PM +0000, Youry Metlitsky wrote:
>>> >> ---
>>> >>  include/GL/mesa_glinterop.h | 15 ++++++++++++++-
>>> >>  1 file changed, 14 insertions(+), 1 deletion(-)
>>> >>
>>> >
>>> > Hi,
>>> >
>>> > This patch breaks the build for me:
>>> >
>>> > glxcmds.c:2699:1: error: no previous prototype for
>>> > 'MesaGLInteropGLXQueryDeviceInfo' [-Werror=missing-prototypes]
>>> >  MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
>>> >   ^
>>> > glxcmds.c:2723:1: error: no previous prototype for
>>> > 'MesaGLInteropGLXExportObject' [-Werror=missing-prototypes]
>>> >  MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
>>> >   ^
>>> >   cc1: some warnings being treated as errors
>>> >
>>> > These are my configure args:
>>> >
>>> >  ./autogen.sh --disable-dri3 --disable-xvmc
>>> >  --with-gallium-drivers=swrast --disable-gallium-llvm
>>> >  --with-egl-platforms=drm --with-dri-drivers=no --enable-texture-float
>>>
>>> Sorry about that!  I pushed the patch at Marek's direction, but I did
>>> test it on a several build configurations.
>>>
>>> Adding " && !defined(MESA_EGL_NO_X11_HEADERS)" to the ifdef above the
>>> failure seems to fix compilation for those options -- does it work for
>>> you?
>>>
>>
>> Yes, the attached patch fixes my issue.
>>
>> -Tom
>
> Reviewed-by: Mark Janes <mark.a.janes at intel.com>

Unfortunately this doesn't fix the issue for me as
MESA_EGL_NO_X11_HEADERS is not defined on Android builds. It also
ignores the comments from Emil[1]. I would suggest reverting this and
applying my fix[2].

Rob

[1] https://www.mail-archive.com/mesa-dev%40lists.freedesktop.org/msg113030.html
[2] https://patchwork.freedesktop.org/patch/87736/