From patchwork Fri Nov 30 12:01:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Einar_J=C3=B3n?= X-Patchwork-Id: 1005922 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.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.b="Ax/ryRBs"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 435tMX2vk3z9s2P for ; Fri, 30 Nov 2018 23:03:36 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 96E9E883A1; Fri, 30 Nov 2018 12:03:34 +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 DYiuA77p7R90; Fri, 30 Nov 2018 12:03:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7474C88382; Fri, 30 Nov 2018 12:03:30 +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 27A4D1BF308 for ; Fri, 30 Nov 2018 12:03:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 15D57873E6 for ; Fri, 30 Nov 2018 12:03:20 +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 lq4opwG6v_h9 for ; Fri, 30 Nov 2018 12:03:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 30932871E5 for ; Fri, 30 Nov 2018 12:03:19 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id z28so4619003edi.8 for ; Fri, 30 Nov 2018 04:03:19 -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:in-reply-to:references; bh=+qfyiN1KrpQqcrzQyY4vSh7WxRLa8ZJz0oo4nNtx7sc=; b=Ax/ryRBsu4Q6qqWS8a5BoffmX67qYJmS/b6O45TdCBSCXhJ78rhPpUrKnEpp7D+Fu1 Ju1ZW68snUBor+oK2utFOCRB2LvR9gx6BINZw0WsK2FObcePN6LXQ8gc0BjVGgwks9lP FFb6yr7U671jiCO/3oOIvXlsfNQwAKyE/UatSRAhCFl1UDdTu2mQEOA6UuR+d4nEZ6+k s0ZNHVKcYSLW1ZD0Klxsx0fZ6pMlWGpeDwP42yO08nvszPEbMiSbfHcvDE4fhsuqN/mA BN3ONqqwggIxnz2DioOaSkUlsUS/60pC5czx5Xlk3Mfw3CUKq7VunSg82xar4rLlYyS/ SK2Q== 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:in-reply-to :references; bh=+qfyiN1KrpQqcrzQyY4vSh7WxRLa8ZJz0oo4nNtx7sc=; b=H8jsxfN/zo2qt8byWvxfoVlhFw9ZlmDPzAnEfLk5l9x6OTuRzdGqq5zBth4n4Nvz7s zIgctLIMwRjS1YcLsq2TIoCIUmXfWGiJGT7V24Wtv9j72JZEy9oHKUuPXw2/PM9oyHBi fPFC1MsXm4k4QnScHwDIEIEljBnOGgHdWyZp9aFu9s9aftMhrx3GvWTN8tFzqXH+g7F9 fmg08dmevZFxERt3UIT+GDwz+m0QYeQuOW4qiqA+Rt3/HlBroeR5C8sWYtlxeiOm7Vhc jn0JTfqy28LQEk2Lem10RxlzjblwIJMnlD9VOtnBYjDARBaYB+cydMaM9+9oczC51rft en6A== X-Gm-Message-State: AA+aEWan6/Kz7vt7/mkkM3CvhFyCazocfaAvCq+XGRTYpK2Frzp/lkdY hQd4xbNTk4dddie+Mg7vrUDtQ+x46Kd/UA2E X-Google-Smtp-Source: AFSGD/Xpir+nuuu6EaillM6NQRnYBuCvWWK8Uxk4ROKt/NehPGRMplK+4tiZQU0miUOMLqjC2eydmg== X-Received: by 2002:a50:c089:: with SMTP id k9mr4805604edf.89.1543579397182; Fri, 30 Nov 2018 04:03:17 -0800 (PST) Received: from localhost.localdomain ([143.176.206.168]) by smtp.gmail.com with ESMTPSA id j21-v6sm775329ejz.51.2018.11.30.04.03.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Nov 2018 04:03:16 -0800 (PST) From: Einar Jon Gunnarsson To: buildroot@buildroot.org Date: Fri, 30 Nov 2018 13:01:22 +0100 Message-Id: <1543579283-20496-5-git-send-email-tolvupostur@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543579283-20496-1-git-send-email-tolvupostur@gmail.com> References: <1543579283-20496-1-git-send-email-tolvupostur@gmail.com> Subject: [Buildroot] [PATCH 4/5] package/sunxi-mali-mainline: Fix QT5 build for EGLFS 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: Lothar Felten , Einar Jon Gunnarsson , Peter Seiderer , Thomas Petazzoni , Giulio Benetti MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Added BR2_PACKAGE_HAS_LIBEGL_WAYLAND, but to avoid a circular dependency, BR2_PACKAGE_WAYLAND is selected instead of being a dependency. Also add -D__GBM__ in order to build EGL. Signed-off-by: Einar Jon Gunnarsson ---- I can't test this on HW, but without -D__GBM__, the QT config will not build EGLFS and give up on feature.egl failure. With it, we get: EGLFS .................................. yes EGLFS EGLDevice ...................... yes EGLFS GBM ............................ yes EGLFS Mali ........................... no (?) Signed-off-by: Einar Jon Gunnarsson --- configs/libgbm_sunxi_mali_defconfig | 1 - package/sunxi-mali-mainline/Config.in | 3 ++- package/sunxi-mali-mainline/sunxi-mali-mainline.mk | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configs/libgbm_sunxi_mali_defconfig b/configs/libgbm_sunxi_mali_defconfig index 422d1db..c89a781 100644 --- a/configs/libgbm_sunxi_mali_defconfig +++ b/configs/libgbm_sunxi_mali_defconfig @@ -8,5 +8,4 @@ BR2_SYSTEM_BIN_SH_NONE=y BR2_PACKAGE_KMSCUBE=y BR2_PACKAGE_SUNXI_MALI_MAINLINE=y BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND=y -BR2_PACKAGE_WAYLAND=y # BR2_TARGET_ROOTFS_TAR is not set diff --git a/package/sunxi-mali-mainline/Config.in b/package/sunxi-mali-mainline/Config.in index 837bf19..911e9d1 100644 --- a/package/sunxi-mali-mainline/Config.in +++ b/package/sunxi-mali-mainline/Config.in @@ -28,8 +28,9 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_FBDEV config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND bool "wayland" - depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND select BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_HAS_LIBEGL_WAYLAND config BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_X11_DMABUF bool "x11 dma-buf" diff --git a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk index 8a76b46..3cddcdf 100644 --- a/package/sunxi-mali-mainline/sunxi-mali-mainline.mk +++ b/package/sunxi-mali-mainline/sunxi-mali-mainline.mk @@ -39,6 +39,10 @@ endif ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE_OUTPUT_WAYLAND),y) SUNXI_MALI_MAINLINE_DEPENDENCIES += wayland SUNXI_MALI_MAINLINE_PROVIDES += libgbm +define SUNXI_MALI_MAINLINE_GBM_FIXUP_EGL_PC + $(SED) "s/Cflags: /Cflags: -D__GBM__ /" \ + $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc +endef endif # FIXME: install gbm.pc conditionally @@ -56,6 +60,7 @@ define SUNXI_MALI_MAINLINE_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc $(INSTALL) -D -m 0644 package/sunxi-mali-mainline/gbm.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/gbm.pc + $(SUNXI_MALI_MAINLINE_GBM_FIXUP_EGL_PC) $(SUNXI_MALI_MAINLINE_FIXUP_EGL_PC) endef