From: Alexandru DAMIAN <alexandru.dam...@intel.com>
If the "wayland" DISTRO_FEATURE is present, enable the Wayland EGL platform.
This is required by the reference Wayland compositor, Weston.
Signed-off-by: Alexandru DAMIAN <alexandru.dam...@intel.com>
Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 10 +++++++++-
meta/recipes-graphics/mesa/mesa-dri.inc | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index 838ce11..1ff08fb 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -28,10 +28,15 @@ EXTRA_OECONF = "--disable-glu \
--disable-glut \
--enable-shared-glapi"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
egl gles"
+PACKAGECONFIG ??= "egl gles \
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
+ ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '',
d)}\
+ "
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage
libxfixes"
PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
+PACKAGECONFIG[wayland] = ",,wayland"
+
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
@@ -48,6 +53,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \
libgles1-mesa libgles1-mesa-dev \
libgles2-mesa libgles2-mesa-dev \
libgles3-mesa libgles3-mesa-dev \
+ libwayland-egl libwayland-egl-dev \
"
do_install_append () {
@@ -89,6 +95,7 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
FILES_libgl-mesa = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc"
FILES_libdricore-dev = "${libdir}/libdricore*.*"
@@ -100,5 +107,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*
${includedir}/GLES ${libdir}/p
FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
${libdir}/pkgconfig/glesv2.pc"
FILES_libgles3-mesa-dev = "${includedir}/GLES3"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h
${libdir}/pkgconfig/osmesa.pc"
+FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc
${libdir}/libwayland-egl.*"
FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc
b/meta/recipes-graphics/mesa/mesa-dri.inc
index 07544ab..1f6ec78 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -13,6 +13,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2,
--disable-gles1 --disable-
EGL_PLATFORMS = "drm"
EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
+EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'wayland', ',wayland',
'', d)}"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS},
--disable-egl"
python populate_packages_prepend() {
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
