From patchwork Mon Oct 26 12:40:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1387723 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=fail (p=none dis=none) header.from=gmail.com 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=NiQymeoJ; 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 4CKZFh69PWz9sVW for ; Mon, 26 Oct 2020 23:41:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 67BB087224; Mon, 26 Oct 2020 12:41:07 +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 SyWZtdom0aiP; Mon, 26 Oct 2020 12:41:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A1D3C8715D; Mon, 26 Oct 2020 12:41:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F0B421BF40F for ; Mon, 26 Oct 2020 12:41:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EADE986771 for ; Mon, 26 Oct 2020 12:41:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qSZYD9ztzIWl for ; Mon, 26 Oct 2020 12:41:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id CD55386770 for ; Mon, 26 Oct 2020 12:41:03 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id n6so12291814wrm.13 for ; Mon, 26 Oct 2020 05:41:03 -0700 (PDT) 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=ShP+BWXtsIN59FIqo6jbbFj0AUPIBdUgFsaQeAS7zUI=; b=NiQymeoJX9Ae8lH5vOE/d96QnJHJ/6AQ/VQP89U/xoTOr61pRdQ5XOzsnBFU167EpJ kfDRDVVfuTRmmpQ7PbSsim6Axa9JiVA7hQWHy7Rk95ubUZVAtaFuozAMfoXUrPnV0XV6 shHfKpZ/taDrLNtxagyBJo4Im1KlSevAAfVlomCgs+7iJu+IOK2MpoiVogNaYXMJC5EZ On681VaQi7X4GX+yr5CQAli1Zgo6BYhlqQvFluUOCllMuISMch9E54fR8hCtVafiHbiJ SJW3fp3vvFYKpHSxMzdOcwAkNPwe+Cny3DZ7wss/21/UJSgAzN97N5VUXUfyUb2ESVC8 ZdtA== 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=ShP+BWXtsIN59FIqo6jbbFj0AUPIBdUgFsaQeAS7zUI=; b=RC6/WxVNgvX/oUC0NeOZXNM6COQL8vxKeSEi2lhwOlBg77eu05p0INrDzhNIpkafwJ X4WwPXkhBz/o3PARMok5xZ3xniSipfknmmcGCKUH3xetqZNGkCA5MCseNIV23p+HLRBk n8WwdxdSUbiUToWZO13Q/OheKd+QuH0Cw30k3N0MQmPc9/yLadKtRh4B0TUbDOxK9DLc dTH7+TOcgv+HxOWtPUTxrKROg1Et81CBKJHYsI1ySPC1lj4FcsMbEeEC7d/j9DSKCjAn 1YZj5CnC3pu73DkJgAIO/jb100RCa9EcVKEqkJMKL3EgLjWO7lW3w9LSH4J6ueGWL2QO qiVg== X-Gm-Message-State: AOAM531x8Ly4sAe1DgCr6Fk2JB49iAazzCcbqz1ir571rZ9cRxbu4WPp 3mAdLEzOWr82WiAva8esUNslNvrM2lE= X-Google-Smtp-Source: ABdhPJxqGFMbJp5v7Gytl0fpM/PvuPmBcMu6XS4QYDDppfaeWBTkO734iBffNFdPjQLbLI7WUudaQQ== X-Received: by 2002:a5d:4409:: with SMTP id z9mr17265139wrq.236.1603716061850; Mon, 26 Oct 2020 05:41:01 -0700 (PDT) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id l3sm27639843wmg.32.2020.10.26.05.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 05:41:01 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Mon, 26 Oct 2020 13:40:29 +0100 Message-Id: <20201026124030.18360-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/weston: add patch to fix issue in conjunction with imx-gpu-viv 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: Gary Bisson , Refik Tuzakli , Heiko Thiery , "Yann E . MORIN" , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In file included from host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:39, from ../libweston/renderer-gl/gl-renderer.h:36, from ../libweston/backend-drm/drm-gbm.c:42: host/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:144:10: fatal error: X11/Xlib.h such file or directory 144 | #include For the discussion upstream see: https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 Cc: Gary Bisson Cc: Yann E. MORIN Cc: Refik Tuzakli Cc: Thomas Petazzoni Signed-off-by: Heiko Thiery --- ...libweston-backend-drm-might-need-EGL.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/weston/0002-libweston-backend-drm-might-need-EGL.patch diff --git a/package/weston/0002-libweston-backend-drm-might-need-EGL.patch b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch new file mode 100644 index 0000000000..f504e1145b --- /dev/null +++ b/package/weston/0002-libweston-backend-drm-might-need-EGL.patch @@ -0,0 +1,47 @@ +From 4b93b71067949cc5efabb9b3d59278a3f362b11c Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Wed, 21 Oct 2020 13:33:25 +0200 +Subject: [PATCH] libweston/backend/drm: might need EGL + +gbm-drm.c includes gl-renderer.h. When EGL is enabled, that in turns +includes egl.h. As such, dependencies for drm should include EGL if +it is available. + +This condition is modelled after a similar one in libweston/meson.build + +Reported-by: Gary Bisson +Reported-by: Heiko Thiery +Signed-off-by: Yann E. MORIN +Cc: Refik Tuzakli +Cc: Thomas Petazzoni +Signed-off-by: Heiko Thiery +--- +This patch should be a proper fix for the issue discribed in the patch from +Gary [1]. + +Since the MR on weston upstream [2] is not merged now I add this patch +to have working weston with imx in buildroot. + +[1] https://patchwork.ozlabs.org/project/buildroot/patch/20200402130842.918696-3-gary.bisson@boundarydevices.com/ +[2] https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/508 +--- + libweston/backend-drm/meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libweston/backend-drm/meson.build b/libweston/backend-drm/meson.build +index 484c2702..e3e5b976 100644 +--- a/libweston/backend-drm/meson.build ++++ b/libweston/backend-drm/meson.build +@@ -53,6 +53,9 @@ if get_option('renderer-gl') + config_h.set('HAVE_GBM_FD_IMPORT', '1') + endif + deps_drm += dep_gbm ++ if dep_egl.found() ++ deps_drm += dep_egl ++ endif + srcs_drm += 'drm-gbm.c' + config_h.set('BUILD_DRM_GBM', '1') + endif +-- +2.20.1 +