[Buildroot] [PATCH v3 1/1] package/cog: add option for platform DRM.
flat view
From: Charlie Turner <hidden>
Date: 2020-03-12 19:47:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that there's two platforms, the default-on behaviour for FDO has been made configurable, so that you can choose DRM only platform for FDO platform. Don't be confused that in both cases the *wpebackend-fdo* package is required. This is an unfortunate naming issue. Signed-off-by: Charlie Turner <redacted> --- package/cog/Config.in | 27 +++++++++++++++++++++++++++ package/cog/cog.mk | 18 +++++++++++++++--- 2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/package/cog/Config.in b/package/cog/Config.in
index b25991d4ae..664e055104 100644
--- a/package/cog/Config.in
+++ b/package/cog/Config.in@@ -7,7 +7,11 @@ config BR2_PACKAGE_COG depends on BR2_PACKAGE_WPEWEBKIT depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus + # For egl across all platforms, and gbm in the DRM platform. + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL + select BR2_PACKAGE_DBUS + help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does
@@ -26,4 +30,27 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string is used, there is no default and the URI to open must be always specified in the command line. +config BR2_PACKAGE_COG_PLATFORM_FDO + bool "FreeDesktop.org backend" + + select BR2_PACKAGE_LIBXKBCOMMON + + help + Enable the FreeDesktop.org backend. + +config BR2_PACKAGE_COG_PLATFORM_DRM + bool "DRM backend" + + depends on BR2_PACKAGE_HAS_UDEV # libinput + + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT + + help + Enable the DRM platform backend. This allows Cog to run + without a compositor like Weston. + +comment "DRM platform needs mesa3d w/ EGL driver and GBM" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + endif
diff --git a/package/cog/cog.mk b/package/cog/cog.mk
index d0e5b79c38..339187126a 100644
--- a/package/cog/cog.mk
+++ b/package/cog/cog.mk@@ -8,13 +8,25 @@ COG_VERSION = 0.4.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland wayland-protocols COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_FDO=ON \ - -DCOG_PLATFORM_DRM=OFF \ -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' +ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) +COG_CONF_OPTS += -DCOG_PLATFORM_FDO=ON +COG_DEPENDENCIES += libxkbcommon +else +COG_CONF_OPTS += -DCOG_PLATFORM_FDO=OFF +endif + +ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) +COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON +COG_DEPENDENCIES += libdrm libinput +else +COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF +endif + $(eval $(cmake-package))
--
2.20.1