Re: [dylan][PATCH] mesa: fix EGL compilation without X11 headers

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 6731 bytes --]

On Thu, Jun 27, 2013 at 11:11:20PM +0200, Martin Jansa wrote:
> Almost all of them :)
> 
> PACKAGECONFIG = "egl gles dri wayland gallium gallium-llvmpipe openvg"

I've updated
http://git.openembedded.org/openembedded-core-contrib/log/?h=jansa/mesa

http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/mesa&id=b141f10bbd59c38419c25f6aa88b6fd293d981ae
should fix the issue with state_tracker/xlib_sw_winsys.h

I'll send this patchset to master after few more tests.

> On Thu, Jun 27, 2013 at 11:00 PM, Burton, Ross <ross.burton@intel.com>wrote:
> 
> > I'm actively fixing this upstream now, so I will make sure this is sorted.
> >  What PACKAGECONFIG are you using?
> >
> > Ross
> >
> >
> > On Thursday, 27 June 2013, Martin Jansa wrote:
> >
> >> On Tue, Jun 25, 2013 at 05:38:43PM +0200, Nicolas Dechesne wrote:
> >> > Extracted from "d7033f4 mesa: upgrade to 9.1.3", already merged in
> >> master:
> >> >
> >> > --
> >> > Add EGL-Mutate-NativeDisplayType-depending-on-config.patch to build
> >> correctly in
> >> > a non-X11 environment.
> >> >
> >> > Drop fix-egl-compilation-without-x11-headers.patch as they were
> >> backports.
> >> > --
> >> >
> >> > The new patch was also backported (trivial) to mesa 9.0.2 which is in
> >> > dylan.
> >> >
> >> > Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
> >> > ---
> >> >  meta/recipes-graphics/mesa/mesa-9.0.2.inc          |   2 +-
> >> >  ...ate-NativeDisplayType-depending-on-config.patch | 361
> >> +++++++++++++++++++++
> >> >  2 files changed, 362 insertions(+), 1 deletion(-)
> >> >  create mode 100644
> >> meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
> >> >
> >> > diff --git a/meta/recipes-graphics/mesa/mesa-9.0.2.inc
> >> b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
> >> > index b88bc42..e2dcfdb 100644
> >> > --- a/meta/recipes-graphics/mesa/mesa-9.0.2.inc
> >> > +++ b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
> >> > @@ -2,7 +2,7 @@ SRC_URI = "
> >> ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
> >> >             file://0002-cross-compile.patch \
> >> >             file://cross-glsl.patch \
> >> >             file://dont-fail-if-libX11-isnt-installed.patch \
> >> > -           file://fix-egl-compilation-without-x11-headers.patch \
> >> > +
> >> file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
> >> >             "
> >>
> >> EGL-Mutate-NativeDisplayType-depending-on-config.patch does not cover
> >>
> >> #include "state_tracker/xlib_sw_winsys.h"
> >> in
> >> src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
> >>
> >> so builds with pipe-loader enabled and without x11 headers are still
> >> failing, the same issue is in master.
> >>
> >> >  SRC_URI[md5sum] = "dc45d1192203e418163e0017640e1cfc"
> >> > diff --git
> >> a/meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
> >> b/meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
> >> > new file mode 100644
> >> > index 0000000..98c4095
> >> > --- /dev/null
> >> > +++
> >> b/meta/recipes-graphics/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
> >> > @@ -0,0 +1,361 @@
> >> > +From 7e5846aa52c7cb00b0db9fa393975880371d2620 Mon Sep 17 00:00:00 2001
> >> > +From: Daniel Stone <daniel@fooishbar.org>
> >> > +Date: Fri, 24 May 2013 17:20:27 +0100
> >> > +Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config
> >> > +
> >> > +If we go through ./configure without enabling X11 anywhere, then set
> >> the
> >> > +fallback types for EGL NativeDisplay and friends, rather than assuming
> >> > +X11/Xlib.
> >> > +
> >> > +Signed-off-by: Daniel Stone <daniel@fooishbar.org>
> >> > +
> >> > +Conflicts:
> >> > +     configure.ac
> >> > +---
> >> > + configure.ac                 |   9 +++
> >> > + include/EGL/eglplatform.h    | 146
> >> -------------------------------------------
> >> > + include/EGL/eglplatform.h.in | 146
> >> +++++++++++++++++++++++++++++++++++++++++++
> >> > + 3 files changed, 155 insertions(+), 146 deletions(-)
> >> > + delete mode 100644 include/EGL/eglplatform.h
> >> > + create mode 100644 include/EGL/eglplatform.h.in
> >> > +
> >> > +diff --git a/configure.ac b/configure.ac
> >> > +index 682e0a5..a8a485d 100644
> >> > +--- a/configure.ac
> >> > ++++ b/configure.ac
> >> > +@@ -1577,12 +1577,20 @@ fi
> >> > +
> >> > + EGL_PLATFORMS="$egl_platforms"
> >> > +
> >> > ++if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
> >> > ++    MESA_EGL_NO_X11_HEADERS=0
> >> > ++else
> >> > ++    MESA_EGL_NO_X11_HEADERS=1
> >> > ++fi
> >> > ++
> >> > + AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep
> >> 'x11' >/dev/null 2>&1)
> >> > + AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" |
> >> grep 'wayland' >/dev/null 2>&1)
> >> > + AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep
> >> 'drm' >/dev/null 2>&1)
> >> > + AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep
> >> 'fbdev' >/dev/null 2>&1)
> >> > + AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep
> >> 'null' >/dev/null 2>&1)
> >> > +
> >> > ++AC_SUBST([MESA_EGL_NO_X11_HEADERS])
> >> > ++
> >> > + AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" !=
> >> "x")
> >> > + AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" !=
> >> "x")
> >> > +
> >> > +@@ -1953,6 +1961,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
> >> > + dnl Substitute the config
> >> > + AC_CONFIG_FILES([configs/current
> >> > +             Makefile
> >> > ++            include/EGL/eglplatform.h
> >> > +             src/egl/Makefile
> >> > +             src/egl/drivers/Makefile
> >> > +             src/egl/drivers/dri2/Makefile
> >> > +diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
> >> > +deleted file mode 100644
> >> > +index 17fdc61..0000000
> >> > +--- a/include/EGL/eglplatform.h
> >> > ++++ /dev/null
> >> > +@@ -1,146 +0,0 @@
> >> > +-#ifndef __eglplatform_h_
> >> > +-#define __eglplatform_h_
> >> > +-
> >> > +-/*
> >> > +-** Copyright (c) 2007-2009 The Khronos Group Inc.
> >> > +-**
> >> > +-** Permission is hereby granted, free of charge, to any person
> >> obtaining a
> >> > +-** copy of this software and/or associated documentation files (the
> >> > +-** "Materials"), to deal in the Materials without restriction,
> >> including
> >> > +-** without limitation the rights t--
> >>
> >> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> >>
> >

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]