From patchwork Thu Feb 8 09:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1896488 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TVsmv4DZlz23hn for ; Thu, 8 Feb 2024 20:55:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7812441B9D; Thu, 8 Feb 2024 09:55:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oAvF2ln123nU; Thu, 8 Feb 2024 09:55:39 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0614441B29 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 0614441B29; Thu, 8 Feb 2024 09:55:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7AFEA1BF831 for ; Thu, 8 Feb 2024 09:55:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 75A70616CC for ; Thu, 8 Feb 2024 09:55:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mjvKlSk6BzXr for ; Thu, 8 Feb 2024 09:55:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=213.97.179.56; helo=fanzine2.igalia.com; envelope-from=aperez@igalia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 78725616B8 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 78725616B8 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 78725616B8 for ; Thu, 8 Feb 2024 09:55:36 +0000 (UTC) Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1rY180-00F8hL-Vh; Thu, 08 Feb 2024 10:55:33 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 701358e0; Thu, 8 Feb 2024 09:55:31 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 8 Feb 2024 11:55:28 +0200 Message-ID: <20240208095531.99049-2-aperez@igalia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-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:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jDKtECMVxWr3Pjyj+n2HI3nayjq3JRcCUlpfaoJ/yiA=; b=K91xd+iJWEDjd8I0bFVcxthRlA NTwRS4aEJuFkhbZ5/14Ap9eFcwrr6GSjsXDSJ/XnLzDuXRzCNr2lnIxLMvNM+SSi9yXZY30gDWRAs bdxhoGBR10rhjWwfc9Lg7wHFC1/TU35Ue983i4YX4XwpkfpITyX/B3lTE7+Vlf9hV0nA4pb9FQArk xpig9v+cOmQQ3SROLCYAsa9z6WCfqqLn4gikR5advbLG7Hp4zeHavS9hRO/g+to1jJht7Wwy6ZW3F Tek3WSQhAhfjugZjbB/2q9uBcD43OqORw92DgUxpsJKGS8+/u0q9zJLhZCN0HbWEFp0MrtNK7GrfM 5ClZBW7A==; X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=none (p=none dis=none) header.from=igalia.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=K91xd+iJ Subject: [Buildroot] [PATCH 1/3] package/wpebackend-rdk: new package X-BeenThere: buildroot@buildroot.org 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: Adrian Perez de Castro , Samuel Martin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The wpebackend-rdk can be used as an alternative to wpebackend-fdo in some cases, and also supports a few additional configurations. For now only the Wayland-EGL and Broadcom RaspberryPi userland implementations can be enabled. The former is useful for testing, and the latter allows using WPE WebKit directly on top of Dispmanx in combination with the rpi-userland package in supported RaspberryPi models. This only adds the new package, follow-up commits will un-hardcode the usage of wpebackend-fdo and allow selecting either which of both to build. Signed-off-by: Adrian Perez de Castro --- package/Config.in | 1 + package/wpebackend-rdk/Config.in | 57 ++++++++++++++++++++++ package/wpebackend-rdk/wpebackend-rdk.hash | 5 ++ package/wpebackend-rdk/wpebackend-rdk.mk | 43 ++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 package/wpebackend-rdk/Config.in create mode 100644 package/wpebackend-rdk/wpebackend-rdk.hash create mode 100644 package/wpebackend-rdk/wpebackend-rdk.mk diff --git a/package/Config.in b/package/Config.in index 91a6f1de00d..99bd6fee22e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1723,6 +1723,7 @@ menu "Graphics" source "package/wlroots/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" + source "package/wpebackend-rdk/Config.in" source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" diff --git a/package/wpebackend-rdk/Config.in b/package/wpebackend-rdk/Config.in new file mode 100644 index 00000000000..6125911bec9 --- /dev/null +++ b/package/wpebackend-rdk/Config.in @@ -0,0 +1,57 @@ +comment "wpebackend-rdk needs a toolchain w/ C++, wchar, threads, dynamic library, and rpi-userland or an OpenGL-capable Wayland backend" + depends on !(BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND) \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WPEBACKEND_RDK + bool "wpebackend-rdk" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_RPI_USERLAND || BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBWPE + help + WPEBackend interface supporting a number of configurations. + +if BR2_PACKAGE_WPEBACKEND_RDK + +choice + prompt Implementation + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI if BR2_PACKAGE_RPI_USERLAND + default BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL if BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +comment "brcm-rpi needs rpi-userland" + depends on !BR2_PACKAGE_RPI_USERLAND || !BR2_arm + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + bool "brcm-rpi" + depends on BR2_arm + depends on BR2_PACKAGE_RPI_USERLAND + help + Build RaspberryPi support using Broadcom's rpi-userland. + +comment "wayland-egl needs an EGL capable Wayland implementation" + depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + +config BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL + bool "wayland-egl" + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + help + Build Wayland-EGL support. + +endchoice + +if BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI + +config BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT + bool "libinput support" + select BR2_PACKAGE_LIBINPUT + help + Support keyboard and mouse input through libinput + +endif + +endif diff --git a/package/wpebackend-rdk/wpebackend-rdk.hash b/package/wpebackend-rdk/wpebackend-rdk.hash new file mode 100644 index 00000000000..af7dab6a365 --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.hash @@ -0,0 +1,5 @@ +# Generated locally +sha256 4c6ae288cf66f0a47052a50972e3d3727617c4c3e104db20494a3c5feb262f40 wpebackend-rdk-4.4.1.tar.gz + +# License files +sha256 a5ba969938c2896411ea1a23ee7d9ccb68306a65615b6711afe738c8f6ff2153 COPYING diff --git a/package/wpebackend-rdk/wpebackend-rdk.mk b/package/wpebackend-rdk/wpebackend-rdk.mk new file mode 100644 index 00000000000..f9740eb46cd --- /dev/null +++ b/package/wpebackend-rdk/wpebackend-rdk.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# wpebackend-rdk +# +################################################################################ + +WPEBACKEND_RDK_VERSION = 4.4.1 +WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,R$(WPEBACKEND_RDK_VERSION)) +WPEBACKEND_RDK_INSTALL_STAGING = YES +WPEBACKEND_RDK_LICENSE = BSD-2-Clause +WPEBACKEND_RDK_LICENSE_FILES = COPYING +WPEBACKEND_RDK_DEPENDENCIES = libglib2 libwpe +WPEBACKEND_RDK_CONF_OPTS = \ + -DUSE_BACKEND_BCM_NEXUS=OFF \ + -DUSE_BACKEND_BCM_NEXUS_WAYLAND=OFF \ + -DUSE_BACKEND_INTEL_CE=OFF \ + -DUSE_BACKEND_WESTEROS=OFF \ + -DUSE_BACKEND_WPEFRAMEWORK=OFF \ + -DUSE_HOLE_PUNCH_GSTREAMER=OFF \ + -DUSE_VIRTUAL_KEYBOARD=OFF + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_BRCM_RPI),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=ON +WPEBACKEND_RDK_DEPENDENCIES += rpi-userland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_BCM_RPI=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_IMPL_WAYLAND_EGL),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=ON +WPEBACKEND_RDK_DEPENDENCIES += libegl wayland +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_BACKEND_WAYLAND_EGL=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEBACKEND_RDK_LIBINPUT),y) +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=ON +WPEBACKEND_RDK_DEPENDENCIES += libinput +else +WPEBACKEND_RDK_CONF_OPTS += -DUSE_INPUT_LIBINPUT=OFF +endif + +$(eval $(cmake-package)) From patchwork Thu Feb 8 09:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1896490 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TVsn35gMGz23hn for ; Thu, 8 Feb 2024 20:55:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 357B641C3A; Thu, 8 Feb 2024 09:55:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FO_T7iL4vmwt; Thu, 8 Feb 2024 09:55:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 13FA841BA1 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 13FA841BA1; Thu, 8 Feb 2024 09:55:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2B2D21BF831 for ; Thu, 8 Feb 2024 09:55:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1815041B29 for ; Thu, 8 Feb 2024 09:55:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aslEVkf_JXpA for ; Thu, 8 Feb 2024 09:55:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=213.97.179.56; helo=fanzine2.igalia.com; envelope-from=aperez@igalia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 8DE89403B9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8DE89403B9 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8DE89403B9 for ; Thu, 8 Feb 2024 09:55:36 +0000 (UTC) Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1rY181-00F8hL-Fs; Thu, 08 Feb 2024 10:55:33 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 1fa70103; Thu, 8 Feb 2024 09:55:31 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 8 Feb 2024 11:55:29 +0200 Message-ID: <20240208095531.99049-3-aperez@igalia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-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:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=5TApq4vd6e1ppRwHOazHdGESszB4G4PuYBQKiMJJTzg=; b=YkH8PmsdLpn6msy3wt3job4wH6 L3IsTU9udQOUWPMxnVH0/x6WDk9j1ozhnDMWCP5OJa3oufkou9m56VauebWnA8s9ovppyrxxt+SMi JHDCDKW19mU5sMCnM5g8DwqlkvaSVyHVcj2LS1/zGYtPGkcoe+aUU0BFu+Gy7dIO53Lr+B6Q13uqy ei+xtcrpE7GjTkqxWPMZb4KdBsz9b4CztCAqRVWVHPh78z6l6rzVjS2zjsyxHnTgsxlb+bBJ+tDPy SNvXX1fNjKlpF+0arcduyMwHHyu5dJcJ8wjTyxCn8f3uPVHrRWDIev5vuRDlnp38Syr4C1ThRboi1 h+aZ+1KA==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=igalia.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=YkH8Pmsd Subject: [Buildroot] [PATCH 2/3] package/cog: depend on wpebackend-fdo only if needed X-BeenThere: buildroot@buildroot.org 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: Adrian Perez de Castro , Samuel Martin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Make the Cog headless platform plug-in selectable, allowing to configure the build without any plug-in at all. When all plug-ins are disabled, Cog does not require wpebackend-fdo at build time, and it is still able to use its built-in "fallback" support to load other WPE backends like wpebackend-rdk. Signed-off-by: Adrian Perez de Castro --- package/cog/Config.in | 28 ++++++++++++++++++++++++++-- package/cog/cog.mk | 13 ++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/package/cog/Config.in b/package/cog/Config.in index d2a910f9b89..d706b045b15 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -19,6 +19,10 @@ config BR2_PACKAGE_COG if BR2_PACKAGE_COG +config BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + bool + default n + config BR2_PACKAGE_COG_PROGRAMS_HOME_URI string "home uri" default "https://wpewebkit.org" @@ -30,6 +34,8 @@ config BR2_PACKAGE_COG_PROGRAMS_HOME_URI config BR2_PACKAGE_COG_PLATFORM_FDO bool "Wayland backend" default y + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_WAYLAND_PROTOCOLS help @@ -43,6 +49,8 @@ config BR2_PACKAGE_COG_PLATFORM_DRM depends on BR2_PACKAGE_HAS_LIBGBM depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT help @@ -50,16 +58,32 @@ config BR2_PACKAGE_COG_PLATFORM_DRM with video drivers that support kernel mode-setting (KMS) via the DRM user-space API. +config BR2_PACKAGE_COG_PLATFORM_HEADLESS + bool "Headless backend" + depends on BR2_PACKAGE_WPEBACKEND_FDO + select BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO + help + Enable the headless platform backend. + config BR2_PACKAGE_COG_USE_SYSTEM_DBUS bool "expose system D-Bus control interface" help Expose remote control interface on system bus -comment "DRM platform needs EGL and GBM" +comment "Headless platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "DRM platform needs EGL, GBM, wpebackend-fdo" depends on \ !BR2_PACKAGE_HAS_LIBEGL || \ !BR2_PACKAGE_HAS_LIBGBM || \ !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF || \ - !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT || \ + !BR2_PACKAGE_WPEBACKEND_FDO + +comment "Wayland platform needs wpebackend-fdo" + depends on \ + !BR2_PACKAGE_WPEBACKEND_FDO endif diff --git a/package/cog/cog.mk b/package/cog/cog.mk index e96909f7796..8fc50de56f1 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -8,7 +8,7 @@ COG_VERSION = 0.18.2 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES -COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland +COG_DEPENDENCIES = dbus wpewebkit wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ @@ -19,8 +19,6 @@ COG_CONF_OPTS = \ -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' -COG_PLATFORMS_LIST = headless - ifeq ($(BR2_PACKAGE_WESTON),y) COG_CONF_OPTS += -Dwayland_weston_direct_display=true COG_DEPENDENCIES += weston @@ -28,6 +26,11 @@ else COG_CONF_OPTS += -Dwayland_weston_direct_display=false endif +ifeq ($(BR2_PACKAGE_COG_PLATFORM_HEADLESS),y) +COG_PLATFORMS_LIST += headless +COG_DEPENDENCIES += wpebackend-fdo +endif + ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols @@ -48,4 +51,8 @@ ifeq ($(BR2_PACKAGE_LIBMANETTE),y) COG_DEPENDENCIES += libmanette endif +ifeq ($(BR2_PACKAGE_COG_NEEDS_WPEBACKEND_FDO),y) +COG_DEPENDENCIES += wpebackend-fdo +endif + $(eval $(meson-package)) From patchwork Thu Feb 8 09:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1896489 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TVsn109g9z23hn for ; Thu, 8 Feb 2024 20:55:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CF23441C11; Thu, 8 Feb 2024 09:55:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hUJkDWjar0hy; Thu, 8 Feb 2024 09:55:42 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E246041BA1 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id E246041BA1; Thu, 8 Feb 2024 09:55:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D9CC71BF831 for ; Thu, 8 Feb 2024 09:55:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C7586846CD for ; Thu, 8 Feb 2024 09:55:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x3vKQVQgkbnL for ; Thu, 8 Feb 2024 09:55:37 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=213.97.179.56; helo=fanzine2.igalia.com; envelope-from=aperez@igalia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org B5028846AF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org B5028846AF Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id B5028846AF for ; Thu, 8 Feb 2024 09:55:36 +0000 (UTC) Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1rY182-00F8hL-2F; Thu, 08 Feb 2024 10:55:34 +0100 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id bb2d25ef; Thu, 8 Feb 2024 09:55:31 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 8 Feb 2024 11:55:30 +0200 Message-ID: <20240208095531.99049-4-aperez@igalia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-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:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=GRfjiE8Cdme8MEeq9XWEs9t7rYAdHBp3LG51l+DbSGA=; b=X3D805lvvzMCr9ba2QKOQDfWj+ p4HQ15e7N8r5SWsdlt5YUnZiKebyliueywuiQea5Hl+tDEi1zdjpEVemY+vIMG1UzKFeS0ltc45DT +3Jo25IhMhrvoKWdfeIq9QCFk0OY4qrSOyZ2PFL5WgXygSi8tIUJV2GkP0SWjW2rNtzI9zyZ746J+ bI0WKsnNSIMUu4emiyTEZXw+8dPcQX4VAtc9mFiIoY1z9gTOVrwANE5maWuizP3QrGOC0wfSRUhDc XuTh+k82yIAvgbDGvgAW2X+eLL/S6M+A3C2y/Qn5q4bmy/sey06xwzQ+/bA99iKkJCoJYmV7FdPSn mRWc07rA==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=igalia.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=X3D805lv Subject: [Buildroot] [PATCH 3/3] package/wpewebkit: do not depend on wpebackend-fdo X-BeenThere: buildroot@buildroot.org 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: Adrian Perez de Castro , Samuel Martin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Remove the wpewebkit package dependency on wpebackend-fdo, as it is not needed at all during the build. What is needed is a WPE backend at run time, which may be provided by wpebackend-fdo or wpebackend-rdk. To reflect this, we make wpewebkit depend on either being selected. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/Config.in | 9 ++++----- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 432aa4c3a30..779af0c892e 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -24,11 +24,11 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \ || !BR2_HOST_GCC_AT_LEAST_4_9 -comment "wpewebkit needs an OpenGL ES w/ EGL-capable Wayland backend" +comment "wpewebkit needs an OpenGL ES w/ EGL-capable implementation and an WPE backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT - depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL \ - || !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL + depends on !BR2_PACKAGE_WPEBACKEND_FDO && !BR2_PACKAGE_WPEBACKEND_RDK config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" @@ -41,8 +41,8 @@ config BR2_PACKAGE_WPEWEBKIT depends on BR2_USE_WCHAR # icu, libsoup3 depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wpebackend-fdo depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on BR2_PACKAGE_WPEBACKEND_FDO || BR2_PACKAGE_WPEBACKEND_RDK select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_HARFBUZZ @@ -59,7 +59,6 @@ config BR2_PACKAGE_WPEWEBKIT select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX - select BR2_PACKAGE_WPEBACKEND_FDO help WPE (Web Platform for Embedded) port of the WebKit engine, to allow embedders to create simple and performant systems diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38b..e54ec2952ff 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -16,7 +16,7 @@ WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup3 libtasn1 \ - libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo + libpng libxslt libwpe openjpeg wayland-protocols webp WPEWEBKIT_CMAKE_BACKEND = ninja From patchwork Thu Jun 27 19:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 1953551 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W97zG6c7Wz20XB for ; Fri, 28 Jun 2024 05:33:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8A2FF60625; Thu, 27 Jun 2024 19:33:44 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 5Z4moNBK6RFH; Thu, 27 Jun 2024 19:33:43 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9851E6063E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 9851E6063E; Thu, 27 Jun 2024 19:33:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 80FEC1BF3D9 for ; Thu, 27 Jun 2024 19:33:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6B44884181 for ; Thu, 27 Jun 2024 19:33:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id g1GcCpGa0lfc for ; Thu, 27 Jun 2024 19:33:41 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=178.60.130.6; helo=fanzine2.igalia.com; envelope-from=aperez@igalia.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 1802E83F36 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1802E83F36 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1802E83F36 for ; Thu, 27 Jun 2024 19:33:40 +0000 (UTC) Received: from 91-153-34-210.elisa-laajakaista.fi ([91.153.34.210] helo=kodama) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1sMusE-008G4x-Os; Thu, 27 Jun 2024 21:33:38 +0200 Received: from localhost (kodama [local]) by kodama (OpenSMTPD) with ESMTPA id 200594cc; Thu, 27 Jun 2024 19:33:35 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 27 Jun 2024 22:33:32 +0300 Message-ID: <20240627193335.4069574-5-aperez@igalia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240208095531.99049-1-aperez@igalia.com> References: <20240208095531.99049-1-aperez@igalia.com> MIME-Version: 1.0 X-Mailman-Original-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:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=RAI/rvVreC5ykI8/SlUmcDgl0akJZ3QB0k25gy7jcsU=; b=l020UPW4I99z+jhmnMLYvDRgGP PqDV2eai+Q59LBizUXB1PbKrelOUM6cMJx6zdq+5sLZoagFojEdnIuLMuMZ92bV+3Vh4jvn8J7BTt nbwy+8BO8YlzHhtpZgy1K0ewCYDdvmqYUM9G9QZQwm6/gH7qQwveKMOR6mbrVT4Zaptko2vYJlP6O xD4aJwLeOuvY7Ve7njUU25xyJiTQz5/CRA7y9vDOYLYgxnefcXUszcxhKSktQpATszSmjVmLnM9wE SYHEI9ocBdxSydj0E7DjZekw3e7tQYGivGgbCLyMR+nymYAVSobgB25ACAgyzGZdEIuucHcWRPPwQ zo/doodg==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=none (p=none dis=none) header.from=igalia.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=igalia.com header.i=@igalia.com header.a=rsa-sha256 header.s=20170329 header.b=l020UPW4 Subject: [Buildroot] [PATCH v2 4/4] package/wpewebkit: disable libdrm usage when not available X-BeenThere: buildroot@buildroot.org 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: Adrian Perez de Castro , Samuel Martin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Pass USE_LIBDRM=OFF to the wpewebkit CMake configuration step when the libdrm package has not been selected. WPE WebKit can be built without libdrm support, and it will still work with backends that use other platform-specific methods to handle graphics buffers and/or presenting content onto an output. For example this is the case with wpebackend-rdk configured to use rpi-userland, which uses dispmanx to produce the output instead of DRM/KMS. Signed-off-by: Adrian Perez de Castro --- package/wpewebkit/wpewebkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) --- v1 -> v2: - Patch added. diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 382c2adca10..4071cbb0d83 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -87,6 +87,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=ON +WPEWEBKIT_DEPENDENCIES += libdrm +else +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2