From 1d207e4c3ccc18f6d977fdded7a5f7c0874603cc Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 22 Jul 2022 10:01:50 +0300 Subject: [PATCH] package/cog: add libgbm as dependency when building with DRM support When building with the DRM support, it can happen that the libgbm library is not yet built by the provider of this lib (specified by BR2_PACKAGE_PROVIDES_LIBGBM). The docs in cog `docs/platform-drm.md` specify this dep-list: - **WPEBackend-fdo**: - **Wayland**: - **libdrm**: - **libgbm**: - **libinput**: - **libudev**: libgbm needs to be added. Adding libegl as well. Updated package/cog/Config.in to define the dependencies (for DRM) according to libegl & libgbm. Signed-off-by: Alexandru Ardelean Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/cog/Config.in | 9 ++++++--- package/cog/cog.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/cog/Config.in b/package/cog/Config.in index d4238750f9..484eb85c70 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -39,7 +39,8 @@ config BR2_PACKAGE_COG_PLATFORM_FDO config BR2_PACKAGE_COG_PLATFORM_DRM bool "DRM backend" depends on BR2_PACKAGE_HAS_UDEV # libinput - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT help @@ -52,7 +53,9 @@ config BR2_PACKAGE_COG_USE_SYSTEM_DBUS help Expose remote control interface on system bus -comment "DRM platform needs mesa3d w/ EGL driver and GBM" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL +comment "DRM platform needs EGL and GBM" + depends on \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBGBM endif diff --git a/package/cog/cog.mk b/package/cog/cog.mk index f2ca0af93d..da660eb7c1 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -28,7 +28,7 @@ endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON -COG_DEPENDENCIES += libdrm libinput +COG_DEPENDENCIES += libdrm libinput libgbm libegl else COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF endif