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