Patch originally by Damien Lespiau <[email protected]>.
Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-graphics/mesa/mesa-common.inc | 6 +++---
meta/recipes-graphics/mesa/mesa-dri.inc | 7 ++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index e1e5cb1..e5eb28c 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r1"
+INC_PR = "r2"
PE = "2"
@@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage
libxfixes libxml2-nativ
DEPENDS = "makedepend-native python-native flex-native bison-native
${PROTO_DEPS} ${LIB_DEPS}"
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
# for mesa-dri and mesa-xlib
FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -59,7 +59,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR
${libdir}/pkgconfig/egl.pc"
FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc
${includedir}/gbm.h"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL
${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc
b/meta/recipes-graphics/mesa/mesa-dri.inc
index ab4487f..d558f06 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -8,10 +8,15 @@ DRIDRIVERS = "swrast"
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
+EGL_PLATFORMS = "drm,x11"
+
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--enable-gles1 --enable-gles2"
-EXTRA_OECONF += "--disable-egl --enable-gbm"
+EXTRA_OECONF += "--enable-gbm"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', d)}"
+PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}",
"--disable-egl"
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
