diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-07-10 14:54:08 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-11 15:41:34 +0100 |
| commit | 622d683273bab66f0b4dd385d083bff9fb7bb1de (patch) | |
| tree | 866511ff91fb3070af176a5bebd9605b34c52a78 | |
| parent | bbcc5322d3d0eb9e87e78ec47e71e29860af39d7 (diff) | |
| download | openembedded-core-622d683273bab66f0b4dd385d083bff9fb7bb1de.tar.gz openembedded-core-622d683273bab66f0b4dd385d083bff9fb7bb1de.tar.bz2 openembedded-core-622d683273bab66f0b4dd385d083bff9fb7bb1de.zip | |
mesa: Split --with-platforms from egl PACKAGECONFIG
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.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 59e8923f26..1b712a24ea 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] = "" |