From patchwork Sat Feb 13 12:33:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Talis X-Patchwork-Id: 1440183 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Ol+oCXjw; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dd8tv2GXZz9s1l for ; Sat, 13 Feb 2021 23:34:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9934686B43; Sat, 13 Feb 2021 12:34:13 +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 1DwuCPtChHyX; Sat, 13 Feb 2021 12:34:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB83F85F18; Sat, 13 Feb 2021 12:34:11 +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 0C4481BF2B4 for ; Sat, 13 Feb 2021 12:34:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 07A446F50E for ; Sat, 13 Feb 2021 12:34:10 +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 eLsawwGrqdG8 for ; Sat, 13 Feb 2021 12:34:08 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id D61D46F51E; Sat, 13 Feb 2021 12:34:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by smtp3.osuosl.org (Postfix) with ESMTPS id B737A6F4D1 for ; Sat, 13 Feb 2021 12:34:06 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id a16so2017519wmm.0 for ; Sat, 13 Feb 2021 04:34:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s7cOtqC+5P0r/6F1iu8lpCfMEMbHyrluzn7qqnyX/dU=; b=Ol+oCXjwzNSHMIkNXeNUIrIv+QKIUTZeAtCF9f/E2d8H4HcNY0xcypsE79/l9wh+sM Cgdzdm8hc2TkWBXm/j0ceYB7WCO7YA8MNf6CrgypnRPmsxPCIzLNepWv3/1nyAm0s96Y gxSQWfx17geTW0aW7xFpCIkL+DEJ1cycenjHa44EItySKpi4b0R/BDdR8UzjIiMRFNFY ksXokSSwxCc/SlbKG7CNg82VGIdPSYIF3VvsM3vlJCL+fA9RezyRkjul77JG9WMB9vjk Zc74GDT5O4k8kTOnwWov/EM9eRFdmevhFbtLbM6no2kgIBQRzeSqQXJPVmNi13+n7Xbi EbZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s7cOtqC+5P0r/6F1iu8lpCfMEMbHyrluzn7qqnyX/dU=; b=gNKape48BCzQOE//655g4BBJ2DLXma/uvcwkdUTTXLI+a3y/Bk4jMC439ngZDWIGxi MdHmhAFzJU6Df2Ludlv8KO/eDrr48XaccBm6q7oz/F54AVVfaR7OlPDb5miDJ3KqhYNA oE00wlZX4a6Npz7+ULb8+lSstN4Nx3osFWZRTe+8+aKonWVZx3qFSkjRbaRG+5o9Chfp NsJxsPZ5xjgNuAhDb8T/d5o77SHqCOJLJSca7RekMtftQ1fwE+gPz5DWL9KFnopNWH4A x0JOc1En+wvI9IHYuiMEDmrnSiKxzBXUmwoTVIPFpmGTC4+5wvRFsRLC5vKngjyXlSeU 2b7g== X-Gm-Message-State: AOAM531KqiDeIidjhgB5DtARypj7scZLAa4VU29SFxaxHFxCgGXJ3pA0 RRR737AcB9SxvcFIyzShGq/pm2GNgmBWqQ== X-Google-Smtp-Source: ABdhPJwrxArgzHF8bnMxEb1xneUSd6TAPSjH0MFf0LfNg+jG/3dyQBGCYZSLG4+nfr4W9g6s69T6xA== X-Received: by 2002:a7b:ca57:: with SMTP id m23mr6565106wml.116.1613219644329; Sat, 13 Feb 2021 04:34:04 -0800 (PST) Received: from localhost.localdomain (138.23.87.79.rev.sfr.net. [79.87.23.138]) by smtp.gmail.com with ESMTPSA id t198sm8479250wmt.7.2021.02.13.04.34.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Feb 2021 04:34:03 -0800 (PST) From: Gilles Talis To: buildroot@buildroot.org Date: Sat, 13 Feb 2021 13:33:53 +0100 Message-Id: <20210213123353.4146-1-gilles.talis@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/wlroots, package/cage: change mesa3d dependency to virtual libegl/libgles 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: Adrian Perez de Castro , Julien Olivain , Gilles Talis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since commits: https://github.com/swaywm/wlroots/commit/c2288a7b88240e4377bfc1c67b44efb58f704a42 https://github.com/swaywm/wlroots/commit/e18599b05e0f0cbeba11adbd489e801285470eab Mesa dependency is no longer required. Wlroots is able to run on drivers that provide EGL and GLES2.0 support, and with specific EGL wayland extensions. (thus the BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency) This was verified on NXP's i.MX8MMini using imx-gpu-viv driver. Signed-off-by: Julien Olivain Signed-off-by: Gilles Talis --- Changes v1 -> v2: - Added BR2_PACKAGE_HAS_LIBEGL_WAYLAND dependency - Squashed wlroots and cage patches in one single patch package/cage/Config.in | 12 +++++++----- package/wlroots/Config.in | 15 +++++++-------- package/wlroots/wlroots.mk | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/package/cage/Config.in b/package/cage/Config.in index 3bef08f037..0844d6ff62 100644 --- a/package/cage/Config.in +++ b/package/cage/Config.in @@ -1,6 +1,7 @@ -comment "cage needs udev, mesa3d w/ EGL and GLES support" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_OPENGL_ES || \ +comment "cage needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV comment "cage needs a toolchain w/ threads, dynamic library" @@ -11,9 +12,10 @@ config BR2_PACKAGE_CAGE bool "cage" depends on !BR2_STATIC_LIBS # wlroots depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots depends on BR2_PACKAGE_HAS_UDEV # wlroots - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # wlroots - depends on BR2_PACKAGE_MESA3D_OPENGL_ES # wlroots select BR2_PACKAGE_WLROOTS help Kiosk compositor for Wayland, which displays a single diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 2f72fd4945..694aa79de4 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -1,6 +1,7 @@ -comment "wlroots needs udev, mesa3d w/ EGL and GLES support" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_OPENGL_ES || \ +comment "wlroots needs udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES || \ !BR2_PACKAGE_HAS_UDEV comment "wlroots needs a toolchain w/ threads, dynamic library" @@ -12,11 +13,9 @@ config BR2_PACKAGE_WLROOTS depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm, wayland depends on BR2_PACKAGE_HAS_UDEV # libinput - # Technically wlroots should work with any OpenGL implementation - # which provides EGL, GLES2, and libgbm; but in practice only - # Mesa ships an usable libgbm. - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - depends on BR2_PACKAGE_MESA3D_OPENGL_ES + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 5665d5a956..0160b1aedb 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -15,7 +15,8 @@ WLROOTS_DEPENDENCIES = \ host-wayland \ libinput \ libxkbcommon \ - mesa3d \ + libegl \ + libgles \ pixman \ udev \ wayland \