package/cog: depend on libxkbcommon
PATCH v2 1/3 package/cog: depend on libxkbcommon
The always-built FDO backend relies on this.
--- package/cog/Config.in | 1 + package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
package/cog/Config.in +1 -0
@@ -8,6 +8,7 @@ config BR2_PACKAGE_COG depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS + select BR2_PACKAGE_LIBXKBCOMMON help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does
package/cog/cog.mk +1 -1
@@ -8,7 +8,7 @@ COG_VERSION = 0.6.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 libxkbcommon COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \
Signature · 1 line
2.20.1
PATCH v2 2/3 package/cog: add wayland dependencies
The always-built FDO backend relies on this.
--- package/cog/Config.in | 2 ++ package/cog/cog.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
package/cog/Config.in +2 -0
@@ -9,6 +9,8 @@ config BR2_PACKAGE_COG depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does
package/cog/cog.mk +1 -1
@@ -8,7 +8,7 @@ COG_VERSION = 0.6.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo libxkbcommon +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo libxkbcommon wayland wayland-protocols COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \
Signature · 1 line
2.20.1
PATCH v2 3/3 package/cog: support choosing either DRM or FDO platform
In reply to Charlie TurnerA new DRM platform has landed, now you can choose to build with the DRM or FDO platform, or neither. If neither are selected, Cog will fallback to a simple WPE backend like WPEBackend-rdk
(https://github.com/WebPlatformForEmbedded/WPEBackend-rdk).
Don't be confused that in both cases the *wpebackend-fdo* package is required. This is an unfortunate naming issue.
--- package/cog/Config.in | 25 +++++++++++++++++++++++-- package/cog/cog.mk | 18 +++++++++++++++--- 2 files changed, 38 insertions(+), 5 deletions(-)
package/cog/Config.in +23 -2
@@ -8,9 +8,7 @@ config BR2_PACKAGE_COG depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS help Single "window" launcher for the WebKit WPE port, and helper library for implementing WPE launcher. It does
@@ -29,4 +27,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" + default y + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_WAYLAND_PROTOCOLS + help + Enable the FreeDesktop.org backend. Cog will interface with + a compositor over the Wayland protocol. + +config BR2_PACKAGE_COG_PLATFORM_DRM + bool "DRM backend" + depends on BR2_PACKAGE_HAS_UDEV # libinput + depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT + help + Enable the DRM platform backend. Cog will interface directly + with video drivers that support kernel mode-setting (KMS) + via the DRM user-space API. + +comment "DRM platform needs mesa3d w/ EGL driver and GBM" + depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL + endif
package/cog/cog.mk +15 -3
@@ -8,15 +8,27 @@ COG_VERSION = 0.6.0 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo libxkbcommon wayland wayland-protocols +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_FDO=ON \ - -DCOG_PLATFORM_DRM=OFF \ -DCOG_WESTON_DIRECT_DISPLAY=OFF \ -DINSTALL_MAN_PAGES=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 wayland-protocols +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))
Signature · 1 line
2.20.1
PATCH v2 1/3 package/cog: depend on libxkbcommon
In reply to Charlie TurnerQuoted 7 lines · On Mon, 6 Apr 2020 18:42:03 +0100 Charlie Turner <[email protected]> wrote:
The always-built FDO backend relies on this.
Signed-off-by Charlie Turner <[email protected]>--- package/cog/Config.in | 1 + package/cog/cog.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Thanks, series applied. There was a minor formatting issue in PATCH 3/3, where the "default y" line was not properly indented, which was detected by "make check-package".
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com