Mesa platforms no longer depend directly on egl. Current
implementation breaks without egl with x11 (which can happen with
mesa-gl).
Separate the platform selection. Make drm platform depend on gbm
PACKAGECONFIG by default.
Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com>
---
This keeps the defaults as they were (compared to upstreams probing
approach we skip 'surfaceless' platform), and mesa-gl should now
be fine as well.
Cheers,
Jussi
meta/recipes-graphics/mesa/mesa.inc | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 59e8923..1b712a2 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -22,7 +22,12 @@ inherit autotools pkgconfig gettext distro_features_check
REQUIRED_DISTRO_FEATURES = "opengl"
-EXTRA_OECONF = "--enable-shared-glapi
--with-llvm-prefix=${STAGING_BINDIR_NATIVE}"
+PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)}"
+
+EXTRA_OECONF = "--enable-shared-glapi \
+ --with-llvm-prefix=${STAGING_BINDIR_NATIVE} \
+ --with-platforms='${PLATFORMS}'"
PACKAGECONFIG ??= "gbm egl gles dri \
${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)}
\
@@ -47,10 +52,7 @@ PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=intel,
--without-vulkan-drivers"
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1
--disable-gles2"
-EGL_PLATFORMS = "drm"
-EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
-EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland',
'', d)}"
-PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS},
--disable-egl --with-platforms=''"
+PACKAGECONFIG[egl] = "--enable-egl, --disable-egl"
PACKAGECONFIG[etnaviv] = ""
PACKAGECONFIG[imx] = ""
--
2.1.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
