From patchwork Mon Oct 26 08:11:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1387516 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=Q6OUy1AG; 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 4CKSGx0PFnz9sTK for ; Mon, 26 Oct 2020 19:11:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1113087141; Mon, 26 Oct 2020 08:11:51 +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 VNKWxFxX48K3; Mon, 26 Oct 2020 08:11:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 48CC186FB0; Mon, 26 Oct 2020 08:11:50 +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 58FC11BF375 for ; Mon, 26 Oct 2020 08:11:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4D83086739 for ; Mon, 26 Oct 2020 08:11:49 +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 KWoAZkAA9My3 for ; Mon, 26 Oct 2020 08:11:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5C3B98673B for ; Mon, 26 Oct 2020 08:11:48 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id d78so10662209wmd.3 for ; Mon, 26 Oct 2020 01:11:48 -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=o7EUZpmWajKM7cPdiD8+OBAPTHLqCmgh2HpVpbEBQi0=; b=Q6OUy1AG6/ur8WjYf+p6/oXsTwjaDKCPngW2LgDszeXkmnIC5XZZI6aqtXsiwinR22 0TVryJdHLdOSekoQHuaKMl87PKYC+EvSC3jUoyy3Dbk/sRZFAeRNUkKtvO5eekcYnUPl 5Tst6yAO+cUJF0yaE5n9elzo2nrWhA5nCXPNAMXCprmB5V99Qw+X9nbM3yeBtEdztt3t Os1o4AM6iaDvbjqnBRZ1rciQFKadO3TAxnNfGMSLHNfDtRQyHWPkZChrZvuJSEqqzyan 2KeDDjUqcqjV3tBNtpftmoPhsmZOrZmfpVbc01X2QuKhsgmPDX+fX12Vzk1qifd5N2iY lmMA== 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=o7EUZpmWajKM7cPdiD8+OBAPTHLqCmgh2HpVpbEBQi0=; b=jTWDa7y+zVcs2Zs1b9xwd29EcrjU4NEZ1Zueb/iGvwSPNEmI+gR/Qk5lOJW8L7yqWn NHHsaS8CNEpZVYzSp6AHdDneKYF4ZD0tmUbrT2j2Fz7s4JmO3h4O/u6ChcvOqfTc58h2 lJOH6ghAGSniJPKltL+o2RZhkM1Y08uoBOJD0g2pAudoAq/oWrfUtZtsbI6GPoBto9vN W7TCwvysQTPZVpgKLS+WQkU41C1i+3GL4Y+elUtRSavLg6LxSM1hQ196bHDA5cnytEj6 8Z2U6ed5Eca07EF1maZSmuGF5MAYoJLMXiIx5oVM8KqkfmR7ILKGN5NwZANLhmSqm95s nOhg== X-Gm-Message-State: AOAM5335Qm16a5BEffaWjcC816AgOYgPmvnsEniDnjJr/jGY1ID0/OQn ZDyOs6nBgxBkQyNfJVGGBgfElhPXw18= X-Google-Smtp-Source: ABdhPJzToRnL6rQVbWT6BC0eiBmCMFMBoMkupPiBesBr0fyYG9B71ISYQrTcggxniMuMQUsV5gU2gQ== X-Received: by 2002:a05:600c:230a:: with SMTP id 10mr15183091wmo.151.1603699906289; Mon, 26 Oct 2020 01:11:46 -0700 (PDT) Received: from t450s.fritz.box (ip1f1312b9.dynamic.kabel-deutschland.de. [31.19.18.185]) by smtp.gmail.com with ESMTPSA id h206sm20249327wmf.47.2020.10.26.01.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 01:11:45 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Mon, 26 Oct 2020 09:11:00 +0100 Message-Id: <20201026081101.7488-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/meson: 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: Eric Le Bihan , Gary Bisson , Refik Tuzakli , Thomas Petazzoni , Heiko Thiery , "Yann E . MORIN" 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: No such file or directory 144 | #include For 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 | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/meson/0003-libweston-backend-drm-might-need-EGL.patch diff --git a/package/meson/0003-libweston-backend-drm-might-need-EGL.patch b/package/meson/0003-libweston-backend-drm-might-need-EGL.patch new file mode 100644 index 0000000000..ecc179840a --- /dev/null +++ b/package/meson/0003-libweston-backend-drm-might-need-EGL.patch @@ -0,0 +1,45 @@ +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. Since the MR on meson upstream [2] is not merged now I add this patch +to have working meson 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 +