From f30eec41f95ed99909eb2c7590d83c12b9142df2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 8 Dec 2016 23:24:17 +0100 Subject: [PATCH] package/efl: add Wayland support The EFL Wayland support was removed with commit [1] since the dependecy on libdrm was missing. Also it requires OpenGL ES with EGL, Evas DRM and Evas GLES DRM support [2]. As stated in configure, Evas GLES DRM engine support (gl_drm) depends on wayland-client to build (wayland-client >= 1.8.0). So, enable gl_drm only when wayland support is selected. [1] 4f04be1659f186765f506c68f5bfbf6845fc40dc [2] https://www.enlightenment.org/about-wayland Signed-off-by: Romain Naour Cc: Pierre Floury Signed-off-by: Peter Korsgaard --- package/efl/Config.in | 12 ++++++++++++ package/efl/efl.mk | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/package/efl/Config.in b/package/efl/Config.in index 0692d80b23..c51fc564d4 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -155,6 +155,18 @@ config BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XPROTO_GLPROTO +config BR2_PACKAGE_EFL_WAYLAND + bool "Wayland support" + depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine + depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only + select BR2_PACKAGE_EFL_DRM + select BR2_PACKAGE_WAYLAND + +comment "Wayland support needs OpenGL ES w/ EGL, threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ + || !BR2_PACKAGE_EFL_OPENGLES + choice bool "OpenGL support" help diff --git a/package/efl/efl.mk b/package/efl/efl.mk index d823af2d1a..7a8e47f4c1 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -201,6 +201,16 @@ else EFL_CONF_OPTS += --disable-drm endif +# The EFL Wayland support requires Evas GLES DRM engine support +# which depends on wayland-client to build. +# So enable gl_drm only when wayland support is selected. +ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y) +EFL_DEPENDENCIES += wayland +EFL_CONF_OPTS += --enable-wayland --enable-gl-drm +else +EFL_CONF_OPTS += --disable-wayland --disable-gl-drm +endif + EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) # Loaders that need external dependencies needs to be --enable-XXX=yes -- 2.30.2