From patchwork Thu Mar 12 19:47:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Turner X-Patchwork-Id: 1253918 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=cT4h5hwG; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48dfWS4j9zz9sNg for ; Fri, 13 Mar 2020 06:48:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B088C885BD; Thu, 12 Mar 2020 19:48:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 894xSfpMVlgI; Thu, 12 Mar 2020 19:47:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4501D88521; Thu, 12 Mar 2020 19:47:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 160981BF59C for ; Thu, 12 Mar 2020 19:47:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1326B8654C for ; Thu, 12 Mar 2020 19:47:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dInWMgiKcoxQ for ; Thu, 12 Mar 2020 19:47:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from fanzine.igalia.com (fanzine.igalia.com [178.60.130.6]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BEC448645E for ; Thu, 12 Mar 2020 19:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=IYOFtdyQDCwqMq/Bwcnk+aOKfX6CC7lcLMQH7OVUv1o=; b=cT4h5hwGLZtIdZmwBvi7TfT1MvsvCoUk5QIJEKEnAiKIpGny4ZIa1kKsuDG6UvYRr3B4dFgZ2Z2nVdA+mJNvFjRQ4ecVjD+BX/WIPbvMt0PBYyKsW3ZoQDS1zqD40kMR7kQCqdrSmnVF5RxQBcZ40GuvczzMr9IEssjvvmVAOK7tRGzEIDEBr5oJw656X7+fciS+cqVFL4M3uN7GcOkPIpL3xeER/53avNnwIPK9CJMdbUVxFIa1zj8yOlQ6XM455azeua5eVa4h87xYxSKZrn78xCzP933tyGyTe1DzitWMQoLiGX/vbgNuwo3siuTMQ9y/nIX6MIhCf2qp+lUaHw==; Received: from [213.205.192.177] (helo=localhost.localdomain) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim) id 1jCTo2-0006D7-DH; Thu, 12 Mar 2020 20:47:47 +0100 From: Charlie Turner To: buildroot@buildroot.org Date: Thu, 12 Mar 2020 19:47:00 +0000 Message-Id: <20200312194700.2836-1-cturner@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200311103044.11422-1-cturner@igalia.com> References: <20200311103044.11422-1-cturner@igalia.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/1] package/cog: add option for platform DRM. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Charlie Turner Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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))